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

src/store/index.js

@@ -18,6 +18,7 @@ import rydaxx from "./modules/rydaxx";
 import ajdaxx from "./modules/ajdaxx";
 import loading from "./modules/loading";
 import ryzwbj from "./modules/ryzwbj";
+import ljk from "./modules/ljk";
 
 Vue.use(Vuex);
 
@@ -30,7 +31,8 @@ const store = new Vuex.Store({
     rydaxx,
     ajdaxx,
     loading,
-    ryzwbj
+    ryzwbj,
+    ljk
   },
   getters,
   plugins: [

src/store/modules/ljk.js

+import { _axios } from "@/plugins/axios";
+const state = {
+  targetOptions_ry: [],
+  targetOptions_aj: []
+};
+const mutations = {
+  ljkRy (state, res) {
+    state.targetOptions_ry = res
+  },
+  ljkAj (state, res) {
+    state.targetOptions_aj = res
+  }
+};
+
+const actions = {
+  _ljkRy (context, options) {// 获取人员逻辑库
+    _axios.get('/api/code/personLogic').then(res => {
+      if (res.data.code == 0 && res.data.message == "success") {
+        context.commit('ljkRy', res.data.ret);
+      }
+    })
+  },
+  _ljkAj (context, options) {// 获取案件逻辑库
+    _axios.get('/api/code/caseLogic').then(res => {
+      if (res.data.code == 0 && res.data.message == "success") {
+        context.commit('ljkAj', res.data.ret);
+      }
+    })
+  },
+}
+
+
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+};

src/views/Editor/modules/ajzwbjLeft.scss

@@ -160,8 +160,8 @@
                 display: flex;
                 justify-content: center;
                 img {
-                  // object-fit: contain;
-                  height: 100%;
+                  object-fit: contain;
+                  // height: 100%;
                 }
                 margin-left: 0;
               }

src/views/Editor/modules/imageEd.scss

@@ -15,6 +15,10 @@ $transOrigin: var(--transOrigin, 0px, 0px);
 $canvasHeight: var(--canvasHeight, 670px);
 $canvasWidth: var(--canvasWidth, 670px);
 
+// 预览框的宽高
+$previewWidth: var(--previewWidth, 100%);
+$previewHeight: var(--previewHeight, 100%);
+
 .imageBox {
   display: flex;
   .imageEd {
@@ -1080,15 +1084,13 @@ $canvasWidth: var(--canvasWidth, 670px);
         height: 144px;
         box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
         // overflow: hidden;
+        display: flex;
+        justify-content: center;
+        align-items: center;
         img {
-          position: absolute;
-          left: 0;
-          right: 0;
-          top: 0;
-          bottom: 0;
-          margin: auto;
-          width: $canvasWidth;
-          height: $canvasHeight;
+          object-fit: contain;
+          width: $previewWidth;
+          height: $previewHeight;
         }
         .block_small {
           width: 100%;

src/views/Editor/modules/imageEd.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2021-12-20 20:14:34
+ * @LastEditTime: 2021-12-21 10:51:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -670,6 +670,11 @@ export default {
     })
   },
   mounted () {
+    //检测浏览器刷新
+    window.onbeforeunload = function () {
+      //清除sessionStorage值
+      sessionStorage.clear()
+    }
     //console.log(this.$route.name);
     let self = this;
     var supportingFileAPI = !!(
@@ -1234,6 +1239,8 @@ export default {
 
       }
       self.resetTzdDrawing();
+      // 初始化缩略图
+      self.isShowSourcePrivew = false
       self.tzdDrawingLeft = 0
       self.tzdDrawingTop = 0
       self.tzdDrawing_left = 0
@@ -1261,9 +1268,13 @@ export default {
           if (self.newHeight >= self.newWidth) {
             document.getElementsByTagName('body')[0].style.setProperty('--canvasHeight', '100%');
             document.getElementsByTagName('body')[0].style.setProperty('--canvasWidth', 'auto');
+            document.getElementsByTagName('body')[0].style.setProperty('--previewHeight', '100%');
+            document.getElementsByTagName('body')[0].style.setProperty('--previewWidth', 'auto');
           } else {
             document.getElementsByTagName('body')[0].style.setProperty('--canvasWidth', '100%');
             document.getElementsByTagName('body')[0].style.setProperty('--canvasHeight', 'auto');
+            document.getElementsByTagName('body')[0].style.setProperty('--previewHeight', 'auto');
+            document.getElementsByTagName('body')[0].style.setProperty('--previewWidth', '100%');
           }
           // 记录canvas的宽度和高度
           self.canvasBox_width = $('.lower-canvas').width()
@@ -3944,7 +3955,13 @@ export default {
             p = "onmousemove";
           self.dragableDiv = o
           o.onmousedown = function (e) {
-            if (!self.isEnlarge && !self.mouseEnlarge) {
+            let flag = false
+            if (self.isEnlarge || self.mouseEnlarge || self.isHandTZD || self.isHand || self.startHand || self.isHandSpace) {
+              flag = false
+            } else {
+              flag = true
+            }
+            if (flag) {
               e.stopPropagation()
               e = e || event;
               x = e.clientX - document.querySelector('#preview-source').offsetLeft;
@@ -3969,7 +3986,7 @@ export default {
                   o[p] = null;
                 }
               };
-            };
+            }
           }
         }
         dragable_preview('preview-source-drag')

src/views/Editor/modules/imageEdAJ.scss

@@ -13,6 +13,10 @@ $directionRotate: var(--directionRotate, 0deg);
 $canvasHeight: var(--canvasHeight, 670px);
 $canvasWidth: var(--canvasWidth, 670px);
 
+// 预览框的宽高
+$previewWidth: var(--previewWidth, 100%);
+$previewHeight: var(--previewHeight, 100%);
+
 .imageBox {
   display: flex;
 
@@ -1229,9 +1233,14 @@ $canvasWidth: var(--canvasWidth, 670px);
           }
         }
       }
+      .disabled-img {
+        width: 64px;
+        height: 32px;
+      }
 
       .preview-source {
         z-index: 99999;
+        background: #ffffff;
         position: absolute;
         left: 0;
         top: 0;
@@ -1239,11 +1248,16 @@ $canvasWidth: var(--canvasWidth, 670px);
         width: 144px;
         height: 144px;
         box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
-        overflow: hidden;
+        // overflow: hidden;
+        display: flex;
+        justify-content: center;
+        align-items: center;
         img {
           object-fit: contain;
+          width: $previewWidth;
+          height: $previewHeight;
         }
-        
+
         .block_small {
           width: 100%;
           height: 100%;
@@ -1252,6 +1266,28 @@ $canvasWidth: var(--canvasWidth, 670px);
           top: 0;
           left: 0;
         }
+        .preview-source-drag {
+          cursor: grab;
+          width: 144px;
+          height: 40px;
+          position: absolute;
+          bottom: -40px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          &:active {
+            cursor: grabbing;
+          }
+          img {
+            width: 20px;
+            height: 20px;
+            cursor: grab;
+            -webkit-user-drag: none;
+            &:active {
+              cursor: grabbing;
+            }
+          }
+        }
       }
     }
   }
@@ -1302,9 +1338,9 @@ $canvasWidth: var(--canvasWidth, 670px);
 
         .shadow-ImageImport {
           position: absolute;
-          height: 100%;
+          height: calc(100% - 32px);
           width: 100%;
-          top: 0;
+          bottom: 0;
           left: 0;
           background: #f6f8fa;
           opacity: 0.5;
@@ -1373,6 +1409,7 @@ $canvasWidth: var(--canvasWidth, 670px);
             justify-content: space-between;
 
             .tpdr {
+              z-index: 100;
               cursor: pointer;
               width: 91px;
               height: 40px;
@@ -2345,7 +2382,7 @@ $canvasWidth: var(--canvasWidth, 670px);
           }
         }
       }
-
+      
       .options-top {
         position: relative;
         width: 336px;
@@ -3553,3 +3590,12 @@ $canvasWidth: var(--canvasWidth, 670px);
     border-radius: 4px !important;
   }
 }
+// 灰化图标
+.disabled.size.item{
+  width: 64px !important;
+  height: 32px !important;
+  .disabled-img {
+    width: 64px !important;
+    height: 32px !important;
+  }
+}
\ No newline at end of file

src/views/bzxxgl/bzxxfh.vue

 <!--
  * @Author: your name
  * @Date: 2021-12-01 15:25:22
- * @LastEditTime: 2021-12-20 16:41:24
+ * @LastEditTime: 2021-12-21 14:15:50
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
@@ -243,7 +243,7 @@ export default {
   },
   mounted () {
     // 若果是回显，重新用之前的查询条件
-    if(this.$route.query.formData) {
+    if (this.$route.query.formData) {
       this.ruleForm = JSON.parse(this.$route.query.formData)
     }
     this.getData();
@@ -252,7 +252,7 @@ export default {
     /**
      * 天数改变--自动查询列表
      */
-    daysChange() {
+    daysChange () {
       this.getData()
     },
     /**
@@ -410,7 +410,7 @@ export default {
         // 查重
         // this.$bus.emit('formDataTT', this.ruleForm)
         let routeUrl = this.$router.resolve({
-          path: "fhxxTT/"+rowData.id,
+          path: "fhxxTT/" + rowData.id,
           query: {
             formData: JSON.stringify(self.ruleForm)
           }
@@ -419,7 +419,7 @@ export default {
       } else if (rowData.querytype == '1') {
         // 倒查
         let routeUrl = this.$router.resolve({
-          path: "fhxxTL/"+rowData.id,
+          path: "fhxxTL/" + rowData.id,
           query: {
             formData: JSON.stringify(self.ruleForm)
           }
@@ -428,7 +428,7 @@ export default {
       } else if (rowData.querytype == '2') {
         // 正查
         let routeUrl = this.$router.resolve({
-          path: "fhxxLT/"+rowData.id,
+          path: "fhxxLT/" + rowData.id,
           query: {
             formData: JSON.stringify(self.ruleForm)
           }
@@ -437,7 +437,7 @@ export default {
       } else if (rowData.querytype == '3') {
         // 串查
         let routeUrl = this.$router.resolve({
-          path: "fhxxLL/"+rowData.id,
+          path: "fhxxLL/" + rowData.id,
           query: {
             formData: JSON.stringify(self.ruleForm)
           }
@@ -451,7 +451,7 @@ export default {
     confirmCxfh () {
       let self = this
       // 撤销复核原因必填
-      if(this.textarea == '') {
+      if (this.textarea == '') {
         this.$message.error('请输入原因！')
         return;
       }
@@ -544,8 +544,16 @@ export default {
       // this.$set(this.multipleSelection, [])
       if (this.isShowTip) {
         document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '24.625rem');
+        this.height = 394
+        let w1 = 1920;
+        let w2 = window.innerWidth;
+        this.height = (this.height * w2) / w1;
       } else {
         document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '28.125rem');
+        this.height = 540
+        let w1 = 1920;
+        let w2 = window.innerWidth;
+        this.height = (this.height * w2) / w1;
       }
     },
     /**
@@ -574,7 +582,7 @@ export default {
     }
   },
   computed: {
-    roleArr() {
+    roleArr () {
       return this.$store.state.layout.Menu;
     },
     /**

src/views/bzxxgl/fhxxLT.vue

 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:35:26
- * @LastEditTime: 2021-12-20 16:43:02
+ * @LastEditTime: 2021-12-21 14:01:37
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
@@ -572,6 +572,10 @@ export default {
           }
           this.getLftPic()
           this.getPersonPic()
+          sessionStorage.setItem('srcseqno', this.allData.bzxxXh)
+          sessionStorage.setItem('srcbarcode', this.allData.ysxtAsjbh)
+          sessionStorage.setItem('destseqno', this.allData.bzxxZwXh)
+          sessionStorage.setItem('destbarcode', this.allData.ysxtAsjxgrybh)
         }
       }).catch(err => {
         console.log(err)

src/views/bzxxgl/fhxxTL.vue

 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:35:26
- * @LastEditTime: 2021-12-20 16:43:20
+ * @LastEditTime: 2021-12-21 14:01:56
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
@@ -582,6 +582,10 @@ export default {
           }
           this.getCasePic()
           this.getPersonPic()
+          sessionStorage.setItem('srcseqno', this.allData.bzxxXh)
+          sessionStorage.setItem('srcbarcode', this.allData.ysxtAsjbh)
+          sessionStorage.setItem('destseqno', this.allData.bzxxZwXh)
+          sessionStorage.setItem('destbarcode', this.allData.ysxtAsjxgrybh)
         }
       }).catch(err => {
         console.log(err)

src/views/cxyrd/LL.vue

@@ -726,6 +726,7 @@ div {
   width: 100%;
   display: flex;
   flex-direction: row;
+  background: #fff;
 }
 .lt_main_left {
   width: 352px;

src/views/cxyrd/LT.vue

@@ -677,6 +677,7 @@ div {
   display: flex;
   // flex-direction: row;
   justify-content: space-between;
+  background: #fff;
 }
 .lt_main_left {
   width: 352px;

src/views/cxyrd/TL.vue

@@ -638,6 +638,7 @@ div {
   width: 100%;
   display: flex;
   justify-content: space-between;
+  background: #fff;
   .main-left {
     width: 352px;
     border: none;

src/views/drFPTX/Index.vue

@@ -7,9 +7,18 @@
       class='drlx'
       v-model="drlx"
     >
-      <el-radio :label="3" v-if="roleArr.includes('B-1-1')">人员</el-radio>
-      <el-radio :label="6" v-if="roleArr.includes('B-1-2')">案件</el-radio>
-      <el-radio :label="9" v-if="roleArr.includes('B-1-3')">比中关系</el-radio>
+      <el-radio
+        :label="3"
+        v-if="roleArr.includes('B-1-1')"
+      >人员</el-radio>
+      <el-radio
+        :label="6"
+        v-if="roleArr.includes('B-1-2')"
+      >案件</el-radio>
+      <el-radio
+        :label="9"
+        v-if="roleArr.includes('B-1-3')"
+      >比中关系</el-radio>
     </el-radio-group>
     <div class='choose'>
       <div class="wjlx">
@@ -251,7 +260,7 @@
               v-model="checkAll"
               @change="handleCheckAllChange"
             >全选</el-checkbox> -->
-            <el-checkbox-group
+            <!-- <el-checkbox-group
               v-model="checkedTargets"
               @change="handleCheckedTargetsChange"
             >
@@ -260,7 +269,15 @@
                 :label="target"
                 :key="target"
               >{{target}}</el-checkbox>
+            </el-checkbox-group> -->
+            <el-checkbox-group v-model="checkedTargets">
+              <el-checkbox
+                v-for="(value,key) in targets"
+                :key="key"
+                :label="value.code"
+              >{{ value.name }}</el-checkbox>
             </el-checkbox-group>
+
           </div>
         </div>
       </div>
@@ -420,7 +437,7 @@
               v-model="checkAllLeft"
               @change="handleCheckAllChangeLeft"
             >全选</el-checkbox> -->
-            <el-checkbox-group
+            <!-- <el-checkbox-group
               v-model="checkedTargetsLeft"
               @change="handleCheckedTargetsChangeLeft"
             >
@@ -429,7 +446,7 @@
                 :label="target"
                 :key="target"
               >{{target}}</el-checkbox>
-            </el-checkbox-group>
+            </el-checkbox-group> -->
           </div>
           <div class="line"></div>
           <div class="targetRight">
@@ -438,7 +455,7 @@
               v-model="checkAllRight"
               @change="handleCheckAllChangeRight"
             >全选</el-checkbox> -->
-            <el-checkbox-group
+            <!-- <el-checkbox-group
               v-model="checkedTargetsRight"
               @change="handleCheckedTargetsChangeRight"
             >
@@ -447,7 +464,7 @@
                 :label="target"
                 :key="target"
               >{{target}}</el-checkbox>
-            </el-checkbox-group>
+            </el-checkbox-group> -->
           </div>
         </div>
       </div>
@@ -528,11 +545,9 @@ export default {
       fileContent: '', // 导入文件内容
 
       // 人员/案件 导入逻辑库
-      checkAll: false,   // 逻辑库全选
-      checkedTargets: [],  // 选定逻辑库
+      checkedTargets: ['1'],  // 选定逻辑库
       targetHead: '人员逻辑分库',// 逻辑库标题
-      targets: targetOptions_ry, // 逻辑库列表
-      isIndeterminate: false, // 逻辑库全选状态
+      targets: this.$store.state.ljk.targetOptions_ry, // 逻辑库列表
 
       // 表格
       selectArr: [],  // 右边列表
@@ -542,14 +557,10 @@ export default {
       nowSelectRightData: [], // 右边选中列表数据
 
       // 比中关系
-      checkAllLeft: false,   // 逻辑库全选
       checkedTargetsLeft: [],  // 选定逻辑库 
-      targetsLeft: targetOptions_ry, // 逻辑库列表
-      isIndeterminateLeft: false, // 逻辑库全选状态
-      checkAllRight: false,   // 逻辑库全选
+      targetsLeft: this.$store.state.ljk.targetOptions_ry, // 逻辑库列表
       checkedTargetsRight: [],  // 选定逻辑库
-      targetsRight: targetOptions_aj, // 逻辑库列表
-      isIndeterminateRight: false, // 逻辑库全选状态
+      targetsRight: this.$store.state.ljk.targetOptions_aj, // 逻辑库列表
       newArr: [],
 
 
@@ -572,7 +583,7 @@ export default {
     drlx (newValue, oldValue) {
       if (newValue == 3) {
         this.targetHead = '人员逻辑分库'
-        this.targets = targetOptions_ry
+        this.targets = this.$store.state.ljk.targetOptions_ry
         this.action = '/api/upload/person'
         this.isIndeterminate = false
         this.checkAll = false
@@ -581,14 +592,14 @@ export default {
         this.selectArr = []
         this.nowSelectRightData = []
         this.fileList = []
-        this.checkedTargets = []
+        this.checkedTargets = ['1']
         this.logicList = [] // 目标逻辑库数组
         this.logicPsnList = []// 比中关系人员逻辑库数组
         this.logicCaseList = []//比中关系案件逻辑库数组
         this.$forceUpdate()
       } else if (newValue == 6) {
         this.targetHead = '案件逻辑分库'
-        this.targets = targetOptions_aj
+        this.targets = this.$store.state.ljk.targetOptions_aj
         this.action = '/api/upload/case'
         this.isIndeterminate = false
         this.checkAll = false
@@ -597,7 +608,7 @@ export default {
         this.selectArr = []
         this.nowSelectRightData = []
         this.fileList = []
-        this.checkedTargets = []
+        this.checkedTargets = ['1']
         this.logicList = [] // 目标逻辑库数组
         this.logicPsnList = []// 比中关系人员逻辑库数组
         this.logicCaseList = []//比中关系案件逻辑库数组
@@ -609,8 +620,8 @@ export default {
         this.nowSelectRightData = []
         this.fileList = []
         this.checkedTargets = []
-        this.checkedTargetsRight = []
-        this.checkedTargetsLeft = []
+        this.checkedTargetsRight = ['1']
+        this.checkedTargetsLeft = ['1']
         this.logicList = [] // 目标逻辑库数组
         this.logicPsnList = []// 比中关系人员逻辑库数组
         this.logicCaseList = []//比中关系案件逻辑库数组
@@ -1143,39 +1154,39 @@ export default {
       var fileDic = this.$refs['upload'].$children[0].$refs.input
       //console.log(fileDic, 111222)
     },
-    // 人员/案件逻辑分库
-    handleCheckAllChange (val) {
-      if (this.drlx == 3) {
-        this.checkedTargets = val ? targetOptions_ry : [];
-      } else if (this.drlx == 6) {
-        this.checkedTargets = val ? targetOptions_aj : [];
-      }
-      this.isIndeterminate = false;
-    },
-    handleCheckedTargetsChange (value) {
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.targets.length;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.targets.length;
-    },
-    // 比中关系逻辑分库
-    handleCheckAllChangeLeft (val) {
-      this.checkedTargetsLeft = val ? targetOptions_ry : [];
-      this.isIndeterminateLeft = false;
-    },
-    handleCheckedTargetsChangeLeft (value) {
-      let checkedCount = value.length;
-      this.checkAllLeft = checkedCount === this.targetsLeft.length;
-      this.isIndeterminateLeft = checkedCount > 0 && checkedCount < this.targetsLeft.length;
-    },
-    handleCheckAllChangeRight (val) {
-      this.checkedTargetsRight = val ? targetOptions_aj : [];
-      this.isIndeterminateRight = false;
-    },
-    handleCheckedTargetsChangeRight (value) {
-      let checkedCount = value.length;
-      this.checkAllRight = checkedCount === this.targetsRight.length;
-      this.isIndeterminateRight = checkedCount > 0 && checkedCount < this.targetsRight.length;
-    },
+    // // 人员/案件逻辑分库
+    // handleCheckAllChange (val) {
+    //   if (this.drlx == 3) {
+    //     this.checkedTargets = val ? targetOptions_ry : [];
+    //   } else if (this.drlx == 6) {
+    //     this.checkedTargets = val ? targetOptions_aj : [];
+    //   }
+    //   this.isIndeterminate = false;
+    // },
+    // handleCheckedTargetsChange (value) {
+    //   let checkedCount = value.length;
+    //   this.checkAll = checkedCount === this.targets.length;
+    //   this.isIndeterminate = checkedCount > 0 && checkedCount < this.targets.length;
+    // },
+    // // 比中关系逻辑分库
+    // handleCheckAllChangeLeft (val) {
+    //   this.checkedTargetsLeft = val ? targetOptions_ry : [];
+    //   this.isIndeterminateLeft = false;
+    // },
+    // handleCheckedTargetsChangeLeft (value) {
+    //   let checkedCount = value.length;
+    //   this.checkAllLeft = checkedCount === this.targetsLeft.length;
+    //   this.isIndeterminateLeft = checkedCount > 0 && checkedCount < this.targetsLeft.length;
+    // },
+    // handleCheckAllChangeRight (val) {
+    //   this.checkedTargetsRight = val ? targetOptions_aj : [];
+    //   this.isIndeterminateRight = false;
+    // },
+    // handleCheckedTargetsChangeRight (value) {
+    //   let checkedCount = value.length;
+    //   this.checkAllRight = checkedCount === this.targetsRight.length;
+    //   this.isIndeterminateRight = checkedCount > 0 && checkedCount < this.targetsRight.length;
+    // },
 
     // 表格穿梭框
     checkAll1 (val) {
@@ -1253,7 +1264,7 @@ export default {
     }
   },
   computed: {
-    roleArr(){
+    roleArr () {
       return this.$store.state.layout.Menu
     }
   },

src/views/login/modules/AccountsLogin.vue

@@ -61,7 +61,7 @@ export default {
   watch: {
     loginType: {
       immediate: true,
-      handler(val) {
+      handler (val) {
         //console.info("account参数===>", val);
         if (val === true) {
           this.isShow = true
@@ -71,7 +71,7 @@ export default {
       },
     },
   },
-  data() {
+  data () {
     return {
       btnLoading: false,
       isShow: false,
@@ -100,17 +100,19 @@ export default {
           user.setUser(res.data.userInfo)
           this.$message.success('登录成功！')
           //所在单位数据
-          this.$store.dispatch('publicData/_getList')
-          this.$router.push('/index')
-          this.$bus.emit('goLogin')
-          this.$store.commit('layout/setMenu', res.data.auth)
+          this.$store.dispatch("publicData/_getList");
+          this.$store.dispatch("ljk/_ljkRy") // 获取用户逻辑库
+          this.$store.dispatch("ljk/_ljkAj") // 获取用户逻辑库
+          this.$router.push("/index");
+          this.$bus.emit("goLogin");
+          this.$store.commit("layout/setMenu", res.data.auth);
         } else {
           this.$message.error(res.data.message)
         }
       })
     },
   },
-  mounted() {
+  mounted () {
     // todo 选中进来清空userInfo数据
   },
 }

src/views/zzwcj/Index.vue

@@ -7,18 +7,79 @@
  * @FilePath: \founder_vue\src\views\zzwcj\Index.vue
 -->
 <template>
-  <div id="zzwcl">指掌纹采集</div>
+  <div id="zzwcl">指掌纹采集
+
+    <div
+      class="page"
+      id="app"
+    >
+      <button
+        @click="getMsg"
+        class="get-msg"
+      >获取数据</button>
+      <button
+        @click="cancelGetMsg"
+        class="cancel"
+      >取消获取</button>
+      <ul>
+        <li
+          v-for="item in items"
+          :key="item"
+        >{{item.name}}</li>
+      </ul>
+    </div>
+  </div>
+
 </template>
 
 <script>
+import axios from "axios"
 export default {
   name: "zzwcj",
-  mounted() {
+  mounted () {
     zoom("zzwcl");
     window.addEventListener("resize", function () {
       zoom("zzwcl");
     });
   },
+  data () {
+    return {
+      message: 'Hello Vue!',
+      items: [],
+      cancel: null
+    }
+  },
+  methods: {
+    getMsg () {
+      let CancelToken = axios.CancelToken
+      let self = this
+      axios.get('/api/upload/testAbort', {
+        cancelToken: new CancelToken(function executor (c) {
+          self.cancel = c
+          console.log(c)
+          // 这个参数 c 就是CancelToken构造函数里面自带的取消请求的函数，这里把该函数当参数用
+        }),
+        headers: {
+          Authorization: localStorage.getItem("token"),
+          BrowserHeader: 'H5'
+        }
+      }).then(res => {
+        this.items = res.data
+      }).catch(err => {
+        console.log(err)
+      })
+      //手速够快就不用写这个定时器了，点击取消获取就可以看到效果了
+      // setTimeout(function () {
+      //   //只要我们去调用了这个cancel()方法，没有完成请求的接口便会停止请求
+      //   self.cancel()
+      // }, 100)
+    },
+    //cancelGetMsg 方法跟上面的setTimeout函数是一样的效果，因为手速不够快，哦不，是因为网速太快，导致我来不及点取消获取按钮，数据就获取成功了
+    cancelGetMsg () {
+      // 在这里去判断你的id 1 2 3，你默认是展示的tab1，点击的时候不管你上一个请求有没有执行完都去调用这个cancel()，
+      this.cancel()
+    }
+  }
 };
 </script>
 

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-12-20 19:26:31
+ * @LastEditTime: 2021-12-21 14:07:09
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -91,14 +91,14 @@ module.exports = {
       "/api": {
         // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
         // target: "http://192.168.128.166:8099/", // 张 认定
-        // target: "http://192.168.128.114:8099",  // 湖南-马
+        target: "http://192.168.128.114:8099",  // 湖南-马
         // target: "http://192.168.128.116:8099",  // 湖南-王
         // target: "http://192.168.128.118:8764",  // 湖南-张呈光
         // 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://zwpt.xzclub.top:9333/",
+        // target:"http://zwpt.xzclub.top:9333/",
         // target: "http://192.168.128.100:8099",  // 江
         ws: true,
         changeOrigin: true,
@@ -130,9 +130,9 @@ module.exports = {
 
       "/security": {
         //target: "http://192.168.128.106:8765", // 湖南-王
-        target: "http://192.168.128.112:8765", // 湖南-张
+        // target: "http://192.168.128.112:8765", // 湖南-张
         // target: "http://www.meetfood.cn:2390", // 湖南-王
-        // target: "http://zwpt.xzclub.top:9333",
+        target: "http://zwpt.xzclub.top:9333",
         ws: true,
         changeOrigin: true,
         pathRewrite: {