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

src/views/AllPersonnelBase/modules/xzaj.vue

@@ -188,23 +188,13 @@
         <div>案件逻辑分库</div>
       </el-row>
       <el-row class="flexBox">
-        <!-- <el-checkbox
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-        >全选</el-checkbox> -->
         <div style="margin: 15px 0"></div>
-        <el-checkbox-group
-          v-model="checkedTargets"
-          @change="handleCheckedTargetsChange"
-        >
+        <el-checkbox-group v-model="checkedTargets">
           <el-checkbox
-            v-for="city in targets"
-            :label="city"
-            :key="city"
-          >{{
-            city
-          }}</el-checkbox>
+            v-for="(value,key) in targets"
+            :key="key"
+            :label="value.code"
+          >{{ value.name }}</el-checkbox>
         </el-checkbox-group>
       </el-row>
       <el-divider></el-divider>
@@ -224,15 +214,6 @@
               :form="ruleForm"
               id="tqdwGajgjgdm"
             ></Cascader>
-
-            <!-- <el-input
-              v-model.trim="ruleForm.tqdwGajgjgdm"
-              placeholder="请输入提取单位代码"
-              maxlength="12"
-              show-word-limit
-              clearable
-            >
-            </el-input> -->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -321,16 +302,6 @@
 
 <script>
 import Cascader from "@/components/Cascader.vue";
-const targetOptions = [
-  "本地案件库",
-  "比中案件库",
-  "已破案件库",
-  "重大案件库",
-  "B类案件库",
-  "C类案件库",
-  "勘查案件库",
-  "协查案件库",
-];
 export default {
   name: "xzaj",
   components: {
@@ -346,10 +317,8 @@ export default {
     return {
       dialogVisible: false, // 弹窗状态
       labelPosition: "left", // 数据项对齐方式
-      checkAll: false, // 目标逻辑库
-      checkedTargets: [], // 选定的目标逻辑库
-      targets: targetOptions, // 目标逻辑库
-      isIndeterminate: false, // 目标逻辑库不确定状态
+      checkedTargets: ['1'], // 选定的目标逻辑库
+      targets: this.$store.state.ljk.targetOptions_aj, // 目标逻辑库
       logicDatabaseCode: [],// 逻辑库代码
       ruleForm: {
         ysxtAsjbh: "", // 案事件编号
@@ -438,25 +407,7 @@ export default {
           if (this.checkedTargets.length == 0) {
             this.$message.error('请选择逻辑库')
           } else {
-            for (var i = 0; i <= this.checkedTargets.length; i++) {
-              if (this.checkedTargets[i] == '本地案件库') {
-                this.logicDatabaseCode.push('1')
-              } else if (this.checkedTargets[i] == '比中案件库') {
-                this.logicDatabaseCode.push('2')
-              } else if (this.checkedTargets[i] == '已破案件库') {
-                this.logicDatabaseCode.push('3')
-              } else if (this.checkedTargets[i] == '重大案件库') {
-                this.logicDatabaseCode.push('4')
-              } else if (this.checkedTargets[i] == 'B类案件库') {
-                this.logicDatabaseCode.push('5')
-              } else if (this.checkedTargets[i] == 'C类案件库') {
-                this.logicDatabaseCode.push('6')
-              } else if (this.checkedTargets[i] == '勘查案件库') {
-                this.logicDatabaseCode.push('7')
-              } else if (this.checkedTargets[i] == '协查案件库') {
-                this.logicDatabaseCode.push('8')
-              }
-            }
+            this.logicDatabaseCode = this.checkedTargets
             let reqParam = {
               caseBase: "",
               logicList: [] // 逻辑库
@@ -464,8 +415,6 @@ export default {
             reqParam.caseBase = this.ruleForm;
             reqParam.caseBase.ysxtAsjbh = "A" + this.ruleForm.ysxtAsjbh;
             reqParam.caseBase.xckybh = "K" + this.ruleForm.xckybh;
-            // reqParam.caseBase.logicDatabaseCode = this.logicDatabaseCode;
-            // reqParam.caseBase.logicDatabaseName = this.checkedTargets;
             reqParam.logicList = this.logicDatabaseCode;
             this.$axios
               .post("/api/casestore/caseadd", reqParam)
@@ -497,16 +446,6 @@ export default {
       this.dialogVisible = false;
       this.$refs[formName].resetFields();
     },
-    handleCheckAllChange (val) {
-      this.checkedTargets = val ? targetOptions : [];
-      this.isIndeterminate = false;
-    },
-    handleCheckedTargetsChange (value) {
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.targets.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.targets.length;
-    },
   },
 };
 </script>

src/views/AllPersonnelBase/modules/xzry.vue

@@ -312,23 +312,13 @@
         <div>人员逻辑分库</div>
       </el-row>
       <el-row class="flexBox">
-        <!-- <el-checkbox
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-        >全选</el-checkbox> -->
         <div style="margin: 15px 0"></div>
-        <el-checkbox-group
-          v-model="checkedTargets"
-          @change="handleCheckedTargetsChange"
-        >
+        <el-checkbox-group v-model="checkedTargets">
           <el-checkbox
-            v-for="city in targets"
-            :label="city"
-            :key="city"
-          >{{
-            city
-          }}</el-checkbox>
+            v-for="(value,key) in targets"
+            :key="key"
+            :label="value.code"
+          >{{ value.name }}</el-checkbox>
         </el-checkbox-group>
       </el-row>
       <el-divider></el-divider>
@@ -437,7 +427,6 @@
 <script>
 import Cascader from "@/components/Cascader.vue";
 import SelectCode from "@/components/SelectCode.vue";
-const targetOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
 export default {
   name: "xzry",
   components: {
@@ -454,10 +443,8 @@ export default {
     return {
       dialogVisible: false, // 弹窗状态
       labelPosition: "left", // 数据项对齐方式
-      checkAll: false, // 目标逻辑库
       checkedTargets: [], // 选定的目标逻辑库
-      targets: targetOptions, // 目标逻辑库
-      isIndeterminate: false, // 目标逻辑库不确定状态
+      targets: this.$store.state.ljk.targetOptions_ry, // 目标逻辑库
       logicDatabaseCode: [],// 逻辑库代码
       ruleForm: {
         ysxtAsjxgrybh: "", // 人员编号
@@ -588,24 +575,7 @@ export default {
           if (this.checkedTargets.length == 0) {
             this.$message.error('请选择逻辑库')
           } else {
-            for (var i = 0; i <= this.checkedTargets.length; i++) {
-              if (this.checkedTargets[i] == '基本人员库') {
-                this.logicList.push(1)
-              } else if (this.checkedTargets[i] == '高危人员库') {
-                this.logicList.push(2)
-              } else if (this.checkedTargets[i] == '非法人员库') {
-                this.logicList.push(3)
-              } else if (this.checkedTargets[i] == '在逃人员库') {
-                this.logicList.push(4)
-              } else if (this.checkedTargets[i] == '布控人员库') {
-                this.logicList.push(5)
-              } else if (this.checkedTargets[i] == '前科人员库') {
-                this.logicList.push(6)
-              } else if (this.checkedTargets[i] == '协查人员库') {
-                this.logicList.push(7)
-              }
-            }
-            // console.log(this.logicDatabaseCode)
+            this.logicList = this.checkedTargets
             let reqParam = {
               personDo: "",
               logicList: [],
@@ -640,16 +610,6 @@ export default {
       this.dialogVisible = false;
       this.$refs[formName].resetFields();
     },
-    handleCheckAllChange (val) {
-      this.checkedTargets = val ? targetOptions : [];
-      this.isIndeterminate = false;
-    },
-    handleCheckedTargetsChange (value) {
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.targets.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.targets.length;
-    },
   },
 };
 </script>

src/views/Editor/modules/imageEdAJ.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2021-12-21 17:48:08
+ * @LastEditTime: 2021-12-21 17:51:32
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -5278,25 +5278,24 @@ export default {
      */
     caclDzwkPos () {
       // 小手纹框大小 
+      const zoom = this.imageEditor.getZoom();
       const canvasImage = this.imageEditor._graphics.getCanvasImage();
-      // 获取小手纹框和小图的相对位移
-      const [xzwkOffsetX, xzwkOffsetY] = [$(".small-drawing").width() / 2 - $(".blc_small").width() / 2 - $(".blc_small").position().left,
-      $(".small-drawing").height() / 2 - $(".blc_small").height() / 2 - $(".blc_small").position().top];
-      //大手纹框和视图框的位移
-      const [dzwkOffsetX, dzwkOffsetY] = [$(".canvas-container").width() / 2 - $(".blc").width() / 2 - $(".blc").position().left,
-      $(".canvas-container").height() / 2 - $(".blc").height() / 2 - $(".blc").position().top];
-      //手纹框和视图框的位移（小图中）
-      const [xzwkOffsetXMini, xzwkOffsetYMini] = [dzwkOffsetX / $(".canvas-container").width() * $(".small-drawing").width(),
-      dzwkOffsetY / $(".canvas-container").height() * $(".small-drawing").height()]
-      //视图框的位移（小图中）
-      const [viewOffsetX, viewOffsetY] = [xzwkOffsetX + xzwkOffsetXMini, xzwkOffsetY + xzwkOffsetYMini]
-      console.log($(".small-drawing img").width())
-      const [canvasOffsetX, canvasOffsetY] = [
-        (viewOffsetX / $(".small-drawing2 img").width()) *
-        canvasImage.width,
-        (viewOffsetY / $(".small-drawing2 img").height()) *
-        canvasImage.height,
-      ];
+      const canvasBorder=canvasImage.height>canvasImage.width?canvasImage.height:canvasImage.width;
+      const xiaoCanvasBorder=$(".small-drawing").width()>$(".small-drawing").height()?$(".small-drawing").width():$(".small-drawing").height();
+      
+      // 获取小手纹框相对于小图的相对位移
+      const [xzwkOffsetX, xzwkOffsetY] = 
+      [  $(".blc_small").width() / 2 + $(".blc_small").position().left-$(".small-drawing").width()/ 2,
+      $(".blc_small").height() / 2 + $(".blc_small").position().top-$(".small-drawing").height() / 2];
+      // 大手纹框相对大图的位移
+      const [dswkOffX,dswkOffY]=[xzwkOffsetX /$(".small-drawing").width() *canvasBorder,
+       xzwkOffsetY/$(".small-drawing").height() *canvasBorder];
+      //视图框相对大手纹框的位移
+      const [dzwkOffsetX, dzwkOffsetY] = 
+      [$(".canvas-container").width() / 2-$(".blc").width() / 2 - $(".blc").position().left,
+      $(".canvas-container").height() / 2-$(".blc").height() / 2 - $(".blc").position().top];
+      // 手纹框和图片的位移
+      const [canvasOffsetX, canvasOffsetY] = [dswkOffX,dswkOffY]
       // 计算图片原来的偏移量得到不偏移情况的left top 值
       const centerP = canvasImage.getCenterPoint();
       const [oldCanvasOffsetX, oldCanvasOffsetY] = [
@@ -5310,8 +5309,8 @@ export default {
 
       this.imageEditor._graphics.setImageProperties(
         {
-          left: canvasleft,
-          top: canvastop,
+          left: canvasleft-dzwkOffsetX* canvasImage.height / zoom / $(".tzdDrawing").height(),
+          top: canvastop-dzwkOffsetY* canvasImage.height / zoom / $(".tzdDrawing").height(),
           originX: "left",
           originY: "top",
         },
@@ -8110,6 +8109,10 @@ export default {
         $(".block_small").css("left", `${xlLeft}px`);
         $(".block_small").css("top", `${xlTop}px`);
       }
+      // 手纹框的小图
+      if(this.isSwk_flag&& !isNotRefreshSourcePrivew){
+        this.caclXzwkPos();
+      }
 
       // 导入图片的角度/翻转处理
       if (this.isTpdr_flag) {

src/views/Editor/modules/rydaxx.vue

@@ -305,10 +305,10 @@
             >
               <el-checkbox-group v-model="ruleForm.logicdbtype2">
                 <el-checkbox
-                  v-for="(item,index) in ryljfkArr"
-                  :label="item.value"
-                  :key="index"
-                >{{item.label}}</el-checkbox>
+                  v-for="(value,key) in ryljfkArr"
+                  :key="key"
+                  :label="value.code"
+                >{{ value.name }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </div>
@@ -474,16 +474,7 @@ export default {
       arrow: 'bottom',
       width1: 80,
       drawer: false,
-      // ryljfkArr: ['基本人员库', '高危人员库', '非违人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'],
-      ryljfkArr: [
-        { label: '基本人员库', value: '1' },
-        { label: '高危人员库', value: '2' },
-        { label: '非违人员库', value: '3' },
-        { label: '在逃人员库', value: '4' },
-        { label: '布控人员库', value: '5' },
-        { label: '前科人员库', value: '6' },
-        { label: '协查人员库', value: '7' },
-      ],
+      ryljfkArr: this.$store.state.ljk.targetOptions_ry,
       ruleForm: {
         id: '',
         rybh: '',

vue.config.js

@@ -93,7 +93,7 @@ module.exports = {
         // target: "http://192.168.128.166:8099/", // 张 认定
         target: "http://192.168.128.114:8099",  // 湖南-马
         // target: "http://192.168.128.116:8099",  // 湖南-王
-        // target: "http://192.168.128.118:8764",  // 湖南-张呈光
+        target: "http://192.168.128.112:8099",  // 湖南-张呈光
         // 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",