Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/views/home/home.vue

@@ -2,7 +2,11 @@
   <a-layout class="Container">
     <a-layout-header class="header_box">
       <div class="logo">
-        <img style="width: 40px;margin-right: 20px;" src="@/assets/images/logo.jpg" alt="">
+        <img
+          style="width: 40px; margin-right: 20px"
+          src="@/assets/images/logo.png"
+          alt=""
+        />
         <i class="title">智慧大厅集成化综合管理平台</i>
         <!-- <i class="title">智慧政务一体化综合管理平台4.0</i> -->
         <div class="selectOnptions">

portal-manager-ui/admin/src/views/signIn/signIn.vue

@@ -24,8 +24,7 @@
             />
           </a-form-model-item>
           <a-form-model-item prop="password">
-            <a-input
-              type="password"
+            <a-input-password
               placeholder="请输入密码"
               onfocus="this.placeholder=''"
               onblur="this.placeholder='请输入密码'"
@@ -34,9 +33,22 @@
               v-model="form.password"
               @pressEnter="handleSubmit"
             />
+            <!-- <a-input
+              type="password"
+              placeholder="请输入密码"
+              onfocus="this.placeholder=''"
+              onblur="this.placeholder='请输入密码'"
+              style="width: 520px; height: 52px"
+              class="password"
+              v-model="form.password"
+              @pressEnter="handleSubmit"
+            /> -->
           </a-form-model-item>
           <a-form-model-item>
-            <a-button type="primary" class="addclass backstage" @click="handleSubmit"
+            <a-button
+              type="primary"
+              class="addclass backstage"
+              @click="handleSubmit"
               >登录</a-button
             >
           </a-form-model-item>
@@ -49,7 +61,7 @@
 <script>
 // import { mapMutations, mapActions } from "vuex";
 import { LoginInterface } from "@/api/user.js";
-import { changeAccount, changePassWord } from "@/utils/js/validate";
+// import { changeAccount, changePassWord } from "@/utils/js/validate";
 export default {
   data() {
     return {
@@ -58,12 +70,8 @@ export default {
         password: "",
       },
       rules: {
-        loginName: [
-          { required: true, validator: changeAccount, trigger: "blur" },
-        ],
-        password: [
-          { required: true, validator: changePassWord, trigger: "blur" },
-        ],
+        loginName: [{ required: true, message: "请输入账号", trigger: "blur" }],
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
     };
   },
@@ -124,12 +132,20 @@ export default {
       height: 220px;
       padding-top: 30px;
       .user,
-      .password {
+      /deep/.password {
         text-align: center;
         border-color: #dadada;
         margin: auto;
         margin-bottom: 5px;
         margin-top: 8px;
+        .ant-input {
+          height: 100%;
+          &::placeholder {
+            color: rgb(111, 164, 227);
+            font-size: 16px;
+          }
+          border: 1px solid #dadada !important;
+        }
       }
       /deep/.ant-col-offset-4 {
         width: 100%;