浏览代码

no message

hzj18279462576@163.com 3 年之前
父节点
当前提交
ec0314cc7b
共有 5 个文件被更改,包括 13 次插入11 次删除
  1. 3 0
      admin/src/App.vue
  2. 1 1
      admin/src/router/index.js
  3. 1 1
      admin/src/store/modules/user.js
  4. 2 1
      admin/src/views/home/index.vue
  5. 6 8
      admin/src/views/login/index.vue

+ 3 - 0
admin/src/App.vue

@@ -28,5 +28,8 @@ body {
   ::-webkit-scrollbar {
     display: none; /* Chrome Safari */
   }
+  .v-model {
+    display: none !important;
+  }
 }
 </style>

+ 1 - 1
admin/src/router/index.js

@@ -22,7 +22,7 @@ export const asyncRoutes = [
     {
         path: '/',
         name: 'Layout',
-        redirect: '/home',
+        redirect: '/login',
         alwaysShow: true,
         component: Layout,
         children: [

+ 1 - 1
admin/src/store/modules/user.js

@@ -39,7 +39,7 @@ const actions = {
     login({ commit }, userInfo) {
         const { username, password } = userInfo
         return new Promise((resolve, reject) => {
-            api.hotelAdmin.hotelAdminLogin({ username: username.trim(), password: password })
+            api.hotelAdmin.hotelStaffLogin({ username: username.trim(), password: password })
                 .then((response) => {
                     console.log(response);
                     const { data } = response

+ 2 - 1
admin/src/views/home/index.vue

@@ -161,7 +161,7 @@
                       {{ item.statuName }}
                     </div>
                   </div>
-                  <template v-if="!item.statu">
+                  <template v-if="item.statu != 2">
                     <div class="teacher">{{ item.useInfo.userName }}</div>
                     <div class="num">
                       <span>水:{{ item.useInfo.startOfWater }}吨</span
@@ -175,6 +175,7 @@
                         <el-dialog
                           title="门锁管理"
                           :visible.sync="doorLock"
+                          :modal-append-to-body="true"
                           width="30%"
                           :before-close="lockClose"
                         >

+ 6 - 8
admin/src/views/login/index.vue

@@ -49,8 +49,6 @@
 </template>
 
 <script>
-import * as rsa from "@/utils/rsa";
-
 import { JSEncrypt } from "jsencrypt";
 export default {
   name: "Login",
@@ -121,12 +119,12 @@ export default {
         // 符合验证规则
         if (valid) {
           this.loading = true;
-          // let publicKey =
-          //   "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMOcPB06u5yKyQsPjfVWiWgbEIrd14kiXNNihciaVKb6HnkQvq7zpQuZ80WEX94spnUMI3iOAl/GmIvHrpGwcbB4hJbznm+PajiwnUSPuCCXA68YJF640cJKb/8KeM7WVz69OFkIEPHhVxOy4FFF5QWe/kt6zOZ19HmE+ak+5x/QIDAQAB";
-          // let encryptor = new JSEncrypt(); // 新建JSEncrypt对象
-          // encryptor.setPublicKey(publicKey); // 设置公钥
-          // let rsaPassWord = encryptor.encrypt(this.loginForm.password); // 对密码进行加密
-          let rsaPassWord = rsa.RSAencrypt(this.loginForm.password); // 对密码进行加密
+          let publicKey =
+            "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMOcPB06u5yKyQsPjfVWiWgbEIrd14kiXNNihciaVKb6HnkQvq7zpQuZ80WEX94spnUMI3iOAl/GmIvHrpGwcbB4hJbznm+PajiwnUSPuCCXA68YJF640cJKb/8KeM7WVz69OFkIEPHhVxOy4FFF5QWe/kt6zOZ19HmE+ak+5x/QIDAQAB";
+          let encryptor = new JSEncrypt(); // 新建JSEncrypt对象
+          encryptor.setPublicKey(publicKey); // 设置公钥
+          let rsaPassWord = encryptor.encrypt(this.loginForm.password); // 对密码进行加密
+          console.log(rsaPassWord);
           this.$store
             .dispatch("user/login", {
               username: this.loginForm.username,