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

.env.production

 VUE_APP_AUTO_WRITE = pro
-VUE_APP_BB_IP = http://10.100.17.124:9080/
+VUE_APP_BB_IP = http://8.144.175.212:8080/
 VUE_APP_TIBET_HEADER = open
\ No newline at end of file

src/components/Cascader.vue

@@ -7,9 +7,30 @@
  * @FilePath: \founder_vue\src\components\confrim.vue
 -->
 <template>
-  <el-tooltip class="item" effect="dark" :content="valStr" :disabled="disable" placement="top-start" :open-delay="1000">
+  <el-tooltip
+    class="item"
+    effect="dark"
+    :content="valStr"
+    :disabled="disable"
+    placement="top-start"
+    :open-delay="1000"
+  >
     <div :style="{ width: width + 'rem' }">
-      <el-cascader v-model="form[id]" @click.native="click" :popper-class="'cascader' + ids" ref="cascader" :placeholder="isPlaceholder" @focus="placeholder = $t('Common.please_input')" @blur="placeholder = $t('Common.please_select')" :clearable="clearable" :options="options" :props="props" :show-all-levels="false" @change="change" filterable>
+      <el-cascader
+        v-model="form[id]"
+        @click.native="click"
+        :popper-class="'cascader' + ids"
+        ref="cascader"
+        :placeholder="isPlaceholder"
+        @focus="placeholder = $t('Common.please_input')"
+        @blur="placeholder = $t('Common.please_select')"
+        :clearable="clearable"
+        :options="options"
+        :props="props"
+        :show-all-levels="false"
+        @change="change"
+        filterable
+      >
       </el-cascader>
     </div>
   </el-tooltip>
@@ -74,9 +95,9 @@ export default {
   },
   computed: {
     isPlaceholder () {
-      console.log("this.name:"+this.name,"this.id:"+this.id)
-      console.log("this.form[this.name]:"+this.form[this.name],"this.form[this.id]:"+this.form[this.id])
-      if(this.name && this.id && this.form[this.name] && this.form[this.id]) {
+      console.log("this.name:" + this.name, "this.id:" + this.id)
+      console.log("this.form[this.name]:" + this.form[this.name], "this.form[this.id]:" + this.form[this.id])
+      if (this.name && this.id && this.form[this.name] && this.form[this.id]) {
         document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#606266');
         this.valStr = this.form[this.name] + '[' + this.form[this.id] + ']';
         console.log(this.valStr);
@@ -127,7 +148,7 @@ export default {
       this.$emit("change", val);
       //选择完以后关闭下拉版
       this.$refs.cascader.dropDownVisible = false;
-      
+
       this.name = null
       document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#b2b2b2');
     },
@@ -196,7 +217,7 @@ $placeholderColor: var(--placeholderColor, #606266);
     }
   }
 }
-/deep/::-webkit-input-placeholder{
-  color:$placeholderColor;
+/deep/::-webkit-input-placeholder {
+  color: $placeholderColor;
 }
 </style>

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -69,6 +69,20 @@
           </el-input>
         </div>
       </div>
+      <div class="right">
+        <span
+          style="color: #055fe7;font-size: 0.875rem;margin-right: 0.3125rem;cursor: pointer;"
+          type="text"
+          v-show="reqParam.personStoreCustomSearch.ysxtAsjxgrybh != ''||reqParam.personStoreCustomSearch.createTime != ''||reqParam.personStoreCustomSearch.xm != ''||reqParam.personStoreCustomSearch.zjhm != ''"
+          @click="qk()"
+        >{{$t('Common.clear_btn')}}</span>
+        <el-button
+          type="primary"
+          class="sx f-primary-button"
+          @click="search()"
+        >{{$t('Common.search_btn')}}
+        </el-button>
+      </div>
       <!-- <el-radio-group
                           v-model="reqParam.personStoreCustomSearch.searchOptions"
                           @change="searchStyle"
@@ -221,8 +235,8 @@
         </el-table-column>
         <el-table-column
           :formatter="dateTimeFormat"
-          prop="csrq"
-          :label="$t('Common.csrq')"
+          prop="createtime"
+          :label="$t('Common.sarehousing_time')"
           :width="width4"
         >
         </el-table-column>
@@ -688,6 +702,14 @@ export default {
      * @return {*}
      */
     selectTime () {
+      // this.search()
+    },
+    // 清空
+    qk () {
+      this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = ''
+      this.reqParam.personStoreCustomSearch.createTime = []
+      this.reqParam.personStoreCustomSearch.xm = ''
+      this.reqParam.personStoreCustomSearch.zjhm = ''
       this.search()
     },
     // 获取全部人员列表请求
@@ -1368,6 +1390,26 @@ export default {
         }
       }
     }
+    .right {
+      width: 175px;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      // margin-right: 24px;
+      /deep/ .sx {
+        width: 72px;
+        height: 32px;
+        background: #055fe7;
+        border-radius: 4px;
+        border: none;
+        color: #fff;
+        cursor: pointer;
+
+        span {
+          cursor: pointer;
+        }
+      }
+    }
 
     .el-input {
       /deep/ .el-input__inner {

src/views/AllPersonnelBase/gzlb.vue

@@ -306,6 +306,13 @@
           >
           </el-table-column>
           <el-table-column
+            prop="followPerson.comments"
+            :label="$t('Gz.remarks')"
+            :width="width5"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
             :label="$t('Common.option')"
             width="auto"
           >
@@ -446,7 +453,7 @@
         <el-table-column
           prop="followCase.barcode"
           :label="$t('FptxDr.case_number')"
-          :width="width6"
+          :width="width2"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -467,7 +474,14 @@
         <el-table-column
           prop="followCase.briefCase"
           :label="$t('Gzlb.brief_case')"
-          :width="width5"
+          :width="width7"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="followCase.comments"
+          :label="$t('Gz.remarks')"
+          :width="width7"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -778,11 +792,12 @@ export default {
 
       height: '33rem',
       width1: 50,
-      width2: 400,
-      width3: 300,
-      width4: 200,
+      width2: 220,
+      width3: 200,
+      width4: 100,
       width5: 600,
-      width6: 220,
+      width6: 200,
+      width7: 400,
       qxgzPopName: 'qxgzPop',
       qxgzPopIndex: -1,
     }
@@ -796,6 +811,7 @@ export default {
     this.width4 = (this.width4 * w2) / w1
     this.width5 = (this.width5 * w2) / w1
     this.width6 = (this.width6 * w2) / w1
+    this.width7 = (this.width7 * w2) / w1
   },
   watch: {
     showType (newNum, oldNum) {

src/views/AllPersonnelBase/qbalk.vue

@@ -39,6 +39,22 @@
         >
         </el-date-picker>
       </div>
+      <!-- this.reqParam.caseStoreCustomSearchReq.ysxtAsjbh = ''
+      this.reqParam.caseStoreCustomSearchReq.createTime = [] -->
+      <div class="right">
+        <span
+          style="color: #055fe7;font-size: 0.875rem;margin-right: 0.3125rem;cursor: pointer;"
+          type="text"
+          v-show="reqParam.caseStoreCustomSearchReq.ysxtAsjbh != ''||reqParam.caseStoreCustomSearchReq.createTime != ''"
+          @click="qk()"
+        >{{$t('Common.clear_btn')}}</span>
+        <el-button
+          type="primary"
+          class="sx f-primary-button"
+          @click="search()"
+        >{{$t('Common.search_btn')}}
+        </el-button>
+      </div>
       <!-- <el-radio-group v-model="reqParam.caseStoreCustomSearchReq.searchOptions">
               <el-radio :label="3">通用搜索</el-radio>
               <el-radio :label="6">指定条码搜索</el-radio>
@@ -212,7 +228,7 @@
         <el-table-column
           prop="tqdwGajgmc"
           :label="$t('Allcase.extraction_unit')"
-          :width="width1"
+          :width="width5"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -224,6 +240,13 @@
         >
         </el-table-column>
         <el-table-column
+          :formatter="dateTimeFormat"
+          prop="createdate"
+          :label="$t('Common.sarehousing_time')"
+          :width="width4"
+        >
+        </el-table-column>
+        <el-table-column
           :label="$t('Common.option')"
           width="auto"
         >
@@ -514,7 +537,7 @@ export default {
       width5: 120,
       width4: 150,
       width3: 100,
-      width2: 180,
+      width2: 150,
       width1: 220,
       height: '33rem',
       isShowAjxxk: false, // 案件信息卡
@@ -593,6 +616,12 @@ export default {
      * @return {*}
      */
     selectTime () {
+      // this.search()
+    },
+    // 清空
+    qk () {
+      this.reqParam.caseStoreCustomSearchReq.ysxtAsjbh = ''
+      this.reqParam.caseStoreCustomSearchReq.createTime = []
       this.search()
     },
     // 获取案件数据
@@ -1235,6 +1264,26 @@ const datas1 = [
         color: #606266;
       }
     }
+    .right {
+      width: 830px;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      // margin-right: 24px;
+      /deep/ .sx {
+        width: 72px;
+        height: 32px;
+        background: #055fe7;
+        border-radius: 4px;
+        border: none;
+        color: #fff;
+        cursor: pointer;
+
+        span {
+          cursor: pointer;
+        }
+      }
+    }
 
     /deep/ .el-input {
       /deep/ .el-input__inner {

src/views/Editor/modules/imageEdAJ.vue

@@ -11,102 +11,315 @@
     <div class="imageEd">
       <div class="imageEd_header">
         <div class="center">
-          <el-tooltip class="item" effect="dark" :content="$t('ImageEd.revoke')" :open-delay="500">
-            <div v-if="isHideImageExport" class="disabled back">
-              <img class="disabled-img" src="@/assets/img/zcedit/back_disabled.png" alt="" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('ImageEd.revoke')"
+            :open-delay="500"
+          >
+            <div
+              v-if="isHideImageExport"
+              class="disabled back"
+            >
+              <img
+                class="disabled-img"
+                src="@/assets/img/zcedit/back_disabled.png"
+                alt=""
+              />
             </div>
-            <div v-else class="icon back" id="btn-undo" @mousedown="mouseDownBack" @mouseup="mouseUpBack">
-              <img src="@/assets/img/zcedit/back.png" alt="" v-show="!back_active" />
-              <img src="@/assets/img/zcedit/back_a.png" alt="" v-show="back_active" />
+            <div
+              v-else
+              class="icon back"
+              id="btn-undo"
+              @mousedown="mouseDownBack"
+              @mouseup="mouseUpBack"
+            >
+              <img
+                src="@/assets/img/zcedit/back.png"
+                alt=""
+                v-show="!back_active"
+              />
+              <img
+                src="@/assets/img/zcedit/back_a.png"
+                alt=""
+                v-show="back_active"
+              />
             </div>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('ImageEd.recovery')" :open-delay="500">
-            <div v-if="isHideImageExport" class="disabled go">
-              <img class="disabled-img" src="@/assets/img/zcedit/go_disabled.png" alt="" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('ImageEd.recovery')"
+            :open-delay="500"
+          >
+            <div
+              v-if="isHideImageExport"
+              class="disabled go"
+            >
+              <img
+                class="disabled-img"
+                src="@/assets/img/zcedit/go_disabled.png"
+                alt=""
+              />
             </div>
-            <div v-else class="icon go" id="btn-redo" @mousedown="mouseDownGo" @mouseup="mouseUpGo">
-              <img src="@/assets/img/zcedit/go.png" alt="" v-show="!go_active" />
-              <img src="@/assets/img/zcedit/go_a.png" alt="" v-show="go_active" />
+            <div
+              v-else
+              class="icon go"
+              id="btn-redo"
+              @mousedown="mouseDownGo"
+              @mouseup="mouseUpGo"
+            >
+              <img
+                src="@/assets/img/zcedit/go.png"
+                alt=""
+                v-show="!go_active"
+              />
+              <img
+                src="@/assets/img/zcedit/go_a.png"
+                alt=""
+                v-show="go_active"
+              />
             </div>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('ImageEd.move')" :open-delay="500">
-            <div class="icon drag" @click.stop="hand">
-              <img v-if="!isHand" src="@/assets/img/zcedit/drag.png" alt="" />
-              <img v-else src="@/assets/img/zcedit/drag_a.png" alt="" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('ImageEd.move')"
+            :open-delay="500"
+          >
+            <div
+              class="icon drag"
+              @click.stop="hand"
+            >
+              <img
+                v-if="!isHand"
+                src="@/assets/img/zcedit/drag.png"
+                alt=""
+              />
+              <img
+                v-else
+                src="@/assets/img/zcedit/drag_a.png"
+                alt=""
+              />
             </div>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('ImageEd.enlarge')" :open-delay="500">
-            <div v-if="isHideImageExport" class="disabled enlarge">
-              <img class="disabled-img" src="@/assets/img/zcedit/enlarge_disabled.png" alt="" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('ImageEd.enlarge')"
+            :open-delay="500"
+          >
+            <div
+              v-if="isHideImageExport"
+              class="disabled enlarge"
+            >
+              <img
+                class="disabled-img"
+                src="@/assets/img/zcedit/enlarge_disabled.png"
+                alt=""
+              />
             </div>
-            <div v-else class="icon enlarge" @click.stop="enlarge">
-              <img v-if="!isEnlarge" src="@/assets/img/zcedit/enlarge.png" alt="" />
-              <img v-else src="@/assets/img/zcedit/enlarge_a.png" alt="" />
+            <div
+              v-else
+              class="icon enlarge"
+              @click.stop="enlarge"
+            >
+              <img
+                v-if="!isEnlarge"
+                src="@/assets/img/zcedit/enlarge.png"
+                alt=""
+              />
+              <img
+                v-else
+                src="@/assets/img/zcedit/enlarge_a.png"
+                alt=""
+              />
             </div>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('ImageEd.full_size_display')" :open-delay="500" placement="top">
-            <div v-if="isHideImageExport" class="disabled size">
-              <img class="disabled-img" src="@/assets/img/zcedit/size_disabled.png" alt="" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('ImageEd.full_size_display')"
+            :open-delay="500"
+            placement="top"
+          >
+            <div
+              v-if="isHideImageExport"
+              class="disabled size"
+            >
+              <img
+                class="disabled-img"
+                src="@/assets/img/zcedit/size_disabled.png"
+                alt=""
+              />
             </div>
-            <div v-else class="size_mix">
-              <div class="icon_size" @click.stop="sizeChange">
-                <img class="size" v-if="!isActive" src="@/assets/img/zcedit/size.png" alt="" />
-                <img class="size" v-else src="@/assets/img/zcedit/size_a.png" alt="" />
-                <img class="arrow" v-show="!isActive" src="@/assets/img/zcedit/arrow.png" alt="" />
-                <img class="arrow" v-show="isActive" src="@/assets/img/zcedit/arrow_a.png" alt="" />
+            <div
+              v-else
+              class="size_mix"
+            >
+              <div
+                class="icon_size"
+                @click.stop="sizeChange"
+              >
+                <img
+                  class="size"
+                  v-if="!isActive"
+                  src="@/assets/img/zcedit/size.png"
+                  alt=""
+                />
+                <img
+                  class="size"
+                  v-else
+                  src="@/assets/img/zcedit/size_a.png"
+                  alt=""
+                />
+                <img
+                  class="arrow"
+                  v-show="!isActive"
+                  src="@/assets/img/zcedit/arrow.png"
+                  alt=""
+                />
+                <img
+                  class="arrow"
+                  v-show="isActive"
+                  src="@/assets/img/zcedit/arrow_a.png"
+                  alt=""
+                />
               </div>
             </div>
           </el-tooltip>
           <!-- 原尺寸显示下拉框 -->
-          <div class="size-options" v-show="isShowsizeOptions">
-            <div class="size-options-item" @click.stop="OriginalChange(false)">
+          <div
+            class="size-options"
+            v-show="isShowsizeOptions"
+          >
+            <div
+              class="size-options-item"
+              @click.stop="OriginalChange(false)"
+            >
               <!-- <div class="item-selected"><span v-show="issize">√</span></div> -->
               <div class="item-selected">
-                <span v-show="issize" class="iconfont icon-duihao"></span>
+                <span
+                  v-show="issize"
+                  class="iconfont icon-duihao"
+                ></span>
               </div>
               <div class="item-name">{{$t('FptxDc.origin_image')}}</div>
             </div>
-            <div class="size-options-item" @click.stop="ModerateChange(false)">
+            <div
+              class="size-options-item"
+              @click.stop="ModerateChange(false)"
+            >
               <div class="item-selected">
-                <span v-show="ismoderate" class="iconfont icon-duihao"></span>
+                <span
+                  v-show="ismoderate"
+                  class="iconfont icon-duihao"
+                ></span>
               </div>
               <div class="item-name">{{$t('Ryzwbj.moderate')}}</div>
             </div>
           </div>
-          <el-tooltip class="item" effect="dark" :content="$t('ImageEd.download')" :open-delay="500">
-            <div v-if="isHideImageExport" class="disabled download">
-              <img class="disabled-img" src="@/assets/img/zcedit/download_disabled.png" alt="" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('ImageEd.download')"
+            :open-delay="500"
+          >
+            <div
+              v-if="isHideImageExport"
+              class="disabled download"
+            >
+              <img
+                class="disabled-img"
+                src="@/assets/img/zcedit/download_disabled.png"
+                alt=""
+              />
             </div>
-            <div v-else class="icon download" id="btn-download">
-              <img src="@/assets/img/zcedit/download.png" alt="" />
+            <div
+              v-else
+              class="icon download"
+              id="btn-download"
+            >
+              <img
+                src="@/assets/img/zcedit/download.png"
+                alt=""
+              />
             </div>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('ImageEd.thumbnail')" :open-delay="500">
-            <div class="icon bzd" @click.stop="onchangePreview" v-if="zwType == $t('Common.palm') && !isHideImageExport">
-              <img src="@/assets/img/zcedit/bzd.png" alt="" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('ImageEd.thumbnail')"
+            :open-delay="500"
+          >
+            <div
+              class="icon bzd"
+              @click.stop="onchangePreview"
+              v-if="zwType == $t('Common.palm') && !isHideImageExport"
+            >
+              <img
+                src="@/assets/img/zcedit/bzd.png"
+                alt=""
+              />
             </div>
-            <div class="disabled" v-else>
-              <img class="disabled-img" src="@/assets/img/zcedit/slt_disabled.png" alt="" />
+            <div
+              class="disabled"
+              v-else
+            >
+              <img
+                class="disabled-img"
+                src="@/assets/img/zcedit/slt_disabled.png"
+                alt=""
+              />
             </div>
           </el-tooltip>
         </div>
       </div>
       <div class="imageEd_main">
         <!-- 预览 -->
-        <div class="preview-source" id="preview-source" v-show="isShowSourcePrivew">
-          <img id="preview-source-img" :src="previewSource" alt="" />
-          <div id="block_small" class="block_small" v-show="true"></div>
+        <div
+          class="preview-source"
+          id="preview-source"
+          v-show="isShowSourcePrivew"
+        >
+          <img
+            id="preview-source-img"
+            :src="previewSource"
+            alt=""
+          />
+          <div
+            id="block_small"
+            class="block_small"
+            v-show="true"
+          ></div>
           <!-- 缩略图的拖动 -->
-          <div class="preview-source-drag" id="preview-source-drag">
-            <img src="@/assets/img/rybj/drag.png" alt="">
+          <div
+            class="preview-source-drag"
+            id="preview-source-drag"
+          >
+            <img
+              src="@/assets/img/rybj/drag.png"
+              alt=""
+            >
           </div>
         </div>
         <!-- 小操作区域 -->
-        <div class="small-drawing" v-if="isTpdr_flag">
+        <div
+          class="small-drawing"
+          v-if="isTpdr_flag"
+        >
           <div class="small-drawing2">
-            <img class="small-drawing-img" :src="smallSrc" alt="" />
+            <img
+              class="small-drawing-img"
+              :src="smallSrc"
+              alt=""
+            />
           </div>
-          <div id="blc_small" class="blc_small" v-show="isSwk_flag">
+          <div
+            id="blc_small"
+            class="blc_small"
+            v-show="isSwk_flag"
+          >
             <div class="blc_inner"></div>
             <div class="blc_outter"></div>
           </div>
@@ -115,57 +328,131 @@
         <div class="drawing">
           <!-- <div class="title">{{fingerTitle}}</div> -->
           <div class="body-container">
-            <div id="blc" class="blc" v-show="isSwk_flag">
+            <div
+              id="blc"
+              class="blc"
+              v-show="isSwk_flag"
+            >
               <!-- <div id="blc" class="blc" v-show="true"> -->
               <div class="blc_inner"></div>
               <div class="blc_outter">
-                <span v-if="isSLT" class="blc_outter_box blc_outter_box1"></span>
-                <span v-if="isSLT" class="blc_outter_box blc_outter_box2"></span>
-                <span v-if="isSLT" class="blc_outter_box blc_outter_box3"></span>
-                <span v-if="isSLT" class="blc_outter_box blc_outter_box4"></span>
+                <span
+                  v-if="isSLT"
+                  class="blc_outter_box blc_outter_box1"
+                ></span>
+                <span
+                  v-if="isSLT"
+                  class="blc_outter_box blc_outter_box2"
+                ></span>
+                <span
+                  v-if="isSLT"
+                  class="blc_outter_box blc_outter_box3"
+                ></span>
+                <span
+                  v-if="isSLT"
+                  class="blc_outter_box blc_outter_box4"
+                ></span>
               </div>
             </div>
             <div class="tui-image-editor"></div>
-            <img id="sourceImage" style="display: none" v-if="sourceImage" :src="'data:image/jpeg;base64,' + $fFormatUtil.imgSrcFormat(sourceImage)" alt="" />
+            <img
+              id="sourceImage"
+              style="display: none"
+              v-if="sourceImage"
+              :src="'data:image/jpeg;base64,' + $fFormatUtil.imgSrcFormat(sourceImage)"
+              alt=""
+            />
           </div>
           <div class="tzdDrawing"></div>
           <div class="tzdDrawing_2"></div>
-          <canvas :width="canvasWidth" :height="canvasHeight" class="irregular" id="irregular"></canvas>
-          <canvas :width="canvasWidth" :height="canvasHeight" class="rule_line" id="rule_line"></canvas>
+          <canvas
+            :width="canvasWidth"
+            :height="canvasHeight"
+            class="irregular"
+            id="irregular"
+          ></canvas>
+          <canvas
+            :width="canvasWidth"
+            :height="canvasHeight"
+            class="rule_line"
+            id="rule_line"
+          ></canvas>
         </div>
         <!-- 展示方向 -->
-        <div class="greendirection" v-show="isdirection">
+        <div
+          class="greendirection"
+          v-show="isdirection"
+        >
           <div class="stringht"></div>
           <div class="horizal"></div>
         </div>
         <!-- 指纹-掌纹切换 -->
         <div class="zzwswitch">
           <div class="zzwswitem-radio">
-            <el-radio disabled v-model="zzwSwitch" label="1">{{$t('Daxxk.fingerprint')}}</el-radio>
-            <el-radio disabled class="secondRadio" v-model="zzwSwitch" label="2">{{$t('Common.palm')}}</el-radio>
+            <el-radio
+              disabled
+              v-model="zzwSwitch"
+              label="1"
+            >{{$t('Daxxk.fingerprint')}}</el-radio>
+            <el-radio
+              disabled
+              class="secondRadio"
+              v-model="zzwSwitch"
+              label="2"
+            >{{$t('Common.palm')}}</el-radio>
           </div>
-          <div class="positions" v-show="zzwSwitch == 1">
+          <div
+            class="positions"
+            v-show="zzwSwitch == 1"
+          >
             <div class="head">
-              <div class="head-dom" v-for="(item, index) in fingers" :key="index">
+              <div
+                class="head-dom"
+                v-for="(item, index) in fingers"
+                :key="index"
+              >
                 {{ item }}
               </div>
             </div>
             <div class="right-finger">
               <div class="name">{{$t('Ryzwbj.right')}}</div>
               <div class="isSelected">
-                <el-checkbox class="check" v-for="(item, index) in rightFinger" :key="index" v-model="item.isSelected" @change="handleFingerPosition"></el-checkbox>
+                <el-checkbox
+                  class="check"
+                  v-for="(item, index) in rightFinger"
+                  :key="index"
+                  v-model="item.isSelected"
+                  @change="handleFingerPosition"
+                ></el-checkbox>
               </div>
             </div>
             <div class="left-finger">
               <div class="name">{{$t('Ryzwbj.left')}}</div>
               <div class="isSelected">
-                <el-checkbox class="check" v-for="(item, index) in leftFinger" :key="index" v-model="item.isSelected" @change="handleFingerPosition"></el-checkbox>
+                <el-checkbox
+                  class="check"
+                  v-for="(item, index) in leftFinger"
+                  :key="index"
+                  v-model="item.isSelected"
+                  @change="handleFingerPosition"
+                ></el-checkbox>
               </div>
             </div>
           </div>
-          <div class="positions positons-hand" v-show="zzwSwitch == 2">
-            <div class="hand-item" v-for="(item, index) in handsType" :key="index">
-              <el-checkbox class="check" v-model="item.isSelected" @change="handleHandPosition">{{
+          <div
+            class="positions positons-hand"
+            v-show="zzwSwitch == 2"
+          >
+            <div
+              class="hand-item"
+              v-for="(item, index) in handsType"
+              :key="index"
+            >
+              <el-checkbox
+                class="check"
+                v-model="item.isSelected"
+                @change="handleHandPosition"
+              >{{
 								item.name
 							}}</el-checkbox>
             </div>
@@ -175,11 +462,17 @@
     </div>
     <div class="imageEd-options">
       <div class="options-header">
-        <div class="btn" @click="btnChange">{{$t('Common.fcx')}}</div>
+        <div
+          class="btn"
+          @click="btnChange"
+        >{{$t('Common.fcx')}}</div>
       </div>
       <div class="options">
         <div class="options-top">
-          <div class="shadow-ImageImport" v-show="!isHideImageExport"></div>
+          <div
+            class="shadow-ImageImport"
+            v-show="!isHideImageExport"
+          ></div>
           <div class="top-title">
             <span>{{$t('Ajzwbj.image_import')}}</span>
             <!-- <el-switch class="line_switch" v-model="isHideImageExport" active-color="#055FE7">
@@ -191,44 +484,98 @@
           </div>
           <div class="top-content">
             <div class="btn1">
-              <div :class="{tpdr: true,disabled: !roleArr.includes('F-2-16')}" @click.stop="loadImageChange">
-                {{$t('Ajzwbj.picture_import')}}<input v-show="false" type="file" accept="image/*" id="input-image-file" @click.stop />
+              <div
+                :class="{tpdr: true,disabled: !roleArr.includes('F-2-16')}"
+                @click.stop="loadImageChange"
+              >
+                {{$t('Ajzwbj.picture_import')}}<input
+                  v-show="false"
+                  type="file"
+                  accept="image/*"
+                  id="input-image-file"
+                  @click.stop
+                />
               </div>
               <div class="sm">{{$t('Ajzwbj.scanning')}}</div>
               <div class="setting">
-                <img src="@/assets/img/rybj/setting.svg" alt="" />
+                <img
+                  src="@/assets/img/rybj/setting.svg"
+                  alt=""
+                />
               </div>
               <div class="line1"></div>
-              <div class="tjswk" @click.stop="tjswkChange">{{$t('Ajzwbj.add_hand_print_frame')}}</div>
+              <div
+                class="tjswk"
+                @click.stop="tjswkChange"
+              >{{$t('Ajzwbj.add_hand_print_frame')}}</div>
             </div>
             <div class="line2"></div>
             <div class="btn2">
-              <el-tooltip class="item" effect="dark" :content="$t('Ajzwbj.scale')" :open-delay="500">
-                <div class="blcbtn" :class="{ featuresActive: rule }" @click.stop="addRule('dr')">
-                  <img src="@/assets/img/rybj/rule.svg" alt="" />
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('Ajzwbj.scale')"
+                :open-delay="500"
+              >
+                <div
+                  class="blcbtn"
+                  :class="{ featuresActive: rule }"
+                  @click.stop="addRule('dr')"
+                >
+                  <img
+                    src="@/assets/img/rybj/rule.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
-              <div class="blcbtn-options" v-if="rule">
+              <div
+                class="blcbtn-options"
+                v-if="rule"
+              >
                 <div class="blcbtn-head">
                   <div class="head-title">{{$t('Ajzwbj.scale')}}</div>
-                  <div class="head-close" @click.stop="blcCancel">×</div>
+                  <div
+                    class="head-close"
+                    @click.stop="blcCancel"
+                  >×</div>
                 </div>
                 <div class="blcbtn-content">
                   <div class="kd-mix">
                     <span class="kd">{{$t('Ajzwbj.degree_scale')}}：</span>
-                    <el-select v-model="kdvalue" :placeholder="$t('Common.please_select')" class="kd-select">
-                      <el-option v-for="item in kdoptions" :key="item.value" :label="item.label" :value="item.value">
+                    <el-select
+                      v-model="kdvalue"
+                      :placeholder="$t('Common.please_select')"
+                      class="kd-select"
+                    >
+                      <el-option
+                        v-for="item in kdoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
                       </el-option>
                     </el-select>
                   </div>
                   <div class="sz-mix">
                     <span class="sz">{{$t('Ajzwbj.numerical_value')}}：</span>
-                    <el-input-number class="sznum" v-model="sznum" controls-position="right" @change="handleChangeSZ" :min="1"></el-input-number>
+                    <el-input-number
+                      class="sznum"
+                      v-model="sznum"
+                      controls-position="right"
+                      @change="handleChangeSZ"
+                      :min="1"
+                    ></el-input-number>
                   </div>
                 </div>
                 <div class="blc-btns">
-                  <div class="confirm" @click.stop="blcConfirm('dr')">{{$t('Common.confirm_btn')}}</div>
-                  <div class="cancel" @click.stop="blcCancel">{{$t('Common.cancel_btn')}}</div>
+                  <div
+                    class="confirm"
+                    @click.stop="blcConfirm('dr')"
+                  >{{$t('Common.confirm_btn')}}</div>
+                  <div
+                    class="cancel"
+                    @click.stop="blcCancel"
+                  >{{$t('Common.cancel_btn')}}</div>
                 </div>
               </div>
               <!-- <el-tooltip class="item" effect="dark" content="图像比例验证" :open-delay="500">
@@ -237,64 +584,148 @@
                 </div>
               </el-tooltip> -->
               <!-- 旋转 -->
-              <el-tooltip class="item" effect="dark" :content="$t('ImageEd.rotate')" :open-delay="500">
-                <div class="rotate" :class="{ featuresActive: isRotateOptions_dr }" @click.stop="rotateChange_dr">
-                  <img src="@/assets/img/rybj/rotate.svg" alt="" />
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('ImageEd.rotate')"
+                :open-delay="500"
+              >
+                <div
+                  class="rotate"
+                  :class="{ featuresActive: isRotateOptions_dr }"
+                  @click.stop="rotateChange_dr"
+                >
+                  <img
+                    src="@/assets/img/rybj/rotate.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
-              <div class="rotateOptions" v-show="isRotateOptions_dr" @click.stop>
+              <div
+                class="rotateOptions"
+                v-show="isRotateOptions_dr"
+                @click.stop
+              >
                 <!-- <div class="rotateOptions" v-show="true"> -->
                 <div class="top">
                   <div class="left">{{$t('ImageEd.image_rotation')}}</div>
-                  <div class="right" id="btn-reset-flip-dr">{{$t('ImageEd.reset')}}</div>
+                  <div
+                    class="right"
+                    id="btn-reset-flip-dr"
+                  >{{$t('ImageEd.reset')}}</div>
                 </div>
                 <div class="rotate_line_top"></div>
                 <div class="content">
                   <div class="rotate_content">
-                    <div class="rotate_left" id="btn-rotate-clockwise-dr">
+                    <div
+                      class="rotate_left"
+                      id="btn-rotate-clockwise-dr"
+                    >
                       <div class="rotate_icon">
-                        <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="" />
+                        <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="{ leftRotateActive: isLeftRotate }">
+                      <div
+                        class="num"
+                        :class="{ leftRotateActive: isLeftRotate }"
+                      >
                         -30
                       </div>
                     </div>
-                    <div class="rotate_right" id="btn-rotate-counter-clockwise-dr">
+                    <div
+                      class="rotate_right"
+                      id="btn-rotate-counter-clockwise-dr"
+                    >
                       <div class="rotate_icon">
-                        <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="" />
+                        <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="{ rightRotateActive: isRightRotate }">
+                      <div
+                        class="num"
+                        :class="{ rightRotateActive: isRightRotate }"
+                      >
                         30
                       </div>
                     </div>
                   </div>
                   <div class="flap_content">
-                    <div class="flap_x" id="btn-flip-y-dr">
+                    <div
+                      class="flap_x"
+                      id="btn-flip-y-dr"
+                    >
                       <div class="flap_x_icon">
-                        <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="" />
+                        <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: isY }">{{$t('ImageEd.x_axis')}}</div>
+                      <div
+                        class="flap_txt"
+                        :class="{ xActive: isY }"
+                      >{{$t('ImageEd.x_axis')}}</div>
                     </div>
-                    <div class="flap_y" id="btn-flip-x-dr">
+                    <div
+                      class="flap_y"
+                      id="btn-flip-x-dr"
+                    >
                       <div class="flap_y_icon">
-                        <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="" />
+                        <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: isX }">{{$t('ImageEd.y_axis')}}</div>
+                      <div
+                        class="flap_txt"
+                        :class="{ yActive: isX }"
+                      >{{$t('ImageEd.y_axis')}}</div>
                     </div>
                   </div>
                 </div>
                 <div class="rotate_bottom">
                   <div class="progress">
                     <!--                    <input id="input-rotation-range" type="range" min="-360" :value="inputRotationRange" max="360" />-->
-                    <el-slider v-model.number="inputRotationRange" :min="-360" :max="360" id="input-rotation-range"></el-slider>
+                    <el-slider
+                      v-model.number="inputRotationRange"
+                      :min="-360"
+                      :max="360"
+                      id="input-rotation-range"
+                    ></el-slider>
                   </div>
                   <div class="desc">
                     <div class="qj">{{$t('ImageEd.section')}}</div>
-                    <input class="qj_v" type="text" v-model.number="inputRotationRange" />
+                    <input
+                      class="qj_v"
+                      type="text"
+                      v-model.number="inputRotationRange"
+                    />
                   </div>
                 </div>
               </div>
@@ -303,7 +734,11 @@
                 <!-- 不让修改推荐序号 -->
                 <!-- <input v-if="zwType==$t('Daxxk.fingerprint')" type="text" v-model="tjxh" />
                 <input v-else type="text" v-model="tjxh" /> -->
-                <input type="text" v-model="tjxh" disabled />
+                <input
+                  type="text"
+                  v-model="tjxh"
+                  disabled
+                />
               </div>
             </div>
             <div class="line3"></div>
@@ -318,28 +753,58 @@
             <div class="line4"></div>
             <div class="btn4">
               <span>{{$t('Ajzwbj.left_part')}}：</span>
-              <div class="txt" v-if="ylbw_flag">{{ ylbw }}</div>
-              <el-input v-else v-model="ylbw" :placeholder="$t('Common.text_placeholder')" :maxlength="30"></el-input>
-              <div class="edit" @click.stop="editylbwChange">
-                <img src="@/assets/img/rybj/edit.svg" alt="" />
+              <div
+                class="txt"
+                v-if="ylbw_flag"
+              >{{ ylbw }}</div>
+              <el-input
+                v-else
+                v-model="ylbw"
+                :placeholder="$t('Common.text_placeholder')"
+                :maxlength="30"
+              ></el-input>
+              <div
+                class="edit"
+                @click.stop="editylbwChange"
+              >
+                <img
+                  src="@/assets/img/rybj/edit.svg"
+                  alt=""
+                />
               </div>
             </div>
             <div class="line4"></div>
             <div class="btn5">
               <div class="stzw">
-                <el-checkbox v-model="isSelected_stzw" true-label="1" false-label="0">{{$t('Allcase.corpse_print')}}</el-checkbox>
+                <el-checkbox
+                  v-model="isSelected_stzw"
+                  true-label="1"
+                  false-label="0"
+                >{{$t('Allcase.corpse_print')}}</el-checkbox>
               </div>
               <div class="stbh">
                 <span>{{$t('Ajzwbj.body_number')}}</span>
-                <input :maxlength="24" :disabled="isSelected_stzw == '0'" type="text" v-model="stbh" />
+                <input
+                  :maxlength="24"
+                  :disabled="isSelected_stzw == '0'"
+                  type="text"
+                  v-model="stbh"
+                />
               </div>
             </div>
             <div class="line4"></div>
             <div class="btn6">
-              <div class="bcrk bcrkActive" @click.stop="saveToKuChange" v-if="bcrkActive && is_tjxh_legal">
+              <div
+                class="bcrk bcrkActive"
+                @click.stop="saveToKuChange"
+                v-if="bcrkActive && is_tjxh_legal"
+              >
                 {{$t('Ajzwbj.save_warehousing')}}
               </div>
-              <div class="bcrk" v-else>{{$t('Ajzwbj.save_warehousing')}}</div>
+              <div
+                class="bcrk"
+                v-else
+              >{{$t('Ajzwbj.save_warehousing')}}</div>
             </div>
           </div>
         </div>
@@ -349,35 +814,83 @@
               <div class="name">{{$t('Ajzwbj.image_editing')}}</div>
               <span>({{ txbj_type }})</span>
             </div>
-            <div class="right" @click.stop="clearAllOptions">
+            <div
+              class="right"
+              @click.stop="clearAllOptions"
+            >
               <div class="clear_icon">
-                <img src="@/assets/img/rybj/clear.svg" alt="" />
+                <img
+                  src="@/assets/img/rybj/clear.svg"
+                  alt=""
+                />
               </div>
               <div class="name">{{$t('Ryzwbj.emptying_operation')}}</div>
             </div>
-            <div class="clearConfirm" v-show="isShowClearDialog">
+            <div
+              class="clearConfirm"
+              v-show="isShowClearDialog"
+            >
               <div class="tips">{{$t('ImageEd.clear_operation_cannot_undone')}}</div>
               <div class="btn-bottom">
-                <div class="btn-confirm" @click.stop="delPic">{{$t('Common.confirm_btn')}}</div>
-                <div class="btn-cancel" @click.stop="cancelPic">{{$t('Common.cancel_btn')}}</div>
+                <div
+                  class="btn-confirm"
+                  @click.stop="delPic"
+                >{{$t('Common.confirm_btn')}}</div>
+                <div
+                  class="btn-cancel"
+                  @click.stop="cancelPic"
+                >{{$t('Common.cancel_btn')}}</div>
               </div>
             </div>
           </div>
           <div class="center-content">
             <div class="options-btns">
-              <el-tooltip class="item" effect="dark" placement="top" :content="$t('Ajzwbj.circle_freeform_drawing')" :open-delay="500">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                placement="top"
+                :content="$t('Ajzwbj.circle_freeform_drawing')"
+                :open-delay="500"
+              >
                 <div class="zyhz">
-                  <div class="yxhz-left" :class="{ featuresActive: isZyhzFlag }" @click="openZyhz">
-                    <img src="@/assets/img/rybj/zyhz.svg" class="zyhz-left" alt="" v-show="iszyhz" />
-                    <img src="@/assets/img/rybj/yxhz.svg" class="zyhz-left" alt="" v-show="isyxhz" />
+                  <div
+                    class="yxhz-left"
+                    :class="{ featuresActive: isZyhzFlag }"
+                    @click="openZyhz"
+                  >
+                    <img
+                      src="@/assets/img/rybj/zyhz.svg"
+                      class="zyhz-left"
+                      alt=""
+                      v-show="iszyhz"
+                    />
+                    <img
+                      src="@/assets/img/rybj/yxhz.svg"
+                      class="zyhz-left"
+                      alt=""
+                      v-show="isyxhz"
+                    />
                   </div>
-                  <div class="yxhz-right" @click.stop="zyhzOptionsChange">
-                    <img src="@/assets/img/rybj/arrow_d.png" class="zyhz-right" alt="" />
+                  <div
+                    class="yxhz-right"
+                    @click.stop="zyhzOptionsChange"
+                  >
+                    <img
+                      src="@/assets/img/rybj/arrow_d.png"
+                      class="zyhz-right"
+                      alt=""
+                    />
                   </div>
                 </div>
               </el-tooltip>
-              <div class="zyhz-options" v-show="isShowzyhzOptions">
-                <div class="zyhz-options-item" @click.stop="changezyhz">
+              <div
+                class="zyhz-options"
+                v-show="isShowzyhzOptions"
+              >
+                <div
+                  class="zyhz-options-item"
+                  @click.stop="changezyhz"
+                >
                   <div class="item-selected">
                     <span v-show="iszyhz">
                       <i class="iconfont icon-duihao"></i>
@@ -385,7 +898,10 @@
                   </div>
                   <div class="item-name">{{$t('Ajzwbj.freeform_drawing')}}</div>
                 </div>
-                <div class="zyhz-options-item" @click.stop="changeyxhz">
+                <div
+                  class="zyhz-options-item"
+                  @click.stop="changeyxhz"
+                >
                   <div class="item-selected">
                     <span v-show="isyxhz">
                       <i class="iconfont icon-duihao"></i>
@@ -394,110 +910,270 @@
                   <div class="item-name">{{$t('Ajzwbj.circle_drawing')}}</div>
                 </div>
               </div>
-              <el-tooltip class="item" effect="dark" :content="$t('Ryzwbj.characteristic_point')" :open-delay="500">
-                <div class="tzd" :class="{ featuresActive: isHandTZD }" @click.stop="tzdChange">
-                  <img src="@/assets/img/zcedit/features1.svg" alt="" />
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('Ryzwbj.characteristic_point')"
+                :open-delay="500"
+              >
+                <div
+                  class="tzd"
+                  :class="{ featuresActive: isHandTZD }"
+                  @click.stop="tzdChange"
+                >
+                  <img
+                    src="@/assets/img/zcedit/features1.svg"
+                    alt=""
+                  />
                   <div class="number">{{ tzdnumber }}</div>
                 </div>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" :content="$t('FingerPrint.auto_extract_features')" :open-delay="500">
-                <div class="rule" v-show="isAutoTzd" @mouseup="isAutoTzd = false">
-                  <img src="@/assets/img/rybj/dp.svg" alt="" />
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('FingerPrint.auto_extract_features')"
+                :open-delay="500"
+              >
+                <div
+                  class="rule"
+                  v-show="isAutoTzd"
+                  @mouseup="isAutoTzd = false"
+                >
+                  <img
+                    src="@/assets/img/rybj/dp.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" :content="$t('FingerPrint.auto_extract_features')" :open-delay="500">
-                <div class="rule-d" @mousedown="getAutoTzd(true)" v-show="!isAutoTzd">
-                  <img src="@/assets/img/rybj/dp.svg" alt="" />
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('FingerPrint.auto_extract_features')"
+                :open-delay="500"
+              >
+                <div
+                  class="rule-d"
+                  @mousedown="getAutoTzd(true)"
+                  v-show="!isAutoTzd"
+                >
+                  <img
+                    src="@/assets/img/rybj/dp.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" :content="$t('ImageEd.rotate')" :open-delay="500" placement="top">
-                <div class="rotate" :class="{ featuresActive: isRotateOptions }" @click.stop="rotateChange">
-                  <img src="@/assets/img/rybj/rotate.svg" alt="" />
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('ImageEd.rotate')"
+                :open-delay="500"
+                placement="top"
+              >
+                <div
+                  class="rotate"
+                  :class="{ featuresActive: isRotateOptions }"
+                  @click.stop="rotateChange"
+                >
+                  <img
+                    src="@/assets/img/rybj/rotate.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
-              <div class="rotateOptions" v-show="isRotateOptions" @click.stop>
+              <div
+                class="rotateOptions"
+                v-show="isRotateOptions"
+                @click.stop
+              >
                 <!-- <div class="rotateOptions" v-show="true"> -->
                 <div class="top">
                   <div class="left">{{$t('ImageEd.image_rotation')}}</div>
-                  <div class="right" id="btn-reset-flip">{{$t('ImageEd.reset')}}</div>
+                  <div
+                    class="right"
+                    id="btn-reset-flip"
+                  >{{$t('ImageEd.reset')}}</div>
                 </div>
                 <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-clockwise"
+                    >
                       <div class="rotate_icon">
-                        <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="" />
+                        <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="{ leftRotateActive: isLeftRotate }">
+                      <div
+                        class="num"
+                        :class="{ leftRotateActive: isLeftRotate }"
+                      >
                         -30
                       </div>
                     </div>
-                    <div class="rotate_right" id="btn-rotate-counter-clockwise">
+                    <div
+                      class="rotate_right"
+                      id="btn-rotate-counter-clockwise"
+                    >
                       <div class="rotate_icon">
-                        <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="" />
+                        <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="{ rightRotateActive: isRightRotate }">
+                      <div
+                        class="num"
+                        :class="{ rightRotateActive: isRightRotate }"
+                      >
                         30
                       </div>
                     </div>
                   </div>
                   <div class="flap_content">
-                    <div class="flap_x" id="btn-flip-y">
+                    <div
+                      class="flap_x"
+                      id="btn-flip-y"
+                    >
                       <div class="flap_x_icon">
-                        <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="" />
+                        <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: isY }">{{$t('ImageEd.x_axis')}}</div>
+                      <div
+                        class="flap_txt"
+                        :class="{ xActive: isY }"
+                      >{{$t('ImageEd.x_axis')}}</div>
                     </div>
-                    <div class="flap_y" id="btn-flip-x">
+                    <div
+                      class="flap_y"
+                      id="btn-flip-x"
+                    >
                       <div class="flap_y_icon">
-                        <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="" />
+                        <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: isX }">{{$t('ImageEd.y_axis')}}</div>
+                      <div
+                        class="flap_txt"
+                        :class="{ yActive: isX }"
+                      >{{$t('ImageEd.y_axis')}}</div>
                     </div>
                   </div>
                 </div>
                 <div class="rotate_bottom">
                   <div class="progress">
                     <!--                    <input id="input-rotation-range" type="range" min="-360" :value="inputRotationRange" max="360" />-->
-                    <el-slider v-model.number="inputRotationRange" :min="-360" :max="360" id="input-rotation-range"></el-slider>
+                    <el-slider
+                      v-model.number="inputRotationRange"
+                      :min="-360"
+                      :max="360"
+                      id="input-rotation-range"
+                    ></el-slider>
                   </div>
                   <div class="desc">
                     <div class="qj">{{$t('ImageEd.section')}}</div>
-                    <input class="qj_v" type="text" v-model.number="inputRotationRange" />
+                    <input
+                      class="qj_v"
+                      type="text"
+                      v-model.number="inputRotationRange"
+                    />
                   </div>
                 </div>
               </div>
               <!--图像编辑部分比例尺-->
-              <el-tooltip class="item" effect="dark" :content="$t('Ajzwbj.scale')" :open-delay="500">
-                <div class="blcbtn" :class="{ featuresActive: rule_bj }" @click.stop="addRule('bj')">
-                  <img src="@/assets/img/rybj/rule.svg" alt="" />
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('Ajzwbj.scale')"
+                :open-delay="500"
+              >
+                <div
+                  class="blcbtn"
+                  :class="{ featuresActive: rule_bj }"
+                  @click.stop="addRule('bj')"
+                >
+                  <img
+                    src="@/assets/img/rybj/rule.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
-              <div class="blcbtn-options" v-if="rule_bj">
+              <div
+                class="blcbtn-options"
+                v-if="rule_bj"
+              >
                 <div class="blcbtn-head">
                   <div class="head-title">{{$t('Ajzwbj.scale')}}</div>
-                  <div class="head-close" @click.stop="blcCancel">×</div>
+                  <div
+                    class="head-close"
+                    @click.stop="blcCancel"
+                  >×</div>
                 </div>
                 <div class="blcbtn-content">
                   <div class="kd-mix">
                     <span class="kd">{{$t('Ajzwbj.degree_scale')}}：</span>
-                    <el-select v-model="kdvalue" :placeholder="$t('Common.please_select')" class="kd-select">
-                      <el-option v-for="item in kdoptions" :key="item.value" :label="item.label" :value="item.value">
+                    <el-select
+                      v-model="kdvalue"
+                      :placeholder="$t('Common.please_select')"
+                      class="kd-select"
+                    >
+                      <el-option
+                        v-for="item in kdoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
                       </el-option>
                     </el-select>
                   </div>
                   <div class="sz-mix">
                     <span class="sz">{{$t('Ajzwbj.numerical_value')}}：</span>
-                    <el-input-number class="sznum" v-model="sznum" controls-position="right" @change="handleChangeSZ" :min="1"></el-input-number>
+                    <el-input-number
+                      class="sznum"
+                      v-model="sznum"
+                      controls-position="right"
+                      @change="handleChangeSZ"
+                      :min="1"
+                    ></el-input-number>
                   </div>
                 </div>
                 <div class="blc-btns">
-                  <div class="confirm" @click.stop="blcConfirm('bj')">{{$t('Common.confirm_btn')}}</div>
-                  <div class="cancel" @click.stop="blcCancel">{{$t('Common.cancel_btn')}}</div>
+                  <div
+                    class="confirm"
+                    @click.stop="blcConfirm('bj')"
+                  >{{$t('Common.confirm_btn')}}</div>
+                  <div
+                    class="cancel"
+                    @click.stop="blcCancel"
+                  >{{$t('Common.cancel_btn')}}</div>
                 </div>
               </div>
             </div>
@@ -511,28 +1187,73 @@
             </div>
             <div class="save">
               <span class="save-txt">{{$t('Ryzwbj.select_save_type')}}：</span>
-              <div class="save-tzxh" :class="{ active: saveType === $t('Ajzwbj.current_characteristics') }" @click.stop="saveType = $t('Ajzwbj.current_characteristics')">
-                <el-tooltip class="item" effect="dark" :content="$t('Ajzwbj.save_current_sequence_number_feature')" placement="top" :open-delay="500">
-                  <img src="@/assets/img/rybj/dqxhtz.svg" alt="" />
+              <div
+                class="save-tzxh"
+                :class="{ active: saveType === $t('Ajzwbj.current_characteristics') }"
+                @click.stop="saveType = $t('Ajzwbj.current_characteristics')"
+              >
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :content="$t('Ajzwbj.save_current_sequence_number_feature')"
+                  placement="top"
+                  :open-delay="500"
+                >
+                  <img
+                    src="@/assets/img/rybj/dqxhtz.svg"
+                    alt=""
+                  />
                 </el-tooltip>
               </div>
-              <div class="save-tzxh" :class="{ active: saveType === $t('Ajzwbj.all_features') }" @click.stop="saveType = $t('Ajzwbj.all_features')">
-                <el-tooltip class="item" effect="dark" :content="$t('Ajzwbj.save_all_sequence_number_feature')" placement="top" :open-delay="500">
-                  <img src="@/assets/img/rybj/qbtzxh.svg" alt="" />
+              <div
+                class="save-tzxh"
+                :class="{ active: saveType === $t('Ajzwbj.all_features') }"
+                @click.stop="saveType = $t('Ajzwbj.all_features')"
+              >
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :content="$t('Ajzwbj.save_all_sequence_number_feature')"
+                  placement="top"
+                  :open-delay="500"
+                >
+                  <img
+                    src="@/assets/img/rybj/qbtzxh.svg"
+                    alt=""
+                  />
                 </el-tooltip>
               </div>
-              <div class="save-tzxh" :class="{ active: saveType === $t('Ajzwbj.current_features_and_pictures') }" @click.stop="saveType = $t('Ajzwbj.current_features_and_pictures')">
-                <el-tooltip class="item" effect="dark" :content="$t('Ajzwbj.save_current_sequence_number_features_and_pictures')" placement="top" :open-delay="500">
-                  <img src="@/assets/img/rybj/dqtzpic.svg" alt="" />
+              <div
+                class="save-tzxh"
+                :class="{ active: saveType === $t('Ajzwbj.current_features_and_pictures') }"
+                @click.stop="saveType = $t('Ajzwbj.current_features_and_pictures')"
+              >
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :content="$t('Ajzwbj.save_current_sequence_number_features_and_pictures')"
+                  placement="top"
+                  :open-delay="500"
+                >
+                  <img
+                    src="@/assets/img/rybj/dqtzpic.svg"
+                    alt=""
+                  />
                 </el-tooltip>
               </div>
-              <div class="save-btn isActive" @click.stop="changeSaveType">
+              <div
+                class="save-btn isActive"
+                @click.stop="changeSaveType"
+              >
                 {{$t('Ryzwbj.save')}}
               </div>
             </div>
           </div>
           <!-- <div class="mask" v-show="startEditImage"></div> -->
-          <div class="mask" v-show="isHideImageExport"></div>
+          <div
+            class="mask"
+            v-show="isHideImageExport"
+          ></div>
           <!--          <div class="mask" v-show="false"></div>-->
         </div>
         <div class="options-bottom">
@@ -541,67 +1262,131 @@
             <!-- <div class="btn" :class="{ grayActive: isGrayActive }" @click.stop="changeGray">
               灰度
             </div> -->
-            <div class="btn" :class="{ vintageActive: isVintageActive }" @click.stop="changeVintage">
+            <div
+              class="btn"
+              :class="{ vintageActive: isVintageActive }"
+              @click.stop="changeVintage"
+            >
               {{$t('ImageEd.Tan')}}
             </div>
-            <div class="disabled" :class="{ horseshoeMirrorActive: isHorseshoeMirrorActive }" style="display:none;">
+            <div
+              class="disabled"
+              :class="{ horseshoeMirrorActive: isHorseshoeMirrorActive }"
+              style="display:none;"
+            >
               {{$t('ImageEd.horseshoe_mirror')}}
             </div>
-            <div class="btn" :class="{ equalizationActive: isEqualizationActive }" @click="changeEqualization">
+            <div
+              class="btn"
+              :class="{ equalizationActive: isEqualizationActive }"
+              @click="changeEqualization"
+            >
               {{$t('ImageEd.equalization')}}
             </div>
-            <div class="btn" :class="{ sharpenActive: isSharpenActive }" @click.stop="changeSharpen">
+            <div
+              class="btn"
+              :class="{ sharpenActive: isSharpenActive }"
+              @click.stop="changeSharpen"
+            >
               {{$t('ImageEd.sharpening')}}
             </div>
-            <div class="btn" :class="{ embossActive: isEmbossActive }" @click.stop="changeEmboss">
+            <div
+              class="btn"
+              :class="{ embossActive: isEmbossActive }"
+              @click.stop="changeEmboss"
+            >
               {{$t('ImageEd.relief')}}
             </div>
-            <div class="btn" :class="{ invertActive: isInvertActive }" @click.stop="changeInvert">
+            <div
+              class="btn"
+              :class="{ invertActive: isInvertActive }"
+              @click.stop="changeInvert"
+            >
               {{$t('ImageEd.reversed_phase')}}
             </div>
-            <div class="btn" :class="{ blendActive: isBlendActive }" @click.stop="changeBlend">
+            <div
+              class="btn"
+              :class="{ blendActive: isBlendActive }"
+              @click.stop="changeBlend"
+            >
               {{$t('ImageEd.differentiation')}}
             </div>
             <!-- <div class="btn" :class="{ removeWhiteActive: isRemoveWhiteActive }" @click.stop="changeRemoveWhite">
               去白
             </div> -->
-            <div class="btn" :class="{ multiplyActive: isMultiplyActive }" @click.stop="changeMultiply">
+            <div
+              class="btn"
+              :class="{ multiplyActive: isMultiplyActive }"
+              @click.stop="changeMultiply"
+            >
               {{$t('ImageEd.positive_lamination')}}
             </div>
             <!-- <div class="btn" :class="{ colorFilterActive: isColorFilterActive }" @click.stop="changeColorFilter">
               滤色器
             </div> -->
             <!-- 去白弹框 -->
-            <div class="remove-white" v-show="optionsRemoveWhite">
+            <div
+              class="remove-white"
+              v-show="optionsRemoveWhite"
+            >
               <div class="title">{{$t('ImageEd.de_whitening')}}</div>
               <div class="content">
                 <!--                <input class="range-narrow" id="input-range-remove-white-distance" type="range" min="0"
                        :value="inputRemoveWhiteRange" max="255" />-->
-                <el-slider v-model="inputRemoveWhiteRange" id="input-range-remove-white-distance" :min="0" :max="255"></el-slider>
-                <input class="qb_v" type="text" v-model.number="inputRemoveWhiteRange" />
+                <el-slider
+                  v-model="inputRemoveWhiteRange"
+                  id="input-range-remove-white-distance"
+                  :min="0"
+                  :max="255"
+                ></el-slider>
+                <input
+                  class="qb_v"
+                  type="text"
+                  v-model.number="inputRemoveWhiteRange"
+                />
               </div>
             </div>
             <!-- 正片叠底弹框 -->
-            <div class="multiply" v-show="optionsMultiply" @click.stop>
+            <div
+              class="multiply"
+              v-show="optionsMultiply"
+              @click.stop
+            >
               <div class="content">
                 <div id="tui-multiply-color-picker"></div>
               </div>
             </div>
             <!-- 差异化弹框 -->
-            <div class="blend" v-show="optionsBlend" @click.stop>
+            <div
+              class="blend"
+              v-show="optionsBlend"
+              @click.stop
+            >
               <div class="content">
                 <div id="tui-blend-color-picker"></div>
               </div>
             </div>
           </div>
           <!-- 滤色器弹框 -->
-          <div class="color-filter" v-show="optionsColorFilter">
+          <div
+            class="color-filter"
+            v-show="optionsColorFilter"
+          >
             <div class="title">{{$t('ImageEd.color_filter')}}</div>
             <div class="content">
               <!--              <input class="range-narrow" id="input-range-color-filter-value" type="range" min="0"
                      :value="inputColorFilterRange" max="255" />-->
-              <el-slider v-model.number="inputColorFilterRange" id="input-range-color-filter-value" :min="0" :max="255"></el-slider>
-              <input class="qb_v" type="text" v-model.number="inputColorFilterRange" />
+              <el-slider
+                v-model.number="inputColorFilterRange"
+                id="input-range-color-filter-value"
+                :min="0"
+                :max="255"
+              ></el-slider>
+              <input
+                class="qb_v"
+                type="text"
+                v-model.number="inputColorFilterRange"
+              />
             </div>
           </div>
           <!-- 滤色器 -->
@@ -616,41 +1401,91 @@
           <div class="color-filter">
             <div class="title">{{$t('ImageEd.color_filter')}}</div>
             <div class="content">
-              <el-slider class="range-narrow" id="input-range-color-filter-value" v-model.number="inputColorFilterRange" :min="0" :max="255"></el-slider>
-              <input min="0" max="255" class="qb_v" type="text" v-model.number="inputColorFilterRange" />
+              <el-slider
+                class="range-narrow"
+                id="input-range-color-filter-value"
+                v-model.number="inputColorFilterRange"
+                :min="0"
+                :max="255"
+              ></el-slider>
+              <input
+                min="0"
+                max="255"
+                class="qb_v"
+                type="text"
+                v-model.number="inputColorFilterRange"
+              />
             </div>
           </div>
           <!-- 亮度 -->
           <div class="brightness">
             <div class="title">{{$t('ImageEd.brightness')}}</div>
             <div class="content">
-              <el-slider class="range-narrow" v-model.number="inputBrightnessRange" id="input-range-brightness-value" :min="-255" :max="255"></el-slider>
-              <input class="qb_v" type="text" v-model.number="inputBrightnessRange" />
+              <el-slider
+                class="range-narrow"
+                v-model.number="inputBrightnessRange"
+                id="input-range-brightness-value"
+                :min="-255"
+                :max="255"
+              ></el-slider>
+              <input
+                class="qb_v"
+                type="text"
+                v-model.number="inputBrightnessRange"
+              />
             </div>
           </div>
           <!-- 对比度 -->
           <div class="contrast-ratio">
             <div class="title">{{$t('ImageEd.contrast')}}</div>
             <div class="content">
-              <el-slider class="range-narrow" v-model.number="inputContrastRange" id="input-range-contrast-value" :min="-255" :max="255"></el-slider>
-              <input class="qb_v" type="text" v-model.number="inputContrastRange" />
+              <el-slider
+                class="range-narrow"
+                v-model.number="inputContrastRange"
+                id="input-range-contrast-value"
+                :min="-255"
+                :max="255"
+              ></el-slider>
+              <input
+                class="qb_v"
+                type="text"
+                v-model.number="inputContrastRange"
+              />
             </div>
           </div>
           <!-- 去白 -->
           <div class="brightness">
             <div class="title">{{$t('ImageEd.de_whitening')}}</div>
             <div class="content">
-              <el-slider class="range-narrow" id="input-range-remove-white-distance" v-model.number="inputRemoveWhiteRange" :min="0" :max="255"></el-slider>
-              <input class="qb_v" type="text" v-model.number="inputRemoveWhiteRange" />
+              <el-slider
+                class="range-narrow"
+                id="input-range-remove-white-distance"
+                v-model.number="inputRemoveWhiteRange"
+                :min="0"
+                :max="255"
+              ></el-slider>
+              <input
+                class="qb_v"
+                type="text"
+                v-model.number="inputRemoveWhiteRange"
+              />
             </div>
           </div>
           <!-- <div class="mask" v-show="startEditImage"></div> -->
-          <div class="mask" v-show="isHideImageExport"></div>
+          <div
+            class="mask"
+            v-show="isHideImageExport"
+          ></div>
         </div>
       </div>
     </div>
     <!-- 发查询弹窗 -->
-    <fcx :isShowFcx="isShowFcx" :rowData="fcxData" :type="'aj'" @closeFcx="closeFcx">
+    <fcx
+      :isShowFcx="isShowFcx"
+      :rowData="fcxData"
+      :type="'aj'"
+      @closeFcx="closeFcx"
+    >
     </fcx>
   </div>
 </template>
@@ -699,17 +1534,17 @@ export default {
       // 数值
       sznum: 1,
       // 刻度
-      kdvalue: this.$t('Ajzwbj.millimeter')+"/mm",
+      kdvalue: this.$t('Ajzwbj.millimeter') + "/mm",
       kdoptions: [
         {
-          value: this.$t('Ajzwbj.millimeter')+"/mm",
-          label: this.$t('Ajzwbj.millimeter')+"/mm"
+          value: this.$t('Ajzwbj.millimeter') + "/mm",
+          label: this.$t('Ajzwbj.millimeter') + "/mm"
         }, {
-          value: this.$t('Ajzwbj.centimeter')+"/cm",
-          label: this.$t('Ajzwbj.centimeter')+"/cm"
+          value: this.$t('Ajzwbj.centimeter') + "/cm",
+          label: this.$t('Ajzwbj.centimeter') + "/cm"
         }, {
-          value: this.$t('Ajzwbj.inch')+"/in",
-          label: this.$t('Ajzwbj.inch')+"/in"
+          value: this.$t('Ajzwbj.inch') + "/in",
+          label: this.$t('Ajzwbj.inch') + "/in"
         }
       ],
       zwType: this.$t('Daxxk.fingerprint'),
@@ -1545,7 +2380,7 @@ export default {
       self.isX = false;
       self.isY = false;
       self.isReset = true;
-      
+
       // 事件不能连续重复执行，需要缓存时间
       setTimeout(() => {
         imageEditor.rotate(-parseInt(self.startPlace));
@@ -2058,16 +2893,16 @@ export default {
           self.width_ratio = self.canvasBox_width / self.newWidth
           self.height_ratio = self.canvasBox_height / self.newHeight
 
-          if(self.width_ratio >= self.height_ratio) {
+          if (self.width_ratio >= self.height_ratio) {
             self.ratio = self.width_ratio
           } else {
             self.ratio = self.height_ratio
           }
-          if(self.ratio > 1) {
+          if (self.ratio > 1) {
             // self.ratio = 0.9
             let a = self.newWidth / self.canvasBox_width
             let b = self.newHeight / self.canvasBox_height
-            if(a >= b) {
+            if (a >= b) {
               self.ratio = a
             } else {
               self.ratio = b
@@ -2134,15 +2969,15 @@ export default {
                 $(".tzdDom").css("display", "flex");
                 $(".tzdDom").css("align-items", "center");
                 $(".tzdDom").css("position", "absolute");
-                $(".tzdDom").css("transform-origin", self.pixel_4+"px center");
+                $(".tzdDom").css("transform-origin", self.pixel_4 + "px center");
 
-                $(".tzdDom .head").css("width", self.pixel_8+"px");
-                $(".tzdDom .head").css("height", self.pixel_8+"px");
-                $(".tzdDom .head").css("border-radius", self.pixel_8+"px");
+                $(".tzdDom .head").css("width", self.pixel_8 + "px");
+                $(".tzdDom .head").css("height", self.pixel_8 + "px");
+                $(".tzdDom .head").css("border-radius", self.pixel_8 + "px");
                 $(".tzdDom .head").css("background-color", "#FFFD0F");
 
-                $(".tzdDom .direction").css("width", self.pixel_20+"px");
-                $(".tzdDom .direction").css("height", self.pixel_2+"px");
+                $(".tzdDom .direction").css("width", self.pixel_20 + "px");
+                $(".tzdDom .direction").css("height", self.pixel_2 + "px");
                 $(".tzdDom .direction").css("background-color", "#FFFD0F");
 
                 $(`#tzd${self.tzdId}`).css(
@@ -2329,12 +3164,12 @@ export default {
         // border-top: 1px solid #e02020;
         $('.body-container').css('border', 'none')
         $('.body-container').css('border-top', 'none')
-        self.rightFinger.forEach(item => {
-          item.isSelected = false
-        })
-        self.leftFinger.forEach(item => {
-          item.isSelected = false
-        })
+        // self.rightFinger.forEach(item => {
+        //   item.isSelected = false
+        // })
+        // self.leftFinger.forEach(item => {
+        //   item.isSelected = false
+        // })
         // 操作恢复
         self.isHand = false
         self.isHandSpace = false
@@ -2592,7 +3427,7 @@ export default {
             $(".tzdDom").css("display", "flex");
             $(".tzdDom").css("align-items", "center");
             $(".tzdDom").css("position", "absolute");
-            $(".tzdDom").css("transform-origin", self.pixel_4 +"px center");
+            $(".tzdDom").css("transform-origin", self.pixel_4 + "px center");
 
             $(".tzdDom .head").css("width", self.pixel_8 + "px");
             $(".tzdDom .head").css("height", self.pixel_8 + "px");
@@ -3835,7 +4670,7 @@ export default {
 
     })
 
-    document.addEventListener('mouseup', function(e) {
+    document.addEventListener('mouseup', function (e) {
       // console.log(e);
       self.swk_move_flag = false;
     })
@@ -3961,15 +4796,15 @@ export default {
                 $(".auto_tzdDom").css("display", "flex");
                 $(".auto_tzdDom").css("align-items", "center");
                 $(".auto_tzdDom").css("position", "absolute");
-                $(".auto_tzdDom").css("transform-origin", self.pixel_4+"px center");
+                $(".auto_tzdDom").css("transform-origin", self.pixel_4 + "px center");
 
-                $(".auto_tzdDom .head").css("width", self.pixel_8+"px");
-                $(".auto_tzdDom .head").css("height", self.pixel_8+"px");
-                $(".auto_tzdDom .head").css("border-radius", self.pixel_8+"px");
+                $(".auto_tzdDom .head").css("width", self.pixel_8 + "px");
+                $(".auto_tzdDom .head").css("height", self.pixel_8 + "px");
+                $(".auto_tzdDom .head").css("border-radius", self.pixel_8 + "px");
                 $(".auto_tzdDom .head").css("background-color", "#FFFD0F");
 
-                $(".auto_tzdDom .direction").css("width", self.pixel_20+"px");
-                $(".auto_tzdDom .direction").css("height", self.pixel_2+"px");
+                $(".auto_tzdDom .direction").css("width", self.pixel_20 + "px");
+                $(".auto_tzdDom .direction").css("height", self.pixel_2 + "px");
                 $(".auto_tzdDom .direction").css("background-color", "#FFFD0F");
 
                 // console.log(item.xczw_zwtzd_tzxzb);
@@ -4127,15 +4962,15 @@ export default {
                 $(".auto_tzdDom").css("display", "flex");
                 $(".auto_tzdDom").css("align-items", "center");
                 $(".auto_tzdDom").css("position", "absolute");
-                $(".auto_tzdDom").css("transform-origin", self.pixel_4+"px center");
+                $(".auto_tzdDom").css("transform-origin", self.pixel_4 + "px center");
 
-                $(".auto_tzdDom .head").css("width", self.pixel_8+"px");
-                $(".auto_tzdDom .head").css("height", self.pixel_8+"px");
-                $(".auto_tzdDom .head").css("border-radius", self.pixel_8+"px");
+                $(".auto_tzdDom .head").css("width", self.pixel_8 + "px");
+                $(".auto_tzdDom .head").css("height", self.pixel_8 + "px");
+                $(".auto_tzdDom .head").css("border-radius", self.pixel_8 + "px");
                 $(".auto_tzdDom .head").css("background-color", "#FFFD0F");
 
-                $(".auto_tzdDom .direction").css("width", self.pixel_20+"px");
-                $(".auto_tzdDom .direction").css("height", self.pixel_2+"px");
+                $(".auto_tzdDom .direction").css("width", self.pixel_20 + "px");
+                $(".auto_tzdDom .direction").css("height", self.pixel_2 + "px");
                 $(".auto_tzdDom .direction").css("background-color", "#FFFD0F");
 
                 $(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb - self.pixel_4) + "px");
@@ -4263,26 +5098,26 @@ export default {
         // 从session中拿
         if (sessionStorage.getItem(`auto_tzdDom${this.seq}`)) {
           self.autoTzdArr = JSON.parse(sessionStorage.getItem(`auto_tzdDom${this.seq}`));
-          if(self.autoTzdArr && self.autoTzdArr.length > 0) {
+          if (self.autoTzdArr && self.autoTzdArr.length > 0) {
             self.autoTzdArr_num = 0
-            function requestAnimationFun() {
+            function requestAnimationFun () {
               let item = self.autoTzdArr[self.autoTzdArr_num];
-              if(item) {
+              if (item) {
                 $(
                   `<div id="auto_tzdDom${self.tzdId}" class="auto_tzdDom"><div class="head"></div><div class="direction"></div></div>`
                 ).appendTo(".tzdDrawing");
                 $(".auto_tzdDom").css("display", "flex");
                 $(".auto_tzdDom").css("align-items", "center");
                 $(".auto_tzdDom").css("position", "absolute");
-                $(".auto_tzdDom").css("transform-origin", self.pixel_4+"px center");
+                $(".auto_tzdDom").css("transform-origin", self.pixel_4 + "px center");
 
-                $(".auto_tzdDom .head").css("width", self.pixel_8+"px");
-                $(".auto_tzdDom .head").css("height", self.pixel_8+"px");
-                $(".auto_tzdDom .head").css("border-radius", self.pixel_8+"px");
+                $(".auto_tzdDom .head").css("width", self.pixel_8 + "px");
+                $(".auto_tzdDom .head").css("height", self.pixel_8 + "px");
+                $(".auto_tzdDom .head").css("border-radius", self.pixel_8 + "px");
                 $(".auto_tzdDom .head").css("background-color", "#FFFD0F");
 
-                $(".auto_tzdDom .direction").css("width", self.pixel_20+"px");
-                $(".auto_tzdDom .direction").css("height", self.pixel_2+"px");
+                $(".auto_tzdDom .direction").css("width", self.pixel_20 + "px");
+                $(".auto_tzdDom .direction").css("height", self.pixel_2 + "px");
                 $(".auto_tzdDom .direction").css("background-color", "#FFFD0F");
 
                 $(`#auto_tzdDom${self.tzdId}`).css(
@@ -4294,10 +5129,10 @@ export default {
                   (item.xczw_zwtzd_tzyzb - self.pixel_4) / self.zoomLevel + "px"
                 );
                 $(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
-                if(self.zwType == '掌纹') {
+                if (self.zwType == '掌纹') {
                   $(`#auto_tzdDom${self.tzdId}`).css(
                     "transform",
-                    `rotate(${-item.xczw_zwtzd_tzfx}deg) scale(${self.ratio+0.1})`
+                    `rotate(${-item.xczw_zwtzd_tzfx}deg) scale(${self.ratio + 0.1})`
                   );
                 } else {
                   $(`#auto_tzdDom${self.tzdId}`).css(
@@ -5068,11 +5903,11 @@ export default {
       let self = this;
       console.log(this.rule_num);
       console.log(this.line_distance);
-      if (this.kdvalue == this.$t('Ajzwbj.millimeter')+"/mm") {
+      if (this.kdvalue == this.$t('Ajzwbj.millimeter') + "/mm") {
         this.rule_num = this.rule_num;
-      } else if (this.kdvalue == this.$t('Ajzwbj.centimeter')+"/cm") {
+      } else if (this.kdvalue == this.$t('Ajzwbj.centimeter') + "/cm") {
         this.rule_num = Number(this.rule_num) * 10;
-      } else if (this.kdvalue == this.$t('Ajzwbj.inch')+"/in") {
+      } else if (this.kdvalue == this.$t('Ajzwbj.inch') + "/in") {
         this.rule_num = Number(this.rule_num) * 25.4;
       }
       if (this.zwType == this.$t('Daxxk.fingerprint')) {
@@ -5281,7 +6116,7 @@ export default {
         } else {
           if (Number(this.tjxh) < 101) {
             this.tjxh = 101
-          } else if(Number(this.tjxh) > 999) {
+          } else if (Number(this.tjxh) > 999) {
             this.tjxh = 999
           }
           if (this.handsNumber.indexOf(Number(this.tjxh)) != -1) {
@@ -5600,7 +6435,7 @@ export default {
             self.swk_move_flag = true
             o[p] = function (e) {
               e = e || event;
-              if(self.swk_move_flag) {
+              if (self.swk_move_flag) {
                 s.left = e.clientX - x + "px";
                 s.top = e.clientY - y + "px";
 
@@ -5844,7 +6679,7 @@ export default {
       // 是否展示原尺寸同步下拉框
       this.isShowsizeOptions = false;
       this.isActive = false
-      
+
       var flag = true
       // 获取推荐序号
       if (this.zwType === this.$t('Daxxk.fingerprint')) {
@@ -6786,7 +7621,7 @@ export default {
           }).then(res => {
             // console.log(res);
             if (res.data.code === 0) {
-              self.$message.success(self.$t('Common.save_success')+"！");
+              self.$message.success(self.$t('Common.save_success') + "！");
               // 记录session保存的个数
               self.sessionCount++;
               self.judgeJumpRoute()
@@ -6933,7 +7768,7 @@ export default {
           }).then((res) => {
             // console.log(res);
             if (res.data.code == 0) {
-              self.$message.success(self.$t('Common.save_success')+"！");
+              self.$message.success(self.$t('Common.save_success') + "！");
               // 记录session保存的个数
               self.sessionCount++;
               self.judgeJumpRoute()
@@ -7283,7 +8118,7 @@ export default {
         }).then(res => {
           // console.log(res);
           if (res.data.code === 0) {
-            self.$message.success(self.$t('Common.save_success')+'！')
+            self.$message.success(self.$t('Common.save_success') + '！')
             // 计算session的个数
             self.sessionCount = self.sessionCount + Number(sessionArr.length);
             self.judgeJumpRoute()
@@ -7302,7 +8137,7 @@ export default {
             data: JSON.stringify(hand_tjsj)
           }).then(res => {
             if (res.data.code === 0) {
-              self.$message.success(self.$t('Common.save_success')+'！')
+              self.$message.success(self.$t('Common.save_success') + '！')
               // 计算session的个数
               self.sessionCount = self.sessionCount + Number(sessionArr.length);
               self.judgeJumpRoute()
@@ -7679,7 +8514,7 @@ export default {
             loading: true
           }).then(res => {
             if (res.data.code == 0) {
-              self.$message.success(self.$t('Common.save_success')+"！");
+              self.$message.success(self.$t('Common.save_success') + "！");
               // 记录session保存的个数
               self.sessionCount++;
               self.judgeJumpRoute()
@@ -7740,7 +8575,7 @@ export default {
           }).then((res) => {
             // console.log(res);
             if (res.data.code == 0) {
-              self.$message.success(self.$t('Common.save_success')+"！");
+              self.$message.success(self.$t('Common.save_success') + "！");
               // 记录session保存的个数
               self.sessionCount++;
               self.judgeJumpRoute()
@@ -8885,16 +9720,16 @@ export default {
     },
   },
   watch: {
-    tjxh(newValue, oldValue) {
-      if(this.zwType == this.$t('Daxxk.fingerprint')) {
-        if(newValue < 1 || newValue > 99) {
+    tjxh (newValue, oldValue) {
+      if (this.zwType == this.$t('Daxxk.fingerprint')) {
+        if (newValue < 1 || newValue > 99) {
           this.$message.warning(this.$t('Ajzwbj.recommended_serial_number_exceeds_limit'))
           this.is_tjxh_legal = false
         } else {
           this.is_tjxh_legal = true
         }
       } else {
-        if(newValue < 101 || newValue > 999) {
+        if (newValue < 101 || newValue > 999) {
           this.$message.warning(this.$t('Ajzwbj.recommended_serial_number_exceeds_limit'))
           this.is_tjxh_legal = false
         } else {
@@ -9150,16 +9985,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "./imageEdAJ.scss";
-.disabled{
-  background-color: #ecedf1!important;
-  color: #aeafb4!important;
+@import './imageEdAJ.scss';
+.disabled {
+  background-color: #ecedf1 !important;
+  color: #aeafb4 !important;
 }
 </style>
 
 <style lang="scss">
 // 修改下拉框样式
 .el-select-dropdown__item {
-	padding-left: 20px;
+  padding-left: 20px;
 }
 </style>

src/views/cxyrd/QueryConfirm.vue

@@ -881,8 +881,8 @@ export default {
     },
     // 选择用户下拉框变化时 当前页为1
     selectUserInfo () {
-      this.reqParam.page.currPage = 1
-      this.searchQuery()
+      // this.reqParam.page.currPage = 1
+      // this.searchQuery()
     },
     // 清空用户id
     clearUser () {

src/views/tjbb/tjbb.vue

@@ -300,7 +300,7 @@
       </div>
     </div>
     <div class="content">
-      <iframe
+      <!-- <iframe
         id="reportFrame"
         width="100%"
         height="100%"
@@ -308,7 +308,295 @@
         scrolling="auto"
         :src="fr_cpt_url"
       >
-      </iframe>
+      </iframe> -->
+      <!--  采集 -->
+      <el-table
+        v-if='tpl==1'
+        :data="tableData"
+        :header-cell-style="{'text-align':'center',color:'#333333','font-size': '14px','font-family': 'HarmonyOS_Sans_SC_Medium','font-weight': '600','border-color': '#D1D1D1'}"
+        :cell-style="{'text-align':'center','border-color': '#D1D1D1',padding:'0px'}"
+        style="width: 100%"
+        class='cjTable'
+      >
+        <el-table-column
+          prop="date"
+          label="采集单位"
+          width="200"
+        >
+        </el-table-column>
+        <el-table-column label="捺印指掌纹">
+          <el-table-column label="指纹">
+            <el-table-column
+              prop="province"
+              label="当月累计"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="city"
+              label="当年累计"
+            >
+            </el-table-column>
+
+          </el-table-column>
+          <el-table-column label="掌纹">
+            <el-table-column
+              prop="province"
+              label="当月累计"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="city"
+              label="当年累计"
+            >
+            </el-table-column>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="现场指掌纹提取">
+          <el-table-column label="指纹">
+            <el-table-column
+              prop="province"
+              label="当月累计（起）"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="city"
+              label="当年累计（起）"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="province"
+              label="当月累计（枚）"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="city"
+              label="当年累计（枚）"
+            >
+            </el-table-column>
+
+          </el-table-column>
+          <el-table-column label="掌纹">
+            <el-table-column
+              prop="province"
+              label="当月累计"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="city"
+              label="当年累计"
+            >
+            </el-table-column>
+          </el-table-column>
+        </el-table-column>
+      </el-table>
+      <!-- 案件 -->
+      <el-table
+        v-if='tpl==2'
+        :data="tableDataAj"
+        :header-cell-style="{'text-align':'center',color:'#333333','font-size': '14px','font-family': 'HarmonyOS_Sans_SC_Medium','font-weight': '600','border-color': '#D1D1D1'}"
+        :cell-style="{'text-align':'center','border-color': '#D1D1D1',padding:'0px'}"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="date"
+          label="案事件编号"
+          width="180"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="指纹个数"
+          width="180"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="案件类别"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="发案日期"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="发案地点代码"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="发案地点"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="采集单位代码"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="采集单位"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="捺印日期"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="采集人"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="比中标识"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="认定单位"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="上报单位"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="采集人身份证"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="采集人电话"
+        >
+        </el-table-column>
+      </el-table>
+
+      <!-- 地市比中 -->
+      <el-table
+        v-if='tpl==3'
+        :data="tableDataAj"
+        :header-cell-style="{'text-align':'center',color:'#333333','font-size': '14px','font-family': 'HarmonyOS_Sans_SC_Medium','font-weight': '600','border-color': '#D1D1D1'}"
+        :cell-style="{'text-align':'center','border-color': '#D1D1D1',padding:'0px'}"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="date"
+          label="案事件编号"
+          width="180"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="现勘编号"
+          width="180"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="警综案件编号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="案件类型"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="人员号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="警综人员编号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="姓名"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="身份证"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="序号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="指位"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="查询类型"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="上报部状态"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="比中用户"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="比中单位"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="比中时间"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="比中状态"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="复核用户"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="复核单位"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="复核时间"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="复核状态"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="简要案情"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="上报部流水号"
+        >
+        </el-table-column>
+      </el-table>
     </div>
     <div
       class="block"
@@ -339,8 +627,19 @@ export default {
   components: {
     Cascader,
   },
+  created () {
+    let w1 = 1920
+    let w2 = window.innerWidth
+    this.width1 = (this.width1 * w2) / w1
+  },
   data () {
     return {
+      width1: 200,
+      tableDataAj: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄',
+      }],
       status: 1, // 可视化切换    1或2
       props: {
         value: "code",
@@ -949,7 +1248,7 @@ $height: var(--height, 37.5rem);
   position: relative;
   margin-left: 10px;
   &::before {
-    content: "";
+    content: '';
     display: inline-block;
     position: absolute;
     left: 0;
@@ -1021,6 +1320,9 @@ $height: var(--height, 37.5rem);
     width: 100%;
     // height: 530px;
     height: $height;
+
+    .cjTable {
+    }
   }
 }
 .widthAuto /deep/ .el-form-item__content {
@@ -1405,5 +1707,5 @@ $height: var(--height, 37.5rem);
   background-color: #dadde0;
   border-radius: 3px;
 }
-@import "@/assets/css/globalBase.scss";
+@import '@/assets/css/globalBase.scss';
 </style>