diff --git a/src/views/certificate/remoteVerification/remoteVerificationRecord/index.vue b/src/views/certificate/remoteVerification/remoteVerificationRecord/index.vue
index 7092ee7..b92efc8 100644
--- a/src/views/certificate/remoteVerification/remoteVerificationRecord/index.vue
+++ b/src/views/certificate/remoteVerification/remoteVerificationRecord/index.vue
@@ -6,8 +6,7 @@
             v-model="queryParams.name"
             placeholder="请输入姓名"
             clearable maxlength="20"
-            style="width: 300px"
-            @keyup.enter.native="handleQuery"
+            style="width: 200px" 
           />
         </el-form-item>
         <el-form-item label="证件编号" prop="certificateNo">
@@ -15,10 +14,25 @@
             v-model="queryParams.certificateNo"
             placeholder="请输入证件编号"
             clearable maxlength="20"
-            style="width: 300px"
-            @keyup.enter.native="handleQuery"
+            style="width: 200px" 
           />
+        </el-form-item> 
+        <el-form-item label="证件类型" prop="certificateType">
+          <el-select v-model="queryParams.certificateType" placeholder="证件类型" clearable style="width: 200px"> 
+            <el-option
+              v-for="dict in dict.type.sys_certificate_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
+        <el-form-item label="核验状态" prop="verifyState">
+          <el-select v-model="queryParams.verifyState" placeholder="核验状态" clearable style="width: 200px"> 
+            <el-option  label="验证中" value="0" />
+            <el-option  label="已验证" value="1" />
+          </el-select>
+        </el-form-item> 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -26,7 +40,7 @@
       </el-form>
 
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
           <el-button
             type="primary"
             plain
@@ -34,43 +48,53 @@
             size="mini"
             @click="handleAdd"
           >核验任务下达</el-button>
-        </el-col>
+        </el-col> -->
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-      <div style="width: 98%;margin: 10px;display: flex;justify-content: flex-end;">
+      <!-- <div style="width: 98%;margin: 10px;display: flex;justify-content: flex-end;">
           <span style="font-weight: bold;">一人多证任务数/已核验数：360个/250个</span>
           <span style="font-weight: bold;margin-left: 20px;">出入境时间任务数/已核验数：140个/120个</span>
           <span style="font-weight: bold;margin-left: 20px;">有无证件任务数/已核验数：760个/600个</span>
-      </div>
+      </div> -->
       <el-table v-loading="loading" :data="tableListData" @selection-change="handleSelectionChange" height="800">
-        <el-table-column type="selection" width="55" align="center" :selectable="selectablerow" />
+        <!-- <el-table-column type="selection" width="55" align="center" :selectable="selectablerow" /> -->
         <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
                 <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
         <el-table-column label="姓名" align="center" prop="name" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="身份证号" align="center" prop="idNumber" :show-overflow-tooltip="true"/>
-        <el-table-column label="申请出境时间" align="center" prop="exitTime" :show-overflow-tooltip="true"/>
-        <el-table-column label="申请入境时间" align="center" prop="entryTime" :show-overflow-tooltip="true"/>
-        <el-table-column label="核验类型" align="center" prop="checkType" :show-overflow-tooltip="true">
+        <el-table-column label="任务标题" align="center" prop="verifyTitle" :show-overflow-tooltip="true"/> 
+        <el-table-column label="证件编号" align="center" prop="certificateNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="证件类型" align="center" prop="certificateType" :show-overflow-tooltip="true"/>
+        <el-table-column label="申请出境时间" align="center" prop="exitTime" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                <span>{{scope.row.exitTime||"/"}}</span> 
+            </template>
+          </el-table-column>
+          <el-table-column label="申请入境时间" align="center" prop="entryTime" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                <span>{{scope.row.entryTime||"/"}}</span> 
+            </template>
+          </el-table-column> 
+        <el-table-column label="核验类型" align="center" prop="verifyType" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-              <span v-if="scope.row.checkType==1" >有无证件</span>
-              <span v-if="scope.row.checkType==2" >一人多证</span>
-              <span v-if="scope.row.checkType==3" >出入境时间</span>
-          </template>
-        </el-table-column>/>
-        <el-table-column label="核验状态" align="center" prop="checkState" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-              <span v-if="scope.row.checkState==0" >验证中</span>
-              <span v-if="scope.row.checkState==1" >已验证</span>
+              <span v-if="scope.row.verifyType==1">有无证件核验</span>
+              <span v-if="scope.row.verifyType==2">一人多证核验</span>
+              <span v-if="scope.row.verifyType==3">出入境时间核验</span>
           </template>
         </el-table-column>
-        <el-table-column label="核验结果" align="center" prop="checkResult" :show-overflow-tooltip="true">
+        <el-table-column label="核验状态" align="center" prop="verifyState" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <span v-if="scope.row.verifyState==0" >验证中</span>
+              <span v-if="scope.row.verifyState==1" >已验证</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="核验结果" align="center" prop="verifyResult" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-                <span v-if="scope.row.checkResult==null" >/</span>
-                <span v-if="scope.row.checkResult==0" >不通过</span>
-                <span v-if="scope.row.checkResult==1" >已通过</span>
+                <span v-if="scope.row.verifyResult==null" >/</span>
+                <span v-if="scope.row.verifyResult==0">不通过</span>
+                <span v-if="scope.row.verifyResult==1">已通过</span>
             </template>
         </el-table-column>
       </el-table>
@@ -144,16 +168,7 @@
   </template>
 
   <script>
-    import {
-        listDept,
-        getDept,
-        delDept,
-        addDept,
-        updateDept,
-        listDeptExcludeChild,
-    } from '@/api/system/dept'
-    import { getCertificateCheckListPageApi,addCertificateCheckApi, updateCertificateInfoApi,
-     deleteCertificateInfoApi,getSysUserListApi } from "@/api/certificateManage/index";
+    import { getCertificateVerifyDetailApi,addCertificateCheckApi } from "@/api/certificateManage/index";
     import base64 from 'base-64';
     import { getToken } from '@/utils/auth'
     import { downloadFileByUrl } from '@/utils/download'
@@ -238,6 +253,12 @@
             },
             /** 重置按钮操作 */
             resetQuery() {
+                this.queryParams = {
+                  pageNum: 1,
+                  pageSize: 10,
+                  name:null,//姓名
+                  certificateNo:null,//证件编号
+                }
                 this.resetForm("queryForm");
                 this.handleQuery();
             },
@@ -246,13 +267,14 @@
                 this.loading = true;
                 let param = {
                     "pageNum":this.queryParams.pageNum,
-                    "pageSize":this.queryParams.pageSize,
-                    "idNumber":this.queryParams.idNumber,
+                    "pageSize":this.queryParams.pageSize, 
                     "name":this.queryParams.name,
-                    "certificateNo":this.queryParams.certificateNo
+                    "certificateNo":this.queryParams.certificateNo,
+                    "certificateType":this.queryParams.certificateType,
+                    "verifyState":this.queryParams.verifyState
                 }
                 console.log("param",param)
-                getCertificateCheckListPageApi(param).then(response => {
+                getCertificateVerifyDetailApi(param).then(response => {
                     this.tableListData = response.rows;
                     this.total = Number(response.total);
                     this.loading = false;
diff --git a/src/views/certificate/remoteVerification/remoteVerificationTask/index.vue b/src/views/certificate/remoteVerification/remoteVerificationTask/index.vue
index 3a81a2a..f190a65 100644
--- a/src/views/certificate/remoteVerification/remoteVerificationTask/index.vue
+++ b/src/views/certificate/remoteVerification/remoteVerificationTask/index.vue
@@ -77,7 +77,7 @@
         </el-table-column>
         <el-table-column label="完成进度" align="center" prop="taskProcess" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-               
+               <el-progress :percentage="Math.ceil((scope.row.verifyCount/scope.row.verifyAllCount)*100)" :format="format"></el-progress>
           </template>
         </el-table-column>
         
@@ -184,32 +184,64 @@
         </div>
       </el-dialog>
 
-      <el-dialog title="核验任务详情" :visible.sync="openDetail" width="900px" append-to-body>
+      <el-dialog title="核验任务详情" :visible.sync="openDetail" width="80%" append-to-body>
         <el-form :model="detailParams" ref="detailForm" size="small" :inline="true" label-width="100px">
           <el-form-item label="姓名" prop="name">
             <el-input
               v-model="detailParams.name"
               placeholder="请输入姓名"
               clearable maxlength="20"
-              style="width: 240px" 
+              style="width: 200px" 
             />
-          </el-form-item>  
+          </el-form-item>
+          <el-form-item label="证件编号" prop="certificateNo">
+            <el-input
+              v-model="detailParams.certificateNo"
+              placeholder="请输入证件编号"
+              clearable maxlength="20"
+              style="width: 200px" 
+            />
+          </el-form-item> 
+          <el-form-item label="证件类型" prop="certificateType">
+            <el-select v-model="detailParams.certificateType" placeholder="证件类型" clearable style="width: 200px"> 
+              <el-option
+                v-for="dict in dict.type.sys_certificate_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="核验状态" prop="verifyState">
+            <el-select v-model="detailParams.verifyState" placeholder="核验状态" clearable style="width: 200px"> 
+              <el-option  label="验证中" value="0" />
+              <el-option  label="已验证" value="1" />
+            </el-select>
+          </el-form-item> 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
           </el-form-item>
         </el-form> 
-        <el-table v-loading="loading" :data="detailList" height="600"> 
+        <el-table v-loading="loading" :data="detailList" height="550"> 
           <el-table-column label="序号" align="center" width="80" type="index">
               <template slot-scope="scope">
                   <span>{{(detailParams.pageNum - 1) * detailParams.pageSize + scope.$index + 1}}</span>
               </template>
           </el-table-column>
           <el-table-column label="姓名" align="center" prop="name" :show-overflow-tooltip="true" width="120"/>
-          <!-- <el-table-column label="证件编号" align="center" prop="" :show-overflow-tooltip="true"/>-->
-          <el-table-column label="申请出境时间" align="center" prop="startTime" :show-overflow-tooltip="true"/>
-          <el-table-column label="申请入境时间" align="center" prop="endTime" :show-overflow-tooltip="true"/>
-          <el-table-column label="任务标题" align="center" prop="verifyTitle" :show-overflow-tooltip="true"/>
+          <el-table-column label="证件类型" align="center" prop="certificateType" :show-overflow-tooltip="true"/>
+          <el-table-column label="证件编号" align="center" prop="certificateNo" :show-overflow-tooltip="true"/>
+          <el-table-column label="申请出境时间" align="center" prop="exitTime" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                <span>{{scope.row.exitTime||"/"}}</span> 
+            </template>
+          </el-table-column>
+          <el-table-column label="申请入境时间" align="center" prop="entryTime" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                <span>{{scope.row.entryTime||"/"}}</span> 
+            </template>
+          </el-table-column> 
           <el-table-column label="核验类型" align="center" prop="verifyType" :show-overflow-tooltip="true">
             <template slot-scope="scope">
                 <span v-if="scope.row.verifyType==1">有无证件核验</span>
@@ -217,29 +249,19 @@
                 <span v-if="scope.row.verifyType==3">出入境时间核验</span>
             </template>
           </el-table-column>
-          <el-table-column label="核验状态" align="center" prop="checkState" :show-overflow-tooltip="true">
+          <el-table-column label="核验状态" align="center" prop="verifyState" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-                <span v-if="scope.row.checkState==0" >验证中</span>
-                <span v-if="scope.row.checkState==1" >已验证</span>
+                <span v-if="scope.row.verifyState==0" >验证中</span>
+                <span v-if="scope.row.verifyState==1" >已验证</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="核验结果" align="center" prop="checkResult" :show-overflow-tooltip="true">
+          <el-table-column label="核验结果" align="center" prop="verifyResult" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                  <span v-if="scope.row.checkResult==null" >/</span>
-                  <span v-if="scope.row.checkResult==0" >不通过</span>
-                  <span v-if="scope.row.checkResult==1" >已通过</span>
+                  <span v-if="scope.row.verifyResult==null" >/</span>
+                  <span v-if="scope.row.verifyResult==0">不通过</span>
+                  <span v-if="scope.row.verifyResult==1">已通过</span>
               </template>
-          </el-table-column> -->
-          <!-- <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button 
-                size="mini"
-                type="text"
-                @click="handleView(scope.row)"
-              >查看</el-button>
-            </template>
-          </el-table-column> -->
-
+          </el-table-column>
         </el-table> 
         <pagination
           v-show="total2>0"
@@ -249,8 +271,8 @@
           @pagination="getDetailList"
         /> 
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="openDetail=false">确 定</el-button>
-          <el-button @click="openDetail=false">取 消</el-button>
+          <!-- <el-button type="primary" @click="openDetail=false">确 定</el-button> -->
+          <el-button @click="openDetail=false">关 闭</el-button>
         </div>
       </el-dialog>
     </div>
@@ -321,6 +343,9 @@
                   pageNum: 1,
                   pageSize: 10,
                   name:null,
+                  certificateNo:null,
+                  certificateType:null,
+                  verifyState:null,
                 },
                 total2:0,
                 detailList:[]
@@ -357,6 +382,13 @@
             /** 重置按钮操作 */
             resetQuery() {
                 this.dateRange = []
+                this.queryParams = {
+                  pageNum: 1,
+                  pageSize: 10,
+                  keyWord:null,
+                  verifyState:null,
+                  verifyType:null,
+                }
                 this.resetForm("queryForm");
                 this.handleQuery();
             },
@@ -426,12 +458,22 @@
             },
             /** 重置按钮操作 */
             resetQuery2() { 
+                this.detailParams = {
+                  pageNum: 1,
+                  pageSize: 10,
+                  name:null,//姓名
+                  certificateNo:null,//证件编号
+                }
                 this.resetForm("detailForm");
                 this.handleQuery2();
             }, 
             getDetailList(){
               let param = {
-                bathId:this.rowData.bathId
+                bathId:this.rowData.bathId,
+                name:this.detailParams.name,
+                certificateNo:this.detailParams.certificateNo,
+                certificateType:this.detailParams.certificateType,
+                verifyState:this.detailParams.verifyState
               }
               getCertificateVerifyDetailApi(param).then(response => {
                   this.detailList = response.rows;