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

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -346,7 +346,10 @@
                 class="icon del"
                 title="确认要删除该数据吗？该操作无法撤消！"
               >
-                <div slot="reference">
+                <div
+                  slot="reference"
+                  @click="closeSelected"
+                >
                   <img
                     src="../../assets/img/qbryk/del.svg"
                     alt=""
@@ -510,6 +513,12 @@ export default {
     };
   },
   methods: {
+    closeSelected () {
+      // alert(1)
+      if (this.isSelected == true) {
+        this.batch()
+      }
+    },
     // 获取全部人员列表请求
     search () {
       // console.info("请求===>", this.reqParam);
@@ -822,6 +831,7 @@ export default {
      * @return {*}
      */
     handleClick (row) {
+      this.closeSelected()
       console.log(row);
       this.$router.push('/ryzwbj/' + row.id + '/' + row.ysxtAsjxgrybh)
     },
@@ -1110,22 +1120,23 @@ export default {
       }
       .disabled {
         border: none;
-        border: 1px solid #ccc;
+        border: 1px solid #ecedf1;
         font-size: 14px;
         font-family: MicrosoftYaHei;
-        color: #ccc;
+        background-color: #fff;
+        color: #c2c4c7;
         i {
           font-size: 14px;
           margin-right: 5px;
         }
-        &:hover {
-          border: 1px solid #ccc;
-          color: #ccc;
-        }
-        &:active {
-          border: 1px solid #ccc;
-          color: #ccc;
-        }
+        // &:hover {
+        //   border: 1px solid #ccc;
+        //   color: #ccc;
+        // }
+        // &:active {
+        //   border: 1px solid #ccc;
+        //   color: #ccc;
+        // }
       }
     }
   }

src/views/AllPersonnelBase/modules/dcfptxAj.vue

@@ -45,9 +45,16 @@
 
       <el-form-item label="数据类型：">
         <el-radio-group v-model="sjlx">
-          <el-radio :label="1">原图</el-radio>
-          <el-radio :label="2">压缩图</el-radio>
-          <el-radio :label="3">特征</el-radio>
+          <el-radio
+            @click.native.prevent="clickitemsjlx(1)"
+            :label="1"
+          >原图</el-radio>
+          <el-radio
+            @click.native.prevent="clickitemsjlx(2)"
+            :label="2"
+          >压缩图</el-radio>
+          <!-- <el-radio :label="3">特征</el-radio> -->
+          <el-checkbox v-model="tz">特征</el-checkbox>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="文件格式：">
@@ -70,10 +77,12 @@
         >
           <el-radio
             :label="1"
+            @click.native.prevent="clickitemtmbz(1)"
             border
           >000</el-radio>
           <el-radio
             :label="2"
+            @click.native.prevent="clickitemtmbz(2)"
             border
           >999</el-radio>
         </el-radio-group>
@@ -122,11 +131,12 @@ export default {
       dialogVisible: false, // 弹窗状态
       wzChecked: true, // 文字单选 
 
-      sjlx: 1, // 数据类型
+      sjlx: null, // 数据类型
       wjgs: 1,//文件格式
       dcms: 1, //导出模式
-      tmbz: 1,// 条码补值
-      tm: 'true', // 脱密
+      tmbz: null,// 条码补值
+      tm: null, // 脱密
+      tz: null,// 特征
 
       checkAll: false, // 是否全选
       checkedTargets: [], // 选定指位
@@ -189,6 +199,12 @@ export default {
           }
         });
     },
+    clickitemsjlx (e) {
+      e === this.sjlx ? this.sjlx = '' : this.sjlx = e
+    },
+    clickitemtmbz (e) {
+      e === this.tmbz ? this.tmbz = '' : this.tmbz = e
+    },
     handleClose (done) {
       targtOptions = [];
       this.targts = targtOptions

src/views/AllPersonnelBase/modules/dcftpx.vue

@@ -257,9 +257,16 @@
     >
       <el-form-item label="数据类型：">
         <el-radio-group v-model="sjlx">
-          <el-radio :label="1">原图</el-radio>
-          <el-radio :label="2">压缩图</el-radio>
-          <el-radio :label="3">特征</el-radio>
+          <el-radio
+            @click.native.prevent="clickitemsjlx(1)"
+            :label="1"
+          >原图</el-radio>
+          <el-radio
+            @click.native.prevent="clickitemsjlx(2)"
+            :label="2"
+          >压缩图</el-radio>
+          <!-- <el-radio :label="3">特征</el-radio> -->
+          <el-checkbox v-model="tz">特征</el-checkbox>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="文件格式：">
@@ -293,10 +300,12 @@
         >
           <el-radio
             :label="1"
+            @click.native.prevent="clickitemtmbz(1)"
             border
           >000</el-radio>
           <el-radio
             :label="2"
+            @click.native.prevent="clickitemtmbz(2)"
             border
           >999</el-radio>
         </el-radio-group>
@@ -350,6 +359,7 @@ export default {
       filenameexport: '文件',
       dialogVisible: false, // 弹窗状态
       wzChecked: true, // 文字单选 
+      tz: null,// 特征
       // 滚动指纹
       gdzwisIndeterminate: false, // 滚动指纹状态
       gdzwCheckAll: true, // 滚动指纹全选
@@ -395,10 +405,10 @@ export default {
       checkedrxs: ['正面照', '左侧照', '右侧照', '身份证'],
       rxs: rxOptions,
 
-      sjlx: 1, // 数据类型
+      sjlx: null, // 数据类型
       wjgs: 1,//文件格式
       dcms: 1, //导出模式
-      tmbz: 1,// 条码补值
+      tmbz: null,// 条码补值
     };
   },
   mounted () {
@@ -647,6 +657,12 @@ export default {
       this.rxcheckAll = checkedCount === this.rxs.length;
       this.rxisIndeterminate = checkedCount > 0 && checkedCount < this.rxs.length;
     },
+    clickitemsjlx (e) {
+      e === this.sjlx ? this.sjlx = '' : this.sjlx = e
+    },
+    clickitemtmbz (e) {
+      e === this.tmbz ? this.tmbz = '' : this.tmbz = e
+    },
   }
 };
 </script>

src/views/AllPersonnelBase/modules/xzry.vue

@@ -26,12 +26,13 @@
         <el-col :span="12">
           <el-form-item label="人员编号：" prop="ysxtAsjxgrybh">
             <el-input
+              class="inputBh"
               v-model.trim="ruleForm.ysxtAsjxgrybh"
               placeholder="请输入人员编号"
-              maxlength="23"
+              maxlength="22"
               show-word-limit
               clearable
-            ></el-input>
+            ><template slot="prepend">R</template></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -507,6 +508,8 @@ export default {
             personDo: "",
           };
           reqParam.personDo = this.ruleForm;
+          let defaultArr = 'R'
+          reqParam.personDo.ysxtAsjxgrybh = defaultArr.concat(this.ruleForm.ysxtAsjxgrybh)
           this.$axios
             .post("/api/personstore/personadd", reqParam)
             .then((response) => {
@@ -545,6 +548,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.inputBh {
+  /deep/.el-input-group__prepend {
+    width: 40px;
+    text-align: center;
+    padding: 0;
+  }
+  /deep/.el-input__inner {
+    width: 224px;
+  }
+}
 // 滚动条的宽度
 /deep/ .el-form::-webkit-scrollbar {
   width: 6px; // 横向滚动条

src/views/AllPersonnelBase/qbalk.vue

@@ -996,22 +996,22 @@ const datas1 = [
       }
       .disabled {
         border: none;
-        border: 1px solid #ccc;
+        border: 1px solid #ecedf1;
         font-size: 14px;
         font-family: MicrosoftYaHei;
-        color: #ccc;
+        color: #c2c4c7;
         i {
           font-size: 14px;
           margin-right: 5px;
         }
-        &:hover {
-          border: 1px solid #ccc;
-          color: #ccc;
-        }
-        &:active {
-          border: 1px solid #ccc;
-          color: #ccc;
-        }
+        // &:hover {
+        //   border: 1px solid #ccc;
+        //   color: #ccc;
+        // }
+        // &:active {
+        //   border: 1px solid #ccc;
+        //   color: #ccc;
+        // }
       }
     }
   }

src/views/drFPTX/RAList.vue

 <template>
-  <el-container class="RAList" direction="vertical">
+  <el-container
+    class="RAList"
+    direction="vertical"
+  >
     <!-- 一 -->
-    <div class="head" v-if="showType == 1">
-      <el-radio-group v-model="dataType" class="chooseType">
+    <div
+      class="head"
+      v-if="showType == 1"
+    >
+      <el-radio-group
+        v-model="dataType"
+        class="chooseType"
+      >
         <el-radio :label="1">人员</el-radio>
         <el-radio :label="2">案件</el-radio>
       </el-radio-group>
@@ -19,7 +28,10 @@
       </div>
       <div class="search ljfk">
         <div class="item">逻辑分库：</div>
-        <el-select v-model="logicDatabase" placeholder="请选择逻辑分库">
+        <el-select
+          v-model="logicDatabase"
+          placeholder="请选择逻辑分库"
+        >
           <el-option
             v-for="item in logicDatabaseoptions"
             :key="item.value"
@@ -42,7 +54,10 @@
       </div>
       <div class="search rkzt">
         <div class="item">入库状态：</div>
-        <el-select v-model="status" placeholder="请选择入库状态">
+        <el-select
+          v-model="status"
+          placeholder="请选择入库状态"
+        >
           <el-option
             v-for="item in statusoptions"
             :key="item.value"
@@ -80,7 +95,10 @@
       </div>
       <div class="search ljfk">
         <div class="item">查询类型：</div>
-        <el-select v-model="queryType" placeholder="请选择查询类型">
+        <el-select
+          v-model="queryType"
+          placeholder="请选择查询类型"
+        >
           <el-option
             v-for="item in queryTypeOptions"
             :key="item.value"
@@ -92,7 +110,10 @@
       </div>
       <div class="search ljfk">
         <div class="item">逻辑分库：</div>
-        <el-select v-model="logicDatabase" placeholder="请选择逻辑分库">
+        <el-select
+          v-model="logicDatabase"
+          placeholder="请选择逻辑分库"
+        >
           <el-option
             v-for="item in logicDatabaseoptions"
             :key="item.value"
@@ -113,7 +134,10 @@
       </div> -->
       <div class="search rkzt">
         <div class="item">入库状态：</div>
-        <el-select v-model="status" placeholder="请选择入库状态">
+        <el-select
+          v-model="status"
+          placeholder="请选择入库状态"
+        >
           <el-option
             v-for="item in statusoptions"
             :key="item.value"
@@ -137,7 +161,10 @@
     <!-- 二 -->
     <div class="buttons">
       <div class="left">
-        <el-radio-group v-model="showType" size="small">
+        <el-radio-group
+          v-model="showType"
+          size="small"
+        >
           <el-radio-button label="1">人员案件</el-radio-button>
           <el-radio-button label="2">比中关系</el-radio-button>
         </el-radio-group>
@@ -150,10 +177,16 @@
     <!-- 三 -->
     <div class="options">
       <div class="left">
-        <div class="btn" @click="batch">批量操作</div>
+        <div
+          class="btn"
+          @click="batch"
+        >批量操作</div>
       </div>
       <div class="right">
-        <div class="btn" @click="isShowTjddlBtn">添加到队列</div>
+        <div
+          class="btn"
+          @click="isShowTjddlBtn"
+        >添加到队列</div>
         <div class="btn">复制入库失败编号</div>
         <div class="btn">复制入库成功编号</div>
         <div
@@ -165,7 +198,10 @@
         >
           复制条码
         </div>
-        <div class="btn send" @click="isShowFcxBtn">发查询</div>
+        <div
+          class="btn send"
+          @click="isShowFcxBtn"
+        >发查询</div>
       </div>
     </div>
     <!--四 -->
@@ -173,7 +209,10 @@
       style="width: 100%; color: #666666; margin-bottom: 16px"
       v-show="isShowTip"
     >
-      <i class="el-icon-info" style="color: #055fe7; font-size: 15px"></i>
+      <i
+        class="el-icon-info"
+        style="color: #055fe7; font-size: 15px"
+      ></i>
       已选择
       <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
       <span v-html="'&nbsp;&nbsp;'"></span>
@@ -183,8 +222,7 @@
         :underline="false"
         style="margin-left: 20px"
         @click="toggleSelection()"
-        >清除</el-link
-      >
+      >清除</el-link>
     </el-tag>
     <!-- 五 -->
     <div v-if="showType == 1">
@@ -201,21 +239,53 @@
         }"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="auto" v-if="isSelected">
+        <el-table-column
+          type="selection"
+          width="auto"
+          v-if="isSelected"
+        >
         </el-table-column>
-        <el-table-column prop="taskNumber" label="任务号" width="200">
+        <el-table-column
+          prop="taskNumber"
+          label="任务号"
+          width="200"
+        >
         </el-table-column>
-        <el-table-column prop="fileName" label="文件名" width="300">
+        <el-table-column
+          prop="fileName"
+          label="文件名"
+          width="300"
+        >
         </el-table-column>
-        <el-table-column prop="barcode" label="人员编号/案事件编号" width="300">
+        <el-table-column
+          prop="barcode"
+          label="人员编号/案事件编号"
+          width="300"
+        >
         </el-table-column>
-        <el-table-column prop="dataType" label="类型" width="auto">
+        <el-table-column
+          prop="dataType"
+          label="类型"
+          width="auto"
+        >
         </el-table-column>
-        <el-table-column prop="logicDatabase" label="逻辑分库" width="auto">
+        <el-table-column
+          prop="logicDatabase"
+          label="逻辑分库"
+          width="auto"
+        >
         </el-table-column>
-        <el-table-column prop="status" label="状态" width="auto">
+        <el-table-column
+          prop="status"
+          label="状态"
+          width="auto"
+        >
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="100">
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="100"
+        >
           <template slot-scope="scope">
             <div class="ops">
               <el-tooltip
@@ -226,8 +296,14 @@
                 :open-delay="500"
                 @click="handleClick(scope.row)"
               >
-                <div class="icon bj" @click="handleClick(scope.row)">
-                  <img src="../../assets/img/qbryk/bj.svg" alt="" />
+                <div
+                  class="icon bj"
+                  @click="handleClick(scope.row)"
+                >
+                  <img
+                    src="../../assets/img/qbryk/bj.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
               <el-tooltip
@@ -237,8 +313,14 @@
                 placement="top"
                 :open-delay="500"
               >
-                <div class="icon bz" @click="isShowFztmBtn(scope.row)">
-                  <img src="../../assets/img/qbryk/bz.svg" alt="" />
+                <div
+                  class="icon bz"
+                  @click="isShowFztmBtn(scope.row)"
+                >
+                  <img
+                    src="../../assets/img/qbryk/bz.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
               <el-tooltip
@@ -248,8 +330,14 @@
                 placement="top"
                 :open-delay="500"
               >
-                <div class="icon look" @click="isShowFcxBtn1(scope.row)">
-                  <img src="../../assets/img/qbryk/search.svg" alt="" />
+                <div
+                  class="icon look"
+                  @click="isShowFcxBtn1(scope.row)"
+                >
+                  <img
+                    src="../../assets/img/qbryk/search.svg"
+                    alt=""
+                  />
                 </div>
               </el-tooltip>
             </div>
@@ -272,25 +360,57 @@
       }"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="auto" v-if="isSelected">
+      <el-table-column
+        type="selection"
+        width="auto"
+        v-if="isSelected"
+      >
       </el-table-column>
-      <el-table-column prop="taskNumber" label="任务号" width="200">
+      <el-table-column
+        prop="taskNumber"
+        label="任务号"
+        width="200"
+      >
       </el-table-column>
-      <el-table-column prop="fileName" label="文件名" width="300">
+      <el-table-column
+        prop="fileName"
+        label="文件名"
+        width="300"
+      >
       </el-table-column>
-      <el-table-column prop="queryType" label="查询类型" width="auto">
+      <el-table-column
+        prop="queryType"
+        label="查询类型"
+        width="auto"
+      >
       </el-table-column>
-      <el-table-column prop="barcode" label="人员编号/案事件编号" width="300">
+      <el-table-column
+        prop="barcode"
+        label="人员编号/案事件编号"
+        width="300"
+      >
         <template slot-scope="scope">
           <div>{{ scope.row.srcBarcode }}</div>
           <div>{{ scope.row.destBarcode }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="logicDatabase" label="逻辑分库" width="auto">
+      <el-table-column
+        prop="logicDatabase"
+        label="逻辑分库"
+        width="auto"
+      >
       </el-table-column>
-      <el-table-column prop="status" label="状态" width="auto">
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="auto"
+      >
       </el-table-column>
-      <el-table-column fixed="right" label="操作" width="100">
+      <el-table-column
+        fixed="right"
+        label="操作"
+        width="100"
+      >
         <template slot-scope="scope">
           <div class="ops">
             <el-tooltip
@@ -301,8 +421,14 @@
               :open-delay="500"
               @click="handleClick(scope.row)"
             >
-              <div class="icon bj" @click="handleClick(scope.row)">
-                <img src="../../assets/img/qbryk/bj.svg" alt="" />
+              <div
+                class="icon bj"
+                @click="handleClick(scope.row)"
+              >
+                <img
+                  src="../../assets/img/qbryk/bj.svg"
+                  alt=""
+                />
               </div>
             </el-tooltip>
             <el-tooltip
@@ -312,8 +438,14 @@
               placement="top"
               :open-delay="500"
             >
-              <div class="icon bz" @click="isShowFztmBtn(scope.row)">
-                <img src="../../assets/img/qbryk/bz.svg" alt="" />
+              <div
+                class="icon bz"
+                @click="isShowFztmBtn(scope.row)"
+              >
+                <img
+                  src="../../assets/img/qbryk/bz.svg"
+                  alt=""
+                />
               </div>
             </el-tooltip>
             <el-tooltip
@@ -323,8 +455,14 @@
               placement="top"
               :open-delay="500"
             >
-              <div class="icon look" @click="isShowFcxBtn1(scope.row)">
-                <img src="../../assets/img/qbryk/search.svg" alt="" />
+              <div
+                class="icon look"
+                @click="isShowFcxBtn1(scope.row)"
+              >
+                <img
+                  src="../../assets/img/qbryk/search.svg"
+                  alt=""
+                />
               </div>
             </el-tooltip>
           </div>
@@ -333,11 +471,9 @@
     </el-table>
     <!-- 六 -->
     <div class="block">
-      <span class="record"
-        >共{{ reqParam.page.total }}条记录 第{{ reqParam.page.currPage }}/{{
+      <span class="record">共{{ reqParam.page.total }}条记录 第{{ reqParam.page.currPage }}/{{
           Tpage
-        }}页</span
-      >
+        }}页</span>
       <el-pagination
         class="paging"
         @size-change="handleSizeChange"
@@ -387,7 +523,7 @@ export default {
     fztm,
     fcx,
   },
-  data() {
+  data () {
     return {
       dataType: 1, // 导入类型
       barcode: "", // 条码号
@@ -464,7 +600,7 @@ export default {
     };
   },
   watch: {
-    showType(newNum, oldNum) {
+    showType (newNum, oldNum) {
       // ...
       console.log(newNum, 123);
       this.search();
@@ -522,7 +658,7 @@ export default {
       });
     },
     // 复制条码号 获取选中条码值
-    getBarcode() {
+    getBarcode () {
       let self = this;
       this.ysxtAsjxgrybh = [];
       if (this.multipleSelection.length === 0) {
@@ -540,7 +676,7 @@ export default {
       // }
     },
     // 复制成功时的回调函数
-    onCopy(e) {
+    onCopy (e) {
       this.$message({
         type: "success",
         // message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
@@ -548,11 +684,11 @@ export default {
       });
     },
     // 复制失败时的回调函数
-    onError(e) {
+    onError (e) {
       this.$message.error("抱歉，复制条码号失败！");
     },
     // 添加到队列
-    isShowTjddlBtn() {
+    isShowTjddlBtn () {
       console.log("添加到队列");
       if (this.multipleSelection.length === 0) {
         this.$message.error("请选择需要添加到队列的数据！");
@@ -562,24 +698,24 @@ export default {
         this.isShowTjddl = true;
       }
     },
-    closeTjddl(val) {
+    closeTjddl (val) {
       console.log("添加到队列关闭", val);
       this.isShowTjddl = val;
     },
     //复制条码列表操作
-    isShowFztmBtn(val) {
+    isShowFztmBtn (val) {
       console.log("复制条码", val);
       this.rowData = val;
       this.isShowFztm = true;
     },
-    closeFztm(val) {
+    closeFztm (val) {
       console.log("closeFztm复制条码关闭", val);
       this.isShowFztm = val;
       this.search();
     },
 
     //发查询操作(多行)
-    isShowFcxBtn() {
+    isShowFcxBtn () {
       if (this.multipleSelection.length === 0) {
         this.$message.error("请选择需要发查询的数据！");
         this.isSelected = true;
@@ -588,14 +724,14 @@ export default {
         this.isShowFcx = true;
       }
     },
-    isShowFcxBtn1(val) {
+    isShowFcxBtn1 (val) {
       console.log("单行人员发查询数据", val);
       let rowVal = [];
       rowVal.push(val);
       this.rowData = rowVal;
       this.isShowFcx = true;
     },
-    closeFcx(val) {
+    closeFcx (val) {
       console.log("发查询关闭", val);
       this.isShowFcx = val;
       this.search();
@@ -605,11 +741,11 @@ export default {
      * @param {*}
      * @return {*}
      */
-    batch() {
+    batch () {
       this.isSelected = !this.isSelected;
       this.toggleSelection();
     },
-    cancel() {
+    cancel () {
       alert(888);
     },
     /**
@@ -617,7 +753,7 @@ export default {
      * @param {*} row
      * @return {*}
      */
-    handleClick(row) {
+    handleClick (row) {
       console.log(row);
     },
     /**
@@ -625,7 +761,7 @@ export default {
      * @param {*} val
      * @return {*}
      */
-    handleSelectionChange(val) {
+    handleSelectionChange (val) {
       this.multipleSelection = val;
       console.log(this.multipleSelection);
       if (this.multipleSelection.length) {
@@ -639,7 +775,7 @@ export default {
      * @param {*} pageSize 每页条数
      * @return {*}
      */
-    handleSizeChange(pageSize) {
+    handleSizeChange (pageSize) {
       this.reqParam.page.pageSize = pageSize;
       console.log("每页条数", this.reqParam.page.pageSize);
     },
@@ -648,7 +784,7 @@ export default {
      * @param {*} page 当前页
      * @return {*}
      */
-    handleCurrentChange(page) {
+    handleCurrentChange (page) {
       this.reqParam.page.currPage = page;
       console.log("当前页", this.reqParam.page.currPage);
       this.search();
@@ -658,7 +794,7 @@ export default {
      * @param {*}
      * @return {*}
      */
-    toggleSelection(rows) {
+    toggleSelection (rows) {
       if (rows) {
         rows.forEach((row) => {
           this.$refs.multipleTable.toggleRowSelection(row);
@@ -675,13 +811,13 @@ export default {
      * @param {*}
      * @return {*}
      */
-    Tpage() {
+    Tpage () {
       return (
         Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1
       );
     },
   },
-  mounted() {
+  mounted () {
     this.search();
     this.showType = this.$route.query.id || "1";
   },