seimin лет назад: 2
Родитель
Сommit
8dec015ad7
5 измененных файлов с 14862 добавлено и 58 удалено
  1. 14849 20
      package-lock.json
  2. 0 1
      package.json
  3. 1 1
      src/main.js
  4. 1 1
      src/router/index.js
  5. 11 35
      src/views/AppIndex.vue

Разница между файлами не показана из-за своего большого размера
+ 14849 - 20
package-lock.json


+ 0 - 1
package.json

@@ -12,7 +12,6 @@
12 12
   "dependencies": {
13 13
     "axios": "^0.20.0",
14 14
     "core-js": "^3.6.5",
15
-    "crypto-js": "^4.0.0",
16 15
     "vue": "^2.6.11",
17 16
     "vue-custom-scrollbar": "^1.3.0",
18 17
     "vue-router": "^3.4.3"

+ 1 - 1
src/main.js

@@ -3,7 +3,7 @@ import App from './App.vue'
3 3
 import router from './router'
4 4
 import './filters'
5 5
 Vue.config.productionTip = false
6
-console.info('v2.4.1');
6
+console.info('v2.4.2');
7 7
 
8 8
 import loading from './plugins/loading/loading.js';
9 9
 Vue.use(loading)

+ 1 - 1
src/router/index.js

@@ -4,7 +4,7 @@ import VueRouter from 'vue-router'
4 4
 Vue.use(VueRouter)
5 5
 
6 6
 const routes = [{
7
-  path: '/:hosIds/:username/:password',
7
+  path: '/:hosIds',
8 8
   name: 'index',
9 9
   component: () => import('../views/AppIndex.vue')
10 10
 }]

+ 11 - 35
src/views/AppIndex.vue

@@ -755,7 +755,6 @@
755 755
 </template>
756 756
 
757 757
 <script>
758
-import { AES, mode, pad, enc } from "crypto-js";
759 758
 import vueCustomScrollbar from "vue-custom-scrollbar";
760 759
 import { get, post } from "./../http/http";
761 760
 import showModel from "./../components/showModel";
@@ -975,7 +974,12 @@ export default {
975 974
       this.model = false;
976 975
       this.$showLoading();
977 976
       if (this.coopData.dataList.length) {
978
-        if (this.workType == 2 && (this.coopData.dataList[0][2] == 2||this.coopData.dataList[0][2] == 3||this.coopData.dataList[0][2] == 4)) {
977
+        if (
978
+          this.workType == 2 &&
979
+          (this.coopData.dataList[0][2] == 2 ||
980
+            this.coopData.dataList[0][2] == 3 ||
981
+            this.coopData.dataList[0][2] == 4)
982
+        ) {
979 983
           //自选排班,并且是科室绑定人员,科室绑定分组,绑定分组
980 984
           post("/auth/customOfflinePc", { userId: this.coopData.id }).then(
981 985
             (result1) => {
@@ -989,15 +993,6 @@ export default {
989 993
         this.normalWork();
990 994
       }
991 995
     },
992
-    //aes解密
993
-    encryptByDeAES(data) {
994
-      let Key = "dsadmin";
995
-      let tmpDeAES = AES.decrypt(data, Key, {
996
-        mode: mode.CBC,
997
-        padding: pad.Pkcs7,
998
-      });
999
-      return tmpDeAES.toString(enc.Utf8);
1000
-    },
1001 996
     // 点击详情(标本科室视图)
1002 997
     detail(item) {
1003 998
       console.log(item);
@@ -1364,7 +1359,7 @@ export default {
1364 1359
       let postData1 = {
1365 1360
         idx: 0,
1366 1361
         sum: 999,
1367
-        group2: { hospitals: this.$route.params.hosIds,type:1 },
1362
+        group2: { hospitals: this.$route.params.hosIds, type: 1 },
1368 1363
       };
1369 1364
       this.loading2 = flag;
1370 1365
       post("/data/fetchDataList/group2", postData1).then((result1) => {
@@ -1431,7 +1426,7 @@ export default {
1431 1426
       let postData = {
1432 1427
         idx: 0,
1433 1428
         sum: 999,
1434
-        group2: { hospitals: this.$route.params.hosIds + "",type:1 },
1429
+        group2: { hospitals: this.$route.params.hosIds + "", type: 1 },
1435 1430
       };
1436 1431
       this.loading10 = flag;
1437 1432
       post("/data/fetchDataList/group2", postData).then((result) => {
@@ -1479,28 +1474,9 @@ export default {
1479 1474
     // 登录
1480 1475
     login() {
1481 1476
       this.loading1 = true;
1482
-      // this.loading2 = true;
1483
-      // this.loading4 = true;
1484
-      // this.loading5 = true;
1485
-      // this.loading6 = true;
1486
-      // this.loading9 = true;
1487
-      // this.loading10 = true;
1488
-      let postData = {
1489
-        username: this.encryptByDeAES(
1490
-          decodeURIComponent(this.$route.params.username)
1491
-        ),
1492
-        password: this.encryptByDeAES(
1493
-          decodeURIComponent(this.$route.params.password)
1494
-        ),
1495
-      };
1496
-      post("/auth/login", postData).then((result) => {
1497
-        if (result.status == 200) {
1498
-          this.userData = result.user;
1499
-          this.getWorkType();
1500
-        } else {
1501
-          this.userData = [];
1502
-        }
1503
-      });
1477
+      let loginUser = JSON.parse(localStorage.getItem("user"));
1478
+      this.userData = loginUser ? loginUser.user : [];
1479
+      this.getWorkType();
1504 1480
     },
1505 1481
   },
1506 1482
   created() {