From 351663666914da6bf9a8a664f042a3beaf6ca161 Mon Sep 17 00:00:00 2001
From: sunshine <1467939124@qq.com>
Date: Tue, 23 Jul 2024 14:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BD=E5=B1=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page_report/ViewForm.vue   |  9 ++++--
 src/page_report/reportForm.vue | 19 ++++++-----
 src/pages/login.vue            | 58 ++++++++--------------------------
 src/pages/mine.vue             |  6 ++--
 4 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/src/page_report/ViewForm.vue b/src/page_report/ViewForm.vue
index 6d7e7b8..f764f89 100644
--- a/src/page_report/ViewForm.vue
+++ b/src/page_report/ViewForm.vue
@@ -100,7 +100,7 @@ import {showConfirm} from "@/utils/common";
 import tab from "@/plugins/tab";
 import modal from "@/plugins/modal";
 import {getById, getDetailByReportId, update} from "@/api/mes/report";
-const userStore = useUserStore()
+
 export default {
   components: {},
   data() {
@@ -108,8 +108,8 @@ export default {
       // 自定义表单数据
       customFormData: {
         id: undefined,
-        name: userStore.name,
-        userId: userStore.userId,
+        name: this.getUserInfo.name,
+        userId: this.getUserInfo.userId,
         orgId: undefined,
         orgType: undefined,
         reportTime: undefined,
@@ -172,6 +172,9 @@ export default {
     this.$refs.customForm.setRules(this.customRules)
   },
   methods: {
+    getUserInfo() {
+      return useUserStore()
+    },
     processTypes() {
       return processTypes
     },
diff --git a/src/page_report/reportForm.vue b/src/page_report/reportForm.vue
index cee49cf..f048051 100644
--- a/src/page_report/reportForm.vue
+++ b/src/page_report/reportForm.vue
@@ -93,14 +93,14 @@
 <script>
 
 import useUserStore from "@/store/modules/user";
-import {processTypes, groupTypes} from "@/api/system/dict/data";
-import {getOrgList, getProductList, createReport, getPlanProductList} from "@/api/mes/organization"
-import {getCurrentDate, timestampToTime} from "@/utils/dateUtil"
-import {showConfirm} from "@/utils/common";
+import { processTypes, groupTypes } from "@/api/system/dict/data";
+import { getOrgList, createReport, getPlanProductList} from "@/api/mes/organization"
+import { getCurrentDate, timestampToTime } from "@/utils/dateUtil"
+import { showConfirm } from "@/utils/common";
 import tab from "@/plugins/tab";
 import modal from "@/plugins/modal";
-import {getById, getDetailByReportId, update} from "@/api/mes/report";
-const userStore = useUserStore()
+import { getById, getDetailByReportId, update } from "@/api/mes/report";
+
 export default {
   components: {},
   data() {
@@ -108,8 +108,8 @@ export default {
       // 自定义表单数据
       customFormData: {
         id: undefined,
-        name: userStore.name,
-        userId: userStore.userId,
+        name: this.getUserInfo.name,
+        userId: this.getUserInfo.userId,
         orgId: undefined,
         orgType: undefined,
         reportTime: undefined,
@@ -172,6 +172,9 @@ export default {
     this.$refs.customForm.setRules(this.customRules)
   },
   methods: {
+    getUserInfo() {
+      return useUserStore()
+    },
     processTypes() {
       return processTypes
     },
diff --git a/src/pages/login.vue b/src/pages/login.vue
index 8839a34..3a70b77 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -1,38 +1,24 @@
 <template>
   <view class="normal-login-container">
-    <u-sticky
-        class="sticky"
-        :custom-nav-height="0"
-    >
-      <u-navbar
-          title="登录"
-          bg-color="transparent"
-          :title-style="{ fontWeight: 'bold' }"
-          :auto-back="false"
-          left-icon=""
-          safe-area-inset-top
-          placeholder
-      />
-    </u-sticky>
     <view class="logo-content align-center justify-center flex">
-      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix" data="">
       </image>
       <text class="title">生产运营管理系统</text>
     </view>
     <view class="login-form-content">
       <view class="input-item flex align-center">
         <view class="iconfont icon-user icon"></view>
-        <input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
+        <input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30"  icon="" label="" max="" tip="" validator=""/>
       </view>
       <view  class="input-item flex align-center">
         <view class="iconfont icon-password icon"></view>
-        <input  v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
+        <input  v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20"  icon="" label="" max="" tip="" validator=""/>
       </view>
-      <view v-if="captchaEnabled" class="input-item flex align-center" style="width: 60%;margin: 0px;">
+      <view v-if="captchaEnabled" class="input-item flex align-center" style="width: 60%;margin: 0;">
         <view class="iconfont icon-code icon"></view>
-        <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+        <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4"  icon="" label="" max="" tip="" validator=""/>
         <view class="login-code">
-          <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
+          <image :src="codeUrl" @click="getCode" class="login-code-img" data=""></image>
         </view>
       </view>
       <view class="action-btn">
@@ -53,9 +39,7 @@ import { getCodeImg } from '@/api/login'
 import { ref } from "vue";
 import config from '@/config.js'
 import useUserStore from '@/store/modules/user'
-import { getWxCode } from '@/utils/geek';
-import { wxLogin } from '@/api/oauth';
-import { setToken } from '@/utils/auth';
+
 const userStore = useUserStore()
 const codeUrl = ref("");
 const captchaEnabled = ref(false); // 是否开启验证码
@@ -91,9 +75,9 @@ async function handleLogin() {
     modal.msgError("请输入验证码")
   } else {
     modal.loading("登录中，请耐心等待...")
-    pwdLogin()
+    await pwdLogin()
   }
-};
+}
 // 密码登录
 async function pwdLogin() {
   userStore.login(loginForm.value).then(() => {
@@ -105,7 +89,7 @@ async function pwdLogin() {
       getCode()
     }
   })
-};
+}
 
 function loginSuccess(result) {
   // 设置用户信息
@@ -115,33 +99,20 @@ function loginSuccess(result) {
     });
   })
 }
-
-
 </script>
 
 <style lang="scss" scoped>
-page {
-  background-color: #ffffff;
-}
-.sticky {
-  background: linear-gradient(180deg, #d4e9ff 0%, #f3f9ff 100%);
-  backdrop-filter: blur(27.18px);
-  box-shadow: 0 1px 1px 0 rgba(0, 72, 145, 0.1),
-  0 0.5px 0 0 rgba(0, 0, 0, 0.1);
-}
 .normal-login-container {
-  width: 100%;
-  min-height: 100vh;
+  height: 100vh;
   overflow: hidden;
   background-image: url(@/static/images/login/background.svg);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
+  background-size: cover;
 
   .logo-content {
     width: 100%;
     font-size: 21px;
     text-align: center;
-    padding-top: 15%;
+    padding-top: 50%;
 
     image {
       border-radius: 4px;
@@ -154,8 +125,7 @@ page {
 
   .login-form-content {
     text-align: center;
-    margin: 20px auto;
-    margin-top: 15%;
+    margin: 15% auto 20px;
     width: 80%;
 
     .input-item {
diff --git a/src/pages/mine.vue b/src/pages/mine.vue
index 142a978..ff3917d 100644
--- a/src/pages/mine.vue
+++ b/src/pages/mine.vue
@@ -196,13 +196,12 @@ function handleBuilding() {
   height: 100%;
 
   .header-section {
-    margin: 10rpx;
+    margin: 10rpx 0;
     padding: 40rpx 10rpx 80rpx 0;
     box-sizing: border-box;
-    background-image: url('src/static/images/icon/background.png');
+    background-image: url('@/static/images/icon/background.png');
     background-position: center center;
     background-size: 100% 100%;
-    border-radius: 24rpx;
     overflow: hidden;
     color: #fff;
 
@@ -232,6 +231,7 @@ function handleBuilding() {
   .content-section {
     position: relative;
     top: -50px;
+    margin: 10rpx;
 
     .mine-actions {
       margin: 15px 15px;