Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

# Conflicts:
#	vue.config.js

src/components/SelectCode.vue

 <!--
  * @Author: your name
  * @Date: 2021-11-25 10:15:01
- * @LastEditTime: 2021-12-17 10:18:53
+ * @LastEditTime: 2021-12-17 17:25:57
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \founder_vue\src\components\SelectCode.vue
@@ -17,7 +17,7 @@
       :multiple="multiple"
       default-first-option
       :popper-append-to-body="false"
-      :loading="options.length <= 0"
+      :loading="options.length <= 0 && loadingIndex == 0"
       :placeholder="placeholder"
       @focus="placeholder = '请输入'"
       @blur="placeholder = '请选择'"
@@ -55,6 +55,7 @@ export default {
       checkList: [],
       newForm: this.form,
       allData: [],
+      loadingIndex: 0,
     };
   },
   props: {
@@ -124,6 +125,7 @@ export default {
     },
     getOptions() {
       this.$axios.get(this.codeUrl).then((res) => {
+        this.loadingIndex++;
         if (
           (res.data.code == 0 || res.data.code == 200) &&
           (res.data.message == "success" || res.data.info == "success")
@@ -144,6 +146,9 @@ export default {
   mounted() {
     this.getOptions();
   },
+  beforeDestroy() {
+    this.loadingIndex = 0;
+  },
 };
 </script>
 <style>

src/router/modules/index.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:58:13
- * @LastEditTime: 2021-12-17 14:26:13
+ * @LastEditTime: 2021-12-17 15:39:53
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\router\modules\index.js
@@ -206,5 +206,23 @@ export default [
       auth: "5"
     },
     component: () => import("@/views/rgrd/rgLL.vue")
+  },
+  {
+    path: "/rgLT",
+    name: "rgLT",
+    meta: {
+      title: "人工认定界面",
+      auth: "5"
+    },
+    component: () => import("@/views/rgrd/rgLT.vue")
+  },
+  {
+    path: "/rgTL",
+    name: "rgTL",
+    meta: {
+      title: "人工认定界面",
+      auth: "5"
+    },
+    component: () => import("@/views/rgrd/rgTL.vue")
   }
 ];

src/views/Editor/modules/imageEd.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2021-12-17 16:22:04
+ * @LastEditTime: 2021-12-17 21:04:36
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -78,39 +78,39 @@
               <div class="rotate_line_top"></div>
               <div class="content">
                 <div class="rotate_content">
-                  <div class="rotate_left" id="btn-rotate-clockwise">
+                  <div class="rotate_left" id="btn-rotate-counter-clockwise">
                     <div class="rotate_icon">
-                      <img v-if="!isLeftRotate" src="@/assets/img/zcedit/left_rotate_d.png" alt="" />
+                      <img v-if="!isRightRotate" src="@/assets/img/zcedit/left_rotate_d.png" alt="" />
                       <img v-else src="@/assets/img/zcedit/left_rotate_a.png" alt="" />
                     </div>
                     <div class="num" :class="{ leftRotateActive: isLeftRotate }">
-                      30
+                      -30
                     </div>
                   </div>
-                  <div class="rotate_right" id="btn-rotate-counter-clockwise">
+                  <div class="rotate_right" id="btn-rotate-clockwise">
                     <div class="rotate_icon">
-                      <img v-if="!isRightRotate" src="@/assets/img/zcedit/left_rotate_d.png" alt="" />
+                      <img v-if="!isLeftRotate" src="@/assets/img/zcedit/left_rotate_d.png" alt="" />
                       <img v-else src="@/assets/img/zcedit/left_rotate_a.png" alt="" />
                     </div>
                     <div class="num" :class="{ rightRotateActive: isRightRotate }">
-                      -30
+                      30
                     </div>
                   </div>
                 </div>
                 <div class="flap_content">
-                  <div class="flap_x" id="btn-flip-x">
+                  <div class="flap_x" id="btn-flip-y">
                     <div class="flap_x_icon">
-                      <img v-if="!isX" src="@/assets/img/zcedit/flap_x_d.png" alt="" />
+                      <img v-if="!isY" src="@/assets/img/zcedit/flap_x_d.png" alt="" />
                       <img v-else src="@/assets/img/zcedit/flap_x_a.png" alt="" />
                     </div>
-                    <div class="flap_txt" :class="{ xActive: isX }">X轴</div>
+                    <div class="flap_txt" :class="{ xActive: isY }">X轴</div>
                   </div>
-                  <div class="flap_y" id="btn-flip-y">
+                  <div class="flap_y" id="btn-flip-x">
                     <div class="flap_y_icon">
-                      <img v-if="!isY" src="@/assets/img/zcedit/flap_y_d.png" alt="" />
+                      <img v-if="!isX" src="@/assets/img/zcedit/flap_y_d.png" alt="" />
                       <img v-else src="@/assets/img/zcedit/flap_y_a.png" alt="" />
                     </div>
-                    <div class="flap_txt" :class="{ yActive: isY }">Y轴</div>
+                    <div class="flap_txt" :class="{ yActive: isX }">Y轴</div>
                   </div>
                 </div>
               </div>
@@ -1015,6 +1015,7 @@ export default {
       self.isReset = true;
       // 旋转角度同样恢复到0
       self.inputRotationRange = 0;
+      self.startPlace = 0
       //console.log(self.startPlace, 222);
       // 事件不能连续重复执行，需要缓存时间
       setTimeout(() => {
@@ -1178,7 +1179,13 @@ export default {
       // 缩放为1
       self.zoomLevel = 1;
       imageEditor.resetZoom();
+      imageEditor.resetFlip().catch(err => {})
       self.resetTzdDrawing();
+      self.tzdDrawingLeft = 0
+      self.tzdDrawingTop = 0
+      self.tzdDrawing_left = 0
+      self.tzdDrawing_top = 0
+      self.startPlace = 0
       self.sourceImage = sourceImage;
       imageEditor
         .loadImageFromURL(

src/views/SystemManage/GroupManage.vue

@@ -137,7 +137,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column :width="width1">
+        <el-table-column :width="width4">
           <template slot-scope="scope">
             <div class="set-btn" @click="setRole(scope.row)">角色设置</div>
           </template>
@@ -160,6 +160,23 @@
             </div>
           </template>
         </el-table-column>
+          <el-table-column
+            prop="permissionNames"
+            label="权限"
+            :width="width6"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div
+                v-for="(item, index) in scope.row.permissionNames &&
+                scope.row.permissionNames.split(',')"
+                :key="index"
+              >
+                {{ index > 0 ? "/" : "" }}
+                {{ item }}
+              </div>
+            </template>
+          </el-table-column>
         <el-table-column prop="status" label="启用状态" width="auto">
           <template slot-scope="scope">
             <div v-if="scope.row.status === 0" class="circle-red"></div>
@@ -670,6 +687,7 @@ export default {
     let w2 = window.innerWidth;
     this.height = (this.height * w2) / w1;
     this.width1 = (this.width1 * w2) / w1;
+    this.width6 = (this.width6 * w2) / w1;
     this.width2 = (this.width2 * w2) / w1;
     this.width3 = (this.width3 * w2) / w1;
     this.width4 = (this.width4 * w2) / w1;
@@ -716,7 +734,8 @@ export default {
       width3: 90,
       width2: 400,
       width1: 200,
-      width4: 150,
+      width6: 300,
+      width4: 120,
       height: 550,
       btnwidth: 200,
       unitname: "",

src/views/bzxxgl/fhxxLT.vue

 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:35:26
- * @LastEditTime: 2021-12-17 15:57:54
+ * @LastEditTime: 2021-12-17 23:11:18
  * @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
@@ -351,6 +351,8 @@ export default {
             }
           })
         }
+      } else {
+        self.$bus.emit('changImageEditTarget', 'xxx')
       }
     },
     /**

src/views/cxyrd/TT.vue

@@ -121,7 +121,7 @@
                   {{ scope.$index + 1 }}
                 </div>
               </el-table-column>
-              <el-table-column prop="score" label="得分" :width="width1">
+              <el-table-column prop="score" label="得分" :width="!roleArr.includes('C-1-7')?'auto':width1">
                 <div
                   class="del"
                   slot-scope="scope"

src/views/cxyrd/modules/LLCandidate.vue

@@ -65,7 +65,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="destseqno" label="序号" :width="width3">
+        <el-table-column prop="destseqno" label="序号" :width="!roleArr.includes('C-1-7')?'auto':width3">
           <template slot-scope="scope">
             <span v-if="scope.row.removeFlag === 1">
               <del>{{

src/views/cxyrd/modules/LTCandidate.vue

@@ -39,7 +39,7 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="destseqno" label="指位" :width="width3" :render-header="icons">
+        <el-table-column prop="destseqno" label="指位" :width="!roleArr.includes('C-1-7')?'auto':width3" :render-header="icons">
           <template slot-scope="scope">
             <span v-if="scope.row.removeFlag===1">
               {{

src/views/cxyrd/modules/Recognition_dialog.vue

@@ -21,7 +21,7 @@
             type="text"
             placeholder="请输入内容"
             v-model="ruleForm.originCode"
-            maxlength="22"
+            maxlength="23"
             show-word-limit
           >
           </el-input>
@@ -39,7 +39,7 @@
             type="text"
             placeholder="请输入内容"
             v-model="ruleForm.targetCode"
-            maxlength="22"
+            maxlength="23"
             show-word-limit
           >
           </el-input>
@@ -64,6 +64,7 @@
 </template>
 
 <script>
+import qs from "qs";
 export default {
   name: "tjddl",
   props: {},
@@ -101,19 +102,36 @@ export default {
       this.$refs.ruleForm.validate((boo) => {
         if (boo) {
           let form = this.ruleForm;
-          //人人查重
-          if (form.originCodeType == "0" && form.targetCodeType == "0") {
-            self.$router.pushToTab("/rgTT");
-            //人案倒查
-          } else if (form.originCodeType == "0" && form.targetCodeType == "1") {
-            self.$router.pushToTab("/rgTL");
-            //案人正查
-          } else if (form.originCodeType == "1" && form.targetCodeType == "0") {
-            self.$router.pushToTab("/rgLT");
-            //案案串查
-          } else if (form.originCodeType == "1" && form.targetCodeType == "1") {
-            self.$router.pushToTab("/rgLL");
-          }
+          self
+            .$axios({
+              method: "post",
+              url: "/api/queryIdentification/isExist",
+              data: JSON.stringify(form),
+              headers: {
+                "Content-Type": "application/json;charset=UTF-8",
+              },
+            })
+            .then((res) => {
+              if (res.data.code == 0 && res.data.message == 'success'){
+                //人人查重
+                if (form.originCodeType == "0" && form.targetCodeType == "0") {
+                  self.$router.pushToTab("/rgTT");
+                  //人案倒查
+                } else if (form.originCodeType == "0" && form.targetCodeType == "1") {
+                  self.$router.pushToTab("/rgTL");
+                  //案人正查
+                } else if (form.originCodeType == "1" && form.targetCodeType == "0") {
+                  self.$router.pushToTab("/rgLT");
+                  //案案串查
+                } else if (form.originCodeType == "1" && form.targetCodeType == "1") {
+                  self.$router.pushToTab("/rgLL");
+                }
+                self.dialogVisible = false
+              } else{
+                this.$message.error(res.data.message)
+              }
+            });
+          
         }
       });
     },

src/views/cxyrd/modules/TLCandidate.vue

@@ -22,7 +22,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="序号" prop="destseqno" :width="width1">
+      <el-table-column label="序号" prop="destseqno" :width="!roleArr.includes('C-1-7')?'auto':width1">
         <template slot-scope="scope">
           <!-- 被删除-->
           <span v-if="scope.row.removeFlag==1">

src/views/zljc/Index.vue

@@ -414,6 +414,7 @@ export default {
       if (this.multipleSelection.length === 0) {
         this.$message.error("请选择需要复制条码号的数据！");
         this.selectBoo = true;
+        this.isShowTip = true;
       } else {
         self.multipleSelection.forEach((item) => {
           self.barcode.push(item.barcode);

src/views/zljc/jcxq.vue

@@ -450,6 +450,8 @@ export default {
     display: flex;
     .lableresult {
       width: 129px;
+      padding: 0 24px;
+      box-sizing: border-box;
       height: 100%;
       display: flex;
       justify-content: space-around;
@@ -473,6 +475,9 @@ export default {
       }
       .tmxz {
         opacity: 0.1;
+        &:hover {
+          opacity: 0.5;
+        }
       }
     }
   }