Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/AllPersonnelBase/modules/fcx.vue

@@ -716,6 +716,8 @@ export default {
             let arr = response.data.ret
             for (let i = 0; i < arr.length; i++) {
               cityOptions.push(arr[i].hpseqno)
+              this.checkedCities = cityOptions
+              this.checkAll = true
             }
             console.info("指位返回列表===>", arr);
           } else {
@@ -781,6 +783,7 @@ export default {
     },
     // 指位单选
     handleCheckAllChange (val) {
+      console.log(val, 11111)
       this.checkedCities = val ? cityOptions : [];
       this.isIndeterminate = false;
     },

src/views/cxyrd/TT.vue

@@ -851,20 +851,20 @@ export default {
         this.currentQqid = this.sourcedatas[i - 1].qqid;
         this.sourcebarcode = this.sourcedatas[i - 1].barcode;
         this.activeIndex3 -= 1;
+
+        this.fingerLoading = true;
+        // 指纹图清空
+        this.clearsource();
+        this.cleardest();
+        // 获取源的滚动
+        this.getSourceRollFingerPrintDetail(this.sourcebarcode);
+        // 获取源的平面
+        this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
+        // 获取候选列表
+        this.getMatchcandList();
       } else {
         this.$message.error("已经是第一条数据了");
       }
-      this.fingerLoading = true;
-      // 指纹图清空
-      this.clearsource();
-      this.cleardest();
-      // 获取源的滚动
-      this.getSourceRollFingerPrintDetail(this.sourcebarcode);
-      // 获取源的平面
-      this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
-      // 获取候选列表
-      this.getMatchcandList();
-
       console.info(this.currentQqid);
       console.info(this.sourcebarcode);
     },
@@ -875,19 +875,20 @@ export default {
         this.currentQqid = this.sourcedatas[i + 1].qqid;
         this.sourcebarcode = this.sourcedatas[i + 1].barcode;
         this.activeIndex3 += 1;
+
+        this.fingerLoading = true;
+        // 指纹图清空
+        this.clearsource();
+        this.cleardest();
+        // 获取源的滚动
+        this.getSourceRollFingerPrintDetail(this.sourcebarcode);
+        // 获取源的平面
+        this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
+        // 获取候选列表
+        this.getMatchcandList();
       } else {
         this.$message.error("已经是最后一条数据了");
       }
-      this.fingerLoading = true;
-      // 指纹图清空
-      this.clearsource();
-      this.cleardest();
-      // 获取源的滚动
-      this.getSourceRollFingerPrintDetail(this.sourcebarcode);
-      // 获取源的平面
-      this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
-      // 获取候选列表
-      this.getMatchcandList();
       console.info(this.currentQqid);
       console.info(this.sourcebarcode);
     },

vue.config.js

@@ -97,7 +97,7 @@ module.exports = {
         // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/   ma
         // target: "http://127.0.0.1:8099",
         // target: "http://47.92.225.109:5602",
-        target: "http://www.meetfood.cn:2390/",  // 湖南-线上
+        target: "http://www.meetfood.cn:2390/", // 湖南-线上
 
         ws: true,
         changeOrigin: true,
@@ -119,7 +119,7 @@ module.exports = {
         ws: true,
         changeOrigin: true,
         pathRewrite: {
-          "^/system": ""
+          "^/system": "/security"
         }
       }
       // 阿里