处理串查，查重，倒查不能发掌纹查询

src/components/ImageEd.vue

@@ -340,10 +340,10 @@
         </div>
         <div class="lt_middle_main">
           <div class="source" @mousedown="sourceEdit">
-            <dir class="del-pre" v-if="zwtp_source">
+            <div class="del-pre" v-if="zwtp_source">
               <img class="del-img" src="@/assets/img/TT/zwtp.png" alt="">
               <div class="del-name">暂无图像</div>
-            </dir>
+            </div>
             <div class="del-pre" v-if="isDelete">
               <img class="del-img" src="@/assets/img/delete-image.png" alt="">
               <div class="del-name">图像已删除</div>
@@ -423,10 +423,10 @@
               <img class="del-img" src="@/assets/img/delete-image.png" alt="">
               <div class="del-name">图像已删除</div>
             </div>
-            <dir class="del-pre" v-if="zwtp_target">
+            <div class="del-pre" v-if="zwtp_target">
               <img class="del-img" src="@/assets/img/TT/zwtp.png" alt="">
               <div class="del-name">暂无图像</div>
-            </dir>
+            </div>
             <div class="title">
               <span class="txt">目标数据</span>
               <div class="delDesc" v-if="!isDelete && targetIsDelete">

src/views/AllPersonnelBase/modules/fcx.vue

@@ -58,7 +58,8 @@
             <el-checkbox-group v-model="ruleForm.srcDataType">
               <el-checkbox label="1" :disabled="ruleForm.srcDataType=='3'">滚动</el-checkbox>
               <el-checkbox label="2" :disabled="ruleForm.srcDataType=='3'">平面</el-checkbox>
-              <el-checkbox label="3" :disabled="ruleForm.srcDataType.includes('1') || ruleForm.srcDataType.includes('2')" v-if="radio">掌纹</el-checkbox>
+<!--              西藏上云比对不了掌纹-->
+<!--              <el-checkbox label="3" :disabled="ruleForm.srcDataType.includes('1') || ruleForm.srcDataType.includes('2')" v-if="radio">掌纹</el-checkbox>-->
             </el-checkbox-group>
           </el-form-item>
           <el-form-item label="优先级:" prop="queryClass">
@@ -141,7 +142,7 @@
             <div class='chose'>
               <div class='scrollbar'>
                 <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-                  <el-checkbox v-for="city in cities" :label="city" :key="city" border>{{city}}</el-checkbox>
+                  <el-checkbox v-for="city in cities" :label="city" :key="city" border :class="{hidddnpalm: city>100 && ruleForm.cxlx.querytype==3}">{{city}}</el-checkbox>
                 </el-checkbox-group>
               </div>
             </div>
@@ -149,7 +150,7 @@
         </div>
         <el-form :label-position='labelPosition' align="left" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="6.25rem" class="demo-ruleForm">
           <el-form-item label="查询类型:" prop="cxlx">
-            <el-radio-group v-model="ruleForm.cxlx.querytype">
+            <el-radio-group v-model="ruleForm.cxlx.querytype" @change="CaseQueryType">
               <el-radio label="2" style="color: #00b47a" class='color_00b47a'>正查</el-radio>
               <el-radio label="3" style="color: #055fe7" class='color_055fe7'>串查</el-radio>
             </el-radio-group>
@@ -452,6 +453,16 @@ export default {
     }
   },
   methods: {
+    /**
+     * 当选择串查时，移除已经选择的掌纹
+     */
+    CaseQueryType(val) {
+      if (val == 3) {
+        this.checkedCities = this.checkedCities.filter((item) => {
+          return item < 100
+        })
+      }
+    },
     // 动态添加条码段(定向查询)
     addDxcx () {
       if (this.dxcx.domains.length > 0) {
@@ -1481,4 +1492,8 @@ export default {
   background-color: #dadde0;
   border-radius: 3px;
 }
+// 隐藏串查的掌纹
+.hidddnpalm {
+  display: none;
+}
 </style>

src/views/Editor/modules/ajdaxx.vue

@@ -145,7 +145,7 @@
                 prop="ssjzrmby"
               >
                 <el-input
-                  placeholder="根据代码自动匹配"
+                  placeholder="请输入损失价值（人民币元）"
                   v-model="ruleForm.ssjzrmby"
                   maxlength="11"
                   show-word-limit

src/views/Editor/modules/ryzwbjLeft.scss

@@ -336,6 +336,8 @@
           align-items: center;
           justify-content: center;
           img {
+            max-height: 100%;
+            max-width: 100%;
             object-fit: contain;
           }
           // .face-pic {

src/views/Editor/modules/ryzwbjLeft.vue

@@ -244,7 +244,7 @@ export default {
         {
           code: 1,
           image: '',
-          name: '正侧面'
+          name: '正面照'
         },
         {
           code: 2,

src/views/login/modules/AccountsLogin.vue

 <template>
-<!--  <div class="login_account width70 middle" v-show="isShow">
+  <div class="login_account width70 middle" v-show="isShow">
     <el-input class="width100 margin_top25_bottom10" type="text" :placeholder="$t('Login.username_placeholder')" @keydown.enter.native="login(userInfo)" v-model="userInfo.username">
       <i slot="prefix" style="display: flex; align-items: center">
         <img style="
@@ -20,12 +20,12 @@
     </el-input>
     <el-button class="login_button width100 margin_top25_bottom10" type="primary" ref="userLogin" @click="login(userInfo)" :loading="btnLoading">{{$t('Login.login_btn')}}
     </el-button>
-  </div>-->
+  </div>
   <!-- 对接线上 -->
-  <div class="AccountsLogin">
+<!--  <div class="AccountsLogin">
     <div class="el-icon-loading"></div>
     <span>正在加载中...</span>
-  </div>
+  </div>-->
 </template>
 
 <script>

vue.config.js

@@ -101,8 +101,8 @@ module.exports = {
         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.107:8099", // 西藏  张
-        // target: "http://192.168.0.104:8099", // 西藏  马
+        // target: "http://192.168.0.128:8099", // 西藏  张
+        // target: "http://192.168.0.108:8099", // 西藏  马
         ws: true,
         changeOrigin: true,
         pathRewrite: {
@@ -116,7 +116,7 @@ module.exports = {
         target: "http://zwpt.xzclub.top:9333/",
         // target: "http://192.168.128.109:8765",
         // target: "http://172.18.109.63:8765", // 北京  张
-        // target: "http://192.168.0.165:8765", // 西藏  马
+        // target: "http://192.168.0.108:8765", // 西藏  马
         // target: "http://192.168.0.107:8765", // 西藏  张
         ws: true,
         changeOrigin: true,