From 33904345acc1e985fb432d40207a90642a7fa354 Mon Sep 17 00:00:00 2001
From: CTP <630182278@qq.com>
Date: Wed, 19 Apr 2023 17:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=99=BB=E5=BD=95=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=A0=B7=E5=BC=8F=E8=A6=86=E7=9B=96=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/views/myLogin.vue              | 162 +++++++++++++++++------------
 src/views/register.vue             |   1 -
 src/views/system/dept/authDept.vue |   7 +-
 3 files changed, 99 insertions(+), 71 deletions(-)

diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index 61a94b7..4496eea 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -17,31 +17,59 @@
       label-position="left"
     >
       <el-card class="box-card">
-        <div style="text-align: center; margin-top: 10px;margin-bottom: 15px">
-          <img alt="element-logo" src="@/assets/logo/logo.png"/>
+        <div style="text-align: center; margin-top: 10px; margin-bottom: 15px">
+          <img alt="element-logo" src="@/assets/logo/logo.png" />
         </div>
         <h3 class="title">用户登录</h3>
         <el-form-item prop="username" class="item" style="margin-top: -20px">
-          <el-input prefix-icon="el-icon-user" placeholder="账号" name="username" autocomplete="on" v-model="loginForm.username">
+          <el-input
+            prefix-icon="el-icon-user"
+            placeholder="账号"
+            name="username"
+            autocomplete="on"
+            v-model="loginForm.username"
+          >
             <i slot="prefix" class="el-input__icon">
-              <icon-svg icon-class="user"/>
+              <icon-svg icon-class="user" />
             </i>
           </el-input>
         </el-form-item>
         <el-form-item prop="password" class="item">
-          <el-input prefix-icon="el-icon-s-goods" placeholder="密码" name="password" :type="isShowPwd ? 'text' : 'password'" @keyup.enter.native="handleLogin"
-                    v-model="loginForm.password" autocomplete="on">
+          <el-input
+            prefix-icon="el-icon-s-goods"
+            placeholder="密码"
+            name="password"
+            :type="isShowPwd ? 'text' : 'password'"
+            @keyup.enter.native="handleLogin"
+            v-model="loginForm.password"
+            autocomplete="on"
+          >
             <i slot="prefix" class="el-input__icon">
-              <icon-svg icon-class="pwd"/>
+              <icon-svg icon-class="pwd" />
             </i>
-            <i slot="suffix" class="el-input__icon" @click="isShowPwd = !isShowPwd">
-              <icon-svg icon-class="eye"/>
+            <i
+              slot="suffix"
+              class="el-input__icon"
+              @click="isShowPwd = !isShowPwd"
+            >
+              <icon-svg icon-class="eye" />
             </i>
           </el-input>
         </el-form-item>
-        <el-form-item prop="verificationCode" class="item" style="background-color: white">
-          <Verify ref="checkV" :showButton="false" :barSize="{width:'305px',height:'37px'}" :vOffset="5"
-                  @success="verifyAlert('success')" @error="verifyAlert('error')" :type="3"></Verify>
+        <el-form-item
+          prop="verificationCode"
+          class="item"
+          style="background-color: white"
+        >
+          <Verify
+            ref="checkV"
+            :showButton="false"
+            :barSize="{ width: '305px', height: '37px' }"
+            :vOffset="5"
+            @success="verifyAlert('success')"
+            @error="verifyAlert('error')"
+            :type="3"
+          ></Verify>
         </el-form-item>
         <div style="text-align: center; margin-top: 15px">
           <el-button
@@ -49,49 +77,48 @@
             style="width: 60%; margin-bottom: 30px"
             :loading="loading"
             @click.native="handleLogin()"
-          >登录
+            >登录
           </el-button>
         </div>
         <div style="margin-top: -15px">
           <a style="margin-left: 50%; font-size: 12px" :href="'#/register'"
-          >新用户注册</a
+            >新用户注册</a
           >
           <a style="margin-left: 5%; font-size: 12px" :href="'#/forgetPasswd'"
-          >忘记密码</a
+            >忘记密码</a
           >
         </div>
-
       </el-card>
     </el-form>
 
-    <div style="
-          position: absolute;
-          bottom: 0;
-          margin-left: 36%;
-          font-size: 18px;
-          color: white;
-        ">
-
+    <div
+      style="
+        position: absolute;
+        bottom: 0;
+        margin-left: 36%;
+        font-size: 18px;
+        color: white;
+      "
+    >
       <a href="http://www.xmglxp.com/" target="_blank">
         软件名称: 医院UDI管理系统
       </a>
-      <a href="http://www.xmglxp.com/" target="_blank" style="margin-left: 20px; font-size: 12px">
-       开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
+      <a
+        href="http://www.xmglxp.com/"
+        target="_blank"
+        style="margin-left: 20px; font-size: 12px"
+      >
+        开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
       </a>
     </div>
-
-
-
-
-
   </div>
 </template>
 
 <script>
-import Verify from 'vue2-verify'
+import Verify from "vue2-verify";
 import axios from "axios";
 import Cookies from "js-cookie";
-import {decrypt, encrypt} from "@/utils/jsencrypt";
+import { decrypt, encrypt } from "@/utils/jsencrypt";
 
 export default {
   data() {
@@ -107,7 +134,7 @@ export default {
         userName: "",
         pwd: "",
         checked: true,
-        verificationCode: false
+        verificationCode: false,
       },
       loginForm: {
         username: "",
@@ -115,13 +142,13 @@ export default {
         rememberMe: false,
         verificationCode: false,
         code: "",
-        uuid: ""
+        uuid: "",
       },
       rules: {
         userName: [
-          {required: true, message: "请输入登录名", trigger: "blur"},
+          { required: true, message: "请输入登录名", trigger: "blur" },
         ],
-        pwd: [{validator: validatePwd, trigger: "blur"}],
+        pwd: [{ validator: validatePwd, trigger: "blur" }],
       },
       isShowPwd: false, // 是否显示密码
       loading: false, // 登录loading
@@ -132,9 +159,9 @@ export default {
   },
   methods: {
     verifyAlert(text) {
-      if (text === 'success') {
+      if (text === "success") {
         this.loginForm.verificationCode = true;
-      }else{
+      } else {
         this.loginForm.verificationCode = false;
       }
     },
@@ -183,47 +210,53 @@ export default {
     //   });
     // },
 
-
     getCookie() {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
       // const rememberMe = Cookies.get('rememberMe')
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
         // rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
       };
     },
     handleLogin() {
-      this.$refs.ruleForm.validate(valid => {
+      this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, {expires: 30});
-            Cookies.set("password", encrypt(this.loginForm.password), {expires: 30});
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
             // Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30});
           } else {
             Cookies.remove("username");
             Cookies.remove("password");
             // Cookies.remove('rememberMe');
           }
-          this.$store.dispatch("Login", this.loginForm).then((res) => {
-            this.$router.push({path: this.redirect || "/"}).catch((res) => {
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then((res) => {
+              this.$router
+                .push({ path: this.redirect || "/" })
+                .catch((res) => {});
+            })
+            .catch((res) => {
+              this.loading = false;
+              this.$refs.checkV.refresh();
+              this.$message.error(res);
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
             });
-          }).catch((res) => {
-            this.loading = false;
-            this.$refs.checkV.refresh();
-            this.$message.error(res);
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
         }
       });
-    }
+    },
   },
   components: {
-    Verify
+    Verify,
   },
   created() {
     // 将参数拷贝进查询对象
@@ -233,12 +266,12 @@ export default {
       this.redirect = decodeURIComponent(query.redirect);
     }
 
-    axios.get("./config.json").then(res => {
+    axios.get("./config.json").then((res) => {
       this.hospName = res.data.hosp_name;
     });
 
     this.getCookie();
-  }
+  },
 };
 </script>
 
@@ -249,16 +282,18 @@ $bg: #2d3a4b;
 $dark_gray: #889aa4;
 $light_gray: #eee;
 .login-container {
-
   @include relative;
   background-color: white;
   background-image: url("../assets/login.jpg");
   background-size: 100vw 100vh;
   height: 100%;
 
-  input:-webkit-autofill {
-    -webkit-box-shadow: 0 0 0 1000px #293444 inset !important;
-    -webkit-text-fill-color: #fff !important;
+  input:-webkit-autofill,
+  input:-webkit-autofill:hover,
+  input:-webkit-autofill:focus,
+  input:-webkit-autofill:active {
+    -webkit-transition-delay: 99999s;
+    -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
   }
 
   .item {
@@ -311,11 +346,10 @@ $light_gray: #eee;
     margin-bottom: 50px;
   }
 
-
   .toptitle {
     position: absolute;
     font-size: 45px;
-    color: #FFFFFF;
+    color: #ffffff;
     margin: 120px auto 0.5333rem 180px;
     text-align: center;
     font-weight: bold;
diff --git a/src/views/register.vue b/src/views/register.vue
index a34d3a8..6171533 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -632,7 +632,6 @@ export default {
         nickName: [
           { required: true, message: "请输入用户名称", trigger: "blur" },
           { min: 2, max: 8, message: "用户名称在2-8个字符", trigger: "blur" },
-          { validator: validateName, trigger: "blur" },
         ],
         password: [
           { required: true, message: "请输入密码", trigger: "blur" },
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 6012907..02be875 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -40,12 +40,7 @@
             <el-button-group>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"
                 >重置
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"
-                >重置
-              </el-button>
-              <el-button type="primary" @click="onSubmit" icon="el-icon-search"
-                >查询
-              </el-button>
+
               <el-button type="primary" @click="onSubmit" icon="el-icon-search"
                 >查询
               </el-button>