一堆修改

src/views/AllPersonnelBase/dclb.vue

@@ -371,7 +371,7 @@
             <span>{{scope.row.exportName}}</span>
             <span
               class='tm'
-              v-if="scope.row.declassificationName"
+              v-if="scope.row.declassificationName=='脱密'"
             >脱密</span>
           </div>
         </template>

src/views/AllPersonnelBase/modules/dcfptxAj.vue

@@ -182,13 +182,13 @@ export default {
         seqNo: [],// 指纹序号
         imageType: '',// 数据类型（原图）
         baseMsg: null, // 基本信息  1导出 0不导出
-        isFeatures: null // 导出特征  1导出 0不导出
+        featureFlag: null // 导出特征  1导出 0不导出
       }
       reqParam.barcode = barcode
       reqParam.seqNo = this.checkedTargets
       reqParam.imageType = this.sjlx
       reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
-      reqParam.isFeatures = this.tz == true ? 1 : 0
+      reqParam.featureFlag = this.tz == true ? 1 : 0
 
 
       this.$axios

src/views/AllPersonnelBase/modules/dcftpx.vue

@@ -565,7 +565,7 @@ export default {
         seqNo: '',// 指纹序号
         imageType: '',// 数据类型（原图）
         baseMsg: null, // 基本信息  1导出 0不导出
-        isFeatures: null // 导出特征  1导出 0不导出
+        featureFlag: null // 导出特征  1导出 0不导出
       }
 
       let arr = []
@@ -631,7 +631,7 @@ export default {
       reqParam.seqNo = arr
       reqParam.imageType = this.sjlx
       reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
-      reqParam.isFeatures = this.tz == true ? 1 : 0
+      reqParam.featureFlag = this.tz == true ? 1 : 0
 
       this.$axios
         .post("/api/export/person/", reqParam, {

src/views/drFPTX/Index.vue

@@ -472,7 +472,7 @@
           :percentage="UploadPercent"
         ></el-progress>
         <div style="margin-top:.9375rem; margin-bottom:.9375rem;font-size: .875rem;font-family: MicrosoftYaHei;color: #909090;">正在解析指纹文件，点击“取消”可终止处理</div>
-        <el-button @click="abort"><span style="color:#fff;font-size: 14px;">取消</span></el-button>
+        <el-button @click="abort"><span style="color:#333;font-size: 14px;">取消</span></el-button>
       </div>
       <div v-else>
         <div>
@@ -1091,7 +1091,7 @@ export default {
           // this.userInfo = this.getUserInfo(this.tableDate);
         } else {
           this.$message.error(res.data.message);
-          this.showProgress = false;
+          this.dialogVisible = false// 进度条弹窗 
         }
       });
 

src/views/zljc/Index.vue

@@ -176,6 +176,9 @@
           label="时限|超时"
           :width="width1"
         >
+          <template slot="header">
+            <span class="sx">时限</span> <span class="djsLine"></span> <span class="cs">超时</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="collectNumber"
@@ -189,10 +192,10 @@
           :width="width3"
         >
           <template slot-scope="scope">
-            <div v-if="scope.row.inspectionFlag==0">待检查</div>
-            <div v-if="scope.row.inspectionFlag==1">已检查</div>
-            <div v-if="scope.row.inspectionFlag==2">合格</div>
-            <div v-if="scope.row.inspectionFlag==3">不合格</div>
+            <div v-if="scope.row.inspectionFlag==0"> <span class="jcjgSpan  djcSpan"></span>待检查</div>
+            <div v-if="scope.row.inspectionFlag==1"> <span class='jcjgSpan yjcSpan'></span>已检查</div>
+            <div v-if="scope.row.inspectionFlag==2"> <span class='jcjgSpan  hgSpan'></span>合格</div>
+            <div v-if="scope.row.inspectionFlag==3"> <span class='jcjgSpan bhgSpan'></span>不合格</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -201,7 +204,7 @@
           width="auto"
         >
           <template slot-scope="scope">
-            <div v-if="scope.row.inspectionFlag==2"><span>/</span></div>
+            <div v-if="scope.row.inspectionFlag==2"><span class='cg'>/</span></div>
             <div
               v-else
               @click="goShenHe(scope.row)"
@@ -451,6 +454,47 @@ export default {
 // table表的高度
 $tableHeight: var(--tableHeight, 550px);
 
+.sx {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #009f6c;
+  margin-right: 10px;
+}
+.djsLine {
+  display: inline-block;
+  width: 1px;
+  height: 12px;
+  background: #cccccc;
+  border: 1px solid #979797;
+}
+.cs {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #e60012;
+  margin-left: 10px;
+}
+.cg {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #00b47a;
+}
+.jcjgSpan {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  margin-right: 6px;
+}
+.djcSpan {
+  background: #fa9500;
+}
+.hgSpan {
+  background: #00b47a;
+}
+.bhgSpan {
+  background: #fe0000;
+}
+
 .footer {
   padding: 0 24px;
   box-sizing: border-box;