Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

src/components/ImageEd.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-09 09:28:46
- * @LastEditTime: 2022-04-24 19:54:01
+ * @LastEditTime: 2022-04-25 23:10:39
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
 -->
@@ -5582,7 +5582,7 @@ export default {
       // 历史记录背景色
       $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
 
-      this.isLineOptions = !this.isLineOptions;
+      // this.isLineOptions = !this.isLineOptions;
       this.isActive_line = !this.isActive_line;
       // this.isNormalActiveIcon = true;
       // this.isNormalActiveName = true;
@@ -5592,12 +5592,14 @@ export default {
       // this.isMediumActiveName = false;
       // this.isBoldActiveIcon = false;
       // this.isBoldActiveName = false;
-      if (!this.isLineOptions) {
+      if (!this.isActive_line) {
+        this.isLineOptions = false
         this.isShowLineColor = false;
         this.imageEditor.stopDrawingMode();
         this.imageEditor2.stopDrawingMode();
         //console.log(777);
       } else {
+        this.isLineOptions = true
         // $selectLine.click()
       }
       if (this.isActive_line) {

src/views/AllPersonnelBase/modules/ajxxk.vue

@@ -514,7 +514,7 @@ export default {
         display: flex;
         justify-content: center;
         img {
-          height: 300px;
+          height: 100%;
         }
         .noImg {
           img {

src/views/AllPersonnelBase/modules/fcx.vue

@@ -322,7 +322,7 @@ export default {
           cxtype: [],
           querytype: '', // 查询类型
         },
-        srcDataType: ['1', '2'],// 源数据类型人员
+        srcDataType: ['1'],// 源数据类型人员
         queryClass: '3', // 优先级
         matchCount: '10',// 候选个数
         srcDataTypeAj: ['7'],//源数据类型案件
@@ -396,7 +396,7 @@ export default {
       this.$emit('closeFcx', this.dialogVisible);
     },
     'ruleForm.cxlx.querytype' (val) {
-      this.ruleForm.srcDataType = ['1', '2']  // 查询类型切换清空数据类型
+      this.ruleForm.srcDataType = ['1']  // 查询类型切换清空数据类型
       this.ruleForm.srcDataTypeAj = ['7'] //源数据类型案件
       this.dxcx = { // 定向查询
         domains: [],
@@ -511,7 +511,7 @@ export default {
       cityOptions = []
       this.cities = cityOptions
       this.dialogVisible = false;
-      this.ruleForm.srcDataType = ['1', '2']  // 查询类型切换清空数据类型
+      this.ruleForm.srcDataType = ['1']  // 查询类型切换清空数据类型
       this.ruleForm.srcDataTypeAj = ['7'] //源数据类型案件
       this.dataRy = [1]
       this.dataAj = [1]
@@ -548,7 +548,7 @@ export default {
       cityOptions = []
       this.cities = cityOptions
       this.dialogVisible = false;
-      this.ruleForm.srcDataType = ['1', '2']  // 查询类型切换清空数据类型
+      this.ruleForm.srcDataType = ['1']  // 查询类型切换清空数据类型
       this.ruleForm.srcDataTypeAj = ['7'] //源数据类型案件
       this.dataRy = [1]
       this.dataAj = [1]

src/views/Editor/modules/ajzwbjLeft.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 09:42:07
- * @LastEditTime: 2022-04-08 17:12:29
+ * @LastEditTime: 2022-04-26 11:01:38
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
@@ -136,6 +136,9 @@ export default {
       // 不是新增就查询案件指纹，进行编辑
       this.getCaseFinger()
       // this.changeCaseFingerPNG()
+    } else {
+      // 防止在新增时，刷新不调接口
+      this.getCaseFinger()
     }
 
     // 更新图片列表

src/views/Editor/modules/imageEdAJ.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2022-04-23 21:18:47
+ * @LastEditTime: 2022-04-26 18:19:51
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -2290,6 +2290,10 @@ export default {
 
       file = event.target.files[0];
       console.log(file, 222222222);
+      // 更新图片
+      self.zoomImage(1);
+      // 隐藏手纹框
+      self.isSwk_flag = false
       imageEditor.loadImageFromFile(file).then(function (result) {
         // 设置遮罩层
         self.isHideImageExport = true
@@ -5827,7 +5831,7 @@ export default {
         $("#input-image-file").val("");
         $("#input-image-file").click();
         this.picType = 'dr'
-        this.zoomImage(1);
+        // this.zoomImage(1);
       }
     },
     /**

src/views/cxyrd/LT.vue

@@ -197,6 +197,7 @@ export default {
     }
   },
   mounted () {
+    console.log(this.$route);
     let self = this;
     this.$bus.on("bzJudge", (val) => {
       self.bzData = val;

src/views/cxyrd/QueryConfirm.vue

@@ -832,7 +832,7 @@ export default {
               qid: row.qid,
               barcode: row.children[0].barcode,
               type: 'father',
-            },
+            }
           })
           window.open(routeUrl.href, '_blank')
         } else if (row.children[0].querytype === '1') {
@@ -852,6 +852,9 @@ export default {
           let routeUrl = this.$router.resolve({
             path: '/confirm/LT',
             query: { qid: row.qid, qqid: row.qqid, type: 'father' },
+            params: {
+              a: 5
+            }
           })
           window.open(routeUrl.href, '_blank')
         } else {
@@ -908,11 +911,11 @@ export default {
           self.$message({
             type: 'success',
             // message: "复制条码号:" + this.copyNum + "成功！"
-            message: this.$t('Common.copy_plate'),
+            message: self.$t('Common.copy_plate'),
           })
         },
         function (e) {
-          this.$message.error(this.$t('Common.sorry_copy_barcode_fail'))
+          this.$message.error(self.$t('Common.sorry_copy_barcode_fail'))
         }
       )
     },

src/views/cxyrd/modules/TLSrc.vue

@@ -43,7 +43,7 @@
       <!-- 指纹图 -->
       <div class="finger-print" v-show="isShowPrint">
         <div class="btns">
-          <div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">{{$t('Commonroll')}}</div>
+          <div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">{{$t('Common.roll')}}</div>
           <!-- <div class="line"></div> -->
           <div class="btn" v-show="!isDelete" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">{{$t('FingerPrint.plane')}}</div>
           <div class="btn isDelete" v-show="isDelete">{{$t('FingerPrint.plane')}}</div>

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2022-04-25 15:53:53
+ * @LastEditTime: 2022-04-25 23:11:49
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -104,11 +104,11 @@ module.exports = {
         // 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.104:8099",  // 江
         // target: "http://172.20.0.149:8099", // 北京  张
-        target: "http://192.168.0.109:8099", // 西藏  张 
-        // target: "http://192.168.0.134:8099", // 西藏  马
+        // target: "http://192.168.0.109:8099", // 西藏  张 
+        // target: "http://192.168.0.143:8099", // 西藏  马
         // target: "http://192.168.0.130:8099", // 西藏  刘
         ws: true,
         changeOrigin: true,