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,9 +851,7 @@ export default {
         this.currentQqid = this.sourcedatas[i - 1].qqid;
         this.sourcebarcode = this.sourcedatas[i - 1].barcode;
         this.activeIndex3 -= 1;
-      } else {
-        this.$message.error("已经是第一条数据了");
-      }
+
         this.fingerLoading = true;
         // 指纹图清空
         this.clearsource();
@@ -864,7 +862,9 @@ export default {
         this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
         // 获取候选列表
         this.getMatchcandList();
-
+      } else {
+        this.$message.error("已经是第一条数据了");
+      }
       console.info(this.currentQqid);
       console.info(this.sourcebarcode);
     },
@@ -875,9 +875,7 @@ export default {
         this.currentQqid = this.sourcedatas[i + 1].qqid;
         this.sourcebarcode = this.sourcedatas[i + 1].barcode;
         this.activeIndex3 += 1;
-      } else {
-        this.$message.error("已经是最后一条数据了");
-      }
+
         this.fingerLoading = true;
         // 指纹图清空
         this.clearsource();
@@ -888,6 +886,9 @@ export default {
         this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
         // 获取候选列表
         this.getMatchcandList();
+      } else {
+        this.$message.error("已经是最后一条数据了");
+      }
       console.info(this.currentQqid);
       console.info(this.sourcebarcode);
     },

vue.config.js

@@ -119,7 +119,7 @@ module.exports = {
         ws: true,
         changeOrigin: true,
         pathRewrite: {
-          "^/system": ""
+          "^/system": "/security"
         }
       }
       // 阿里