2 Commits 6cf8b45af7 ... 0f84ba424d

Auteur SHA1 Bericht Datum
  wdq 0f84ba424d Merge branch 'master' of http://47.103.92.60:3003/skyversation/qp_onemap_ui.git 3 weken geleden
  wdq f56eceeb1a 默认登录方法更新 3 weken geleden
5 gewijzigde bestanden met toevoegingen van 42 en 37 verwijderingen
  1. 2 2
      package-lock.json
  2. 32 31
      public/index.html
  3. 0 0
      public/static/plugins/createAuth.js
  4. 1 2
      src/App.vue
  5. 7 2
      src/api/common.js

+ 2 - 2
package-lock.json

@@ -560,7 +560,7 @@
     },
     "node_modules/@vue-office/excel": {
       "version": "1.7.14",
-      "resolved": "https://registry.npmjs.org/@vue-office/excel/-/excel-1.7.14.tgz",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/@vue-office/excel/-/excel-1.7.14.tgz",
       "integrity": "sha512-pVUgt+emDQUnW7q22CfnQ+jl43mM/7IFwYzOg7lwOwPEbiVB4K4qEQf+y/bc4xGXz75w1/e3Kz3G6wAafmFBFg==",
       "hasInstallScript": true,
       "license": "MIT",
@@ -7013,7 +7013,7 @@
     },
     "node_modules/vue-demi": {
       "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
       "license": "MIT",

+ 32 - 31
public/index.html

@@ -9,12 +9,11 @@
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
-
   <link rel="stylesheet" href="/static/css/reset.css">
   <script src="/static/config/config.js"></script>
-
   <script src="/static/plugins/Cesium/Cesium.js"></script>
   <link rel="stylesheet" href="/static/plugins/Cesium/Widgets/widgets.css">
+  <script src="/static/plugins/createAuth.js"></script>
 </head>
 
 <body>
@@ -27,39 +26,41 @@
 </body>
 
 <style>
-    :root {
-      /* 滚动条整体部分,必须要设置 */
-      ::-webkit-scrollbar {
-        width: 6px;
-        height: 10px;
-        overflow-y: overlay;
-      }
+  :root {
 
-      /* 滚动条里面轨道,能向上向下移动 */
-      ::-webkit-scrollbar-track {
-        background-color: transparent;
-      }
+    /* 滚动条整体部分,必须要设置 */
+    ::-webkit-scrollbar {
+      width: 6px;
+      height: 10px;
+      overflow-y: overlay;
+    }
 
-      /* 滚动条里面轨道,能向上向下移动 */
-      ::-webkit-scrollbar-track-piece {
-        background-color: transparent;
-      }
+    /* 滚动条里面轨道,能向上向下移动 */
+    ::-webkit-scrollbar-track {
+      background-color: transparent;
+    }
 
-      ::-webkit-scrollbar-thumb {
-        display: none;
-        border-radius: 6px;
-      }
+    /* 滚动条里面轨道,能向上向下移动 */
+    ::-webkit-scrollbar-track-piece {
+      background-color: transparent;
+    }
 
-      /* 滚动条里面的小方块,能向上向下移动 */
-      *:hover::-webkit-scrollbar-thumb {
-        display: flex;
-        background-color: rgb(163, 166, 173, 0.5);
-        border-radius: 6px;
-      }
+    ::-webkit-scrollbar-thumb {
+      display: none;
+      border-radius: 6px;
+    }
+
+    /* 滚动条里面的小方块,能向上向下移动 */
+    *:hover::-webkit-scrollbar-thumb {
+      display: flex;
+      background-color: rgb(163, 166, 173, 0.5);
+      border-radius: 6px;
+    }
 
-      *:hover::-webkit-scrollbar-track-piece {
-        background-color: rgb(209, 207, 207,0);
-      }
+    *:hover::-webkit-scrollbar-track-piece {
+      background-color: rgb(209, 207, 207, 0);
     }
-  </style>
+  }
+</style>
+
 </html>

File diff suppressed because it is too large
+ 0 - 0
public/static/plugins/createAuth.js


+ 1 - 2
src/App.vue

@@ -25,9 +25,8 @@ export default {
     // 默认登录
     api.login({
       userName: systemConfig.defaultAccount.userName,
-      password: systemConfig.defaultAccount.password,
+      password: AesEncryptUtil.getPassword(),
       clientId: "1",
-      serviceId: "0",
     }).then((result) => {
       if (result.code == 200) {
         that.$store.commit("setUserInfo", result.content);

+ 7 - 2
src/api/common.js

@@ -2,9 +2,14 @@ import {
   postform
 } from '../utils/request'
 
-// 登录
+// // 登录 (用户名,密码)
+// const login = (params) => {
+//   return postform(systemConfig.oauthServiceUrl + '/user/login', params)
+// }
+
+// 登录 (用户名,加密密码)
 const login = (params) => {
-  return postform(systemConfig.oauthServiceUrl + '/user/login', params)
+  return postform(systemConfig.oauthServiceUrl + '/user/pwd/login', params)
 }
 
 export default {

Some files were not shown because too many files changed in this diff