任务记录、上传历史记录、档案采集 识别类型选择添加

dangan-ui/src/views/dangan/collection/index.vue

@@ -37,7 +37,7 @@
             <el-button icon="el-icon-upload2" type="primary" @click="handleUpload">点击上传</el-button>
             <el-button icon="el-icon-upload2" type="primary" @click="handleScan">扫描上传</el-button>
           </div>
-          <el-button icon="el-icon-full-screen" type="primary" v-if="pictureRecard.length>0" @click="OCRRecognition">创建识别任务</el-button>
+          <el-button icon="el-icon-full-screen" type="primary" v-if="pictureRecard.length>0" @click="cjsbrw">创建识别任务</el-button>
         </div>
 
         <div style="margin-top: 40px;">
@@ -72,7 +72,9 @@
     </el-row>
 
     <el-dialog title="档案文件上传" :visible.sync="upload.open" width="700px" append-to-body>
-      <div style="margin-bottom: 30px;display: flex;min-height: 300px;" v-loading="upload.loading">
+
+      <div v-loading="upload.loading">
+        <div style="margin-bottom: 30px;display: flex;min-height: 300px;">
           <div style="width:250px;border: 1px solid #eee; padding: 10px;max-height: 400px;overflow-y: auto">
             <div style="margin-bottom: 5px;">档案室密集柜：</div>
             <el-tree
@@ -124,11 +126,14 @@
         <div style="text-align: center">
           <el-button style="width:300px;" type="primary" @click="submitFiles">确定上传</el-button>
         </div>
+      </div>
 
     </el-dialog>
 
     <el-dialog title="扫描文件上传" :visible.sync="smwj.open" width="1000px" append-to-body>
-      <div style="margin-bottom: 30px;display: flex;align-items:start;min-height: 300px;" v-loading="smwj.loading">
+
+      <div v-loading="smwj.loading">
+        <div style="margin-bottom: 30px;display: flex;align-items:start;min-height: 300px;">
           <div style="width:250px;border: 1px solid #eee; padding: 10px;max-height: 400px;overflow-y: auto">
             <div style="margin-bottom: 5px;">档案室密集柜：</div>
             <el-tree
@@ -199,24 +204,103 @@
         <div style="text-align: center">
           <el-button style="width:300px;" type="primary" @click="submitFiles(1)">确定上传</el-button>
         </div>
+      </div>
 
     </el-dialog>
 
-    <!--采集识别失败提示-->
+    <!--更换识别类型-->
-    <el-dialog
+    <el-dialog title="识别类型确认" :visible.sync="dAType.open" width="500px" append-to-body>
-      title="提示"
+      <div style="padding: 0 40px 40px;">
-      :visible.sync="tsVisible"
+        <el-select v-if="dangAnNode&&(dangAnNode.data.ywType==='option1'||dangAnNode.data.ywType==='option3'||dangAnNode.data.ywType==='option9'||dangAnNode.data.ywType==='option2')"
-      width="500px">
+          v-model="dAType.sbType"
-      <div style="padding: 0 30px; line-height: 30px">
+          placeholder="请选择识别类型"
-        创建识别任务提交失败，请选择【暂不处理继续采集】或【重新提交任务】或【去任务记录】查看!
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions1"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dangAnNode&&(dangAnNode.data.ywType==='option4')"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions2"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dangAnNode&&(dangAnNode.data.ywType==='option6')"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions3"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dangAnNode&&(dangAnNode.data.ywType==='option5')"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions4"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dangAnNode&&(dangAnNode.data.ywType==='option8')"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions5"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dangAnNode&&(dangAnNode.data.ywType==='option7')"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions6"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
       </div>
-      <div slot="footer" class="dialog-footer">
+      <div style="text-align: center">
-        <el-button type="primary" plain @click="onZbqljxcj">暂不处理继续采集</el-button>
+        <el-button type="primary" @click="sbTypeSubmit">确定</el-button>
-        <el-button type="primary" plain @click="qxtjTask">重新提交任务</el-button>
-        <el-button type="primary" plain @click="goTask">去任务记录</el-button>
       </div>
-    </el-dialog>
 
+    </el-dialog>
 
   </div>
 </template>
@@ -236,8 +320,39 @@ export default {
   dicts: ['total_task', 'tatal_task_pic', 'url'],
   data() {
     return {
-      tsVisible: false,
+      // 档案类型
-      taskId: null,
+      dAType: {
+        // 弹出框
+        open: false,
+        sbType: null,
+        // 常住人口登记表
+        sbTypeOptions1: [
+          { label:'常住人口登记表1', value:'option1' },
+          { label:'常住人口登记表2', value:'option3' },
+          { label:'常住人口登记表3', value:'option9' },
+          { label:'常住卡', value:'option2' },
+        ],
+        // 出生医学证明
+        sbTypeOptions2: [
+          { label:'出生医学证明', value:'option4' }
+        ],
+        // 一胎证明
+        sbTypeOptions3: [
+          { label:'一胎证明', value:'option6' }
+        ],
+        // 迁移证
+        sbTypeOptions4: [
+          { label:'迁移证', value:'option5' }
+        ],
+        // 准迁证
+        sbTypeOptions5: [
+          { label:'准迁证', value:'option8' }
+        ],
+        // 转非农业人口批复存根
+        sbTypeOptions6: [
+          { label:'转非农业人口批复存根', value:'option7' }
+        ]
+      },
       // 颜色模式，0：黑白 1：灰色 2：彩色
       pixel: 1,
       // 是否单面
@@ -265,7 +380,12 @@ export default {
       },
       // 书架树选项
       shuJiaOptions: [],
+      // 上传图片记录
       pictureRecard: [],
+      // 已识别图片
+      yPictureRecard: [],
+      // 未识别图片
+      wPictureRecard: [],
       checkLength: 0,
       // 是否全选
       checkAll: false,
@@ -621,6 +741,23 @@ export default {
       this.checkAll = checkAll
     },
     // 创建识别任务
+    cjsbrw(){
+      this.dAType.sbType = null;
+      this.dAType.open = true;
+    },
+    // 识别类型选择
+    sbTypeSubmit(){
+      if(this.dAType.sbType){
+        this.dAType.open = false;
+        this.OCRRecognition()
+      }else {
+        this.$alert(`请先选择识别类型！`, `提示`, {
+          type: 'warning'
+        });
+      }
+
+    },
+    // 提交识别任务
     async OCRRecognition(){
 
       let tatal_task_pic = this.dict.type.tatal_task_pic;
@@ -628,17 +765,27 @@ export default {
 
       this.checkLength = 0;
       let arr = [];
+      let warr = [];
       let singeOrDouble = 0
       if(!this.single){
         singeOrDouble = 1
       }
+
       this.pictureRecard.forEach(item => {
-        item.singeOrDouble = singeOrDouble
         if(item.checked){
-          arr.push(item)
+          item.singeOrDouble = singeOrDouble;
+          if(this.dAType.sbType){
+            item['sbType'] = this.dAType.sbType;
+          }
+          arr.push(item);
+        }else {
+          warr.push(item);
         }
       })
 
+      this.yPictureRecard = arr;
+      this.wPictureRecard = warr;
+
       this.checkLength = arr.length;
 
       if(arr.length === 0){
@@ -674,38 +821,15 @@ export default {
       });
 
       collectRecongnize(arr).then(response => {
-        this.pictureRecard = [];
+        this.pictureRecard = [...this.wPictureRecard];
         this.checkAll = false;
         this.$modal.msgSuccess(response.msg);
         loading.close();
       }).catch((err)=>{
         loading.close();
-        if(err.taskId){
-          this.taskId = err.taskId;
-          this.tsVisible = true;
-        }
       });
 
     },
-    // 暂不处理继续采集
-    onZbqljxcj(){
-      this.pictureRecard = [];
-      this.checkAll = false;
-      this.tsVisible = false;
-    },
-    // 重新提交任务
-    qxtjTask(){
-      reRecongnize({taskId: this.taskId}).then(response => {
-        this.pictureRecard = [];
-        this.checkAll = false;
-        this.tsVisible = false;
-        this.$modal.msgSuccess(response.msg);
-      })
-    },
-    // 去任务记录页面
-    goTask(){
-      this.$router.push("/task");
-    },
     // 删除 点击上传
     deleteFile(index){
       this.fileList.splice(index, 1);

dangan-ui/src/views/dangan/pictureRecard/index.vue

@@ -2,13 +2,19 @@
   <div class="app-container">
 
     <div style="width: 200px;margin-top: 20px;">
-      <div :class="dict.value===queryParams.ywType?'c-tabs__item is-active':'c-tabs__item'"
+      <div :class="dict.value===queryParams.ywType?'z_c-tabs__item is-active':'z_c-tabs__item'"
            v-for="dict in dict.type.yw_type" :key="dict.value" @click="handleYwType(dict.value)">
         {{ dict.label }}
       </div>
     </div>
 
     <div style="width: calc(100% - 220px);">
+
+      <el-tabs v-model="queryParams.recognize" @tab-click="handleClick">
+        <el-tab-pane label="未识别" name="0"></el-tab-pane>
+        <el-tab-pane label="已识别" name="1"></el-tab-pane>
+      </el-tabs>
+
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
         <el-form-item label="图片ID" prop="id">
           <el-input
@@ -58,21 +64,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="是否已经识别" prop="recognize">
-          <el-select
-            v-model="queryParams.recognize"
-            placeholder="是否已经识别"
-            clearable
-            style="width:100%"
-          >
-            <el-option
-              v-for="dict in dict.type.recognize"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
         <el-form-item label="是否纠错" prop="errorCorrect">
           <el-select
             v-model="queryParams.errorCorrect"
@@ -116,7 +107,7 @@
             v-hasPermi="['dangan:pictureRecard:export']"
           >导出</el-button>
         </el-col>
-        <el-col :span="1.5">
+        <el-col :span="1.5" v-if="queryParams.recognize==='1'">
           <el-button
             type="warning"
             plain
@@ -126,8 +117,8 @@
             v-hasPermi="['dangan:pictureRecard:export']"
           >导出图片</el-button>
         </el-col>
-        <el-col :span="1.5">
+        <el-col :span="1.5" v-if="queryParams.recognize==='0'">
-          <el-button icon="el-icon-full-screen" size="mini" type="primary" @click="OCRRecognition">创建识别任务</el-button>
+          <el-button icon="el-icon-full-screen" size="mini" type="primary" @click="cjsbrw">创建识别任务</el-button>
         </el-col>
       </el-row>
 
@@ -183,19 +174,99 @@
 
     </div>
 
-    <!--采集识别失败提示-->
+    <!--更换识别类型-->
-    <el-dialog
+    <el-dialog title="识别类型确认" :visible.sync="dAType.open" width="500px" append-to-body>
-      title="提示"
+      <div style="padding: 0 40px 40px;">
-      :visible.sync="tsVisible"
+
-      width="500px">
+        <el-select v-if="queryParams.ywType==='option1'||queryParams.ywType==='option3'||queryParams.ywType==='option9'||queryParams.ywType==='option2'"
-      <div style="padding: 0 30px; line-height: 30px">
+                   v-model="dAType.sbType"
-        创建识别任务提交失败，请选择【暂不处理继续采集】或【重新提交任务】或【去任务记录】查看!
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions1"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="queryParams.ywType==='option4'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions2"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="queryParams.ywType==='option6'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions3"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="queryParams.ywType==='option5'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions4"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="queryParams.ywType==='option8'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions5"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="queryParams.ywType==='option7'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions6"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
       </div>
-      <div slot="footer" class="dialog-footer">
+      <div style="text-align: center">
-        <el-button type="primary" plain @click="onZbqljxcj">暂不处理继续采集</el-button>
+        <el-button type="primary" @click="sbTypeSubmit">确定</el-button>
-        <el-button type="primary" plain @click="qxtjTask">重新提交任务</el-button>
-        <el-button type="primary" plain @click="goTask">去任务记录</el-button>
       </div>
+
     </el-dialog>
 
   </div>
@@ -211,10 +282,41 @@ export default {
   dicts: ['recognize', 'yw_type', 'error_correct', 'total_task', 'tatal_task_pic'],
   data() {
     return {
-      tsVisible: false,
-      taskId: null,
       // 遮罩层
       loading: true,
+      // 档案类型
+      dAType: {
+        // 弹出框
+        open: false,
+        sbType: null,
+        // 常住人口登记表
+        sbTypeOptions1: [
+          { label:'常住人口登记表1', value:'option1' },
+          { label:'常住人口登记表2', value:'option3' },
+          { label:'常住人口登记表3', value:'option9' },
+          { label:'常住卡', value:'option2' },
+        ],
+        // 出生医学证明
+        sbTypeOptions2: [
+          { label:'出生医学证明', value:'option4' }
+        ],
+        // 一胎证明
+        sbTypeOptions3: [
+          { label:'一胎证明', value:'option6' }
+        ],
+        // 迁移证
+        sbTypeOptions4: [
+          { label:'迁移证', value:'option5' }
+        ],
+        // 准迁证
+        sbTypeOptions5: [
+          { label:'准迁证', value:'option8' }
+        ],
+        // 转非农业人口批复存根
+        sbTypeOptions6: [
+          { label:'转非农业人口批复存根', value:'option7' }
+        ]
+      },
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -238,7 +340,7 @@ export default {
         wlsjPath: null,
         muId: null,
         muPath: null,
-        recognize: null,
+        recognize: '0',
         errorCorrect: null,
         createTime: null
       },
@@ -269,9 +371,15 @@ export default {
       this.resetForm("queryForm");
       if(this.queryParams.ywType!==ywType){
         this.queryParams.ywType=ywType;
+        this.queryParams.recognize='0'
         this.handleQuery()
       }
     },
+    handleClick(recognize){
+      this.resetForm("queryForm");
+      this.queryParams.recognize = recognize.name;
+      this.handleQuery()
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -300,6 +408,22 @@ export default {
       }).catch(() => {});
     },
     // 创建识别任务
+    cjsbrw(){
+      this.dAType.sbType = null;
+      this.dAType.open = true;
+    },
+    // 识别类型选择
+    sbTypeSubmit(){
+      if(this.dAType.sbType){
+        this.dAType.open = false;
+        this.OCRRecognition()
+      }else {
+        this.$alert(`请先选择识别类型！`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    // 创建识别任务
     async OCRRecognition(){
 
       let tatal_task_pic = this.dict.type.tatal_task_pic;
@@ -311,7 +435,10 @@ export default {
         singeOrDouble = 1
       }
       this.selectionList.forEach(item => {
-        item.singeOrDouble = singeOrDouble
+        item.singeOrDouble = singeOrDouble;
+        if(this.dAType.sbType){
+          item['sbType'] = this.dAType.sbType;
+        }
         arr.push(item);
       })
 
@@ -354,27 +481,8 @@ export default {
         this.getList();
       }).catch((err)=>{
         loading.close();
-        this.taskId = err.taskId;
-        this.tsVisible = true;
       });
     },
-    // 暂不处理继续采集
-    onZbqljxcj(){
-      this.selectionList = [];
-      this.tsVisible = false;
-    },
-    // 重新提交任务
-    qxtjTask(){
-      reRecongnize({taskId: this.taskId}).then(response => {
-        this.selectionList = [];
-        this.tsVisible = false;
-        this.$modal.msgSuccess(response.msg);
-      })
-    },
-    // 去任务记录页面
-    goTask(){
-      this.$router.push("/task");
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('dangan/pictureRecard/export', {
@@ -396,7 +504,7 @@ export default {
   display: flex;
 }
 
-.c-tabs__item {
+.z_c-tabs__item {
   cursor: pointer;
   text-align: right;
   padding: 0 10px;
@@ -410,7 +518,7 @@ export default {
   margin-right: 20px;
 }
 
-.c-tabs__item.is-active {
+.z_c-tabs__item.is-active {
   color: #1890ff;
   border-right: 5px solid #1890ff;
 }

dangan-ui/src/views/dangan/task/index.vue

@@ -63,13 +63,13 @@
             v-if="scope.row.status==='0'|| scope.row.status==='3'|| scope.row.status==='4'"
             size="mini"
             type="text"
-            @click="onReRecongnize(scope.row)"
+            @click="cjsbrw(scope.row)"
           >重新提交任务</el-button>
           <el-button
             v-if="scope.row.status==='2'&& (scope.row.failNum>0 || scope.row.failNum===null) "
             size="mini"
             type="text"
-            @click="onReRecongnize(scope.row)"
+            @click="cjsbrw(scope.row)"
           >重新识别失败图片</el-button>
           <el-button
             v-if="scope.row.status==='2' || (scope.row.status==='-1'&& (scope.row.failNum!==null)) || scope.row.status==='4'"
@@ -134,7 +134,6 @@
 
     </el-dialog>
 
-
     <!-- 查看相关图片 -->
     <el-dialog :title="xgtp.title" :visible.sync="xgtp.open" width="800px" append-to-body top="6vh">
       <div>
@@ -160,6 +159,100 @@
 
     </el-dialog>
 
+    <!--更换识别类型-->
+    <el-dialog title="识别类型确认" :visible.sync="dAType.open" width="500px" append-to-body>
+      <div style="padding: 0 40px 40px;">
+
+        <el-select v-if="dAType.selRow && (dAType.selRow.ywType==='option1'||dAType.selRow.ywType==='option3'||dAType.selRow.ywType==='option9'||dAType.selRow.ywType==='option2')"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions1"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dAType.selRow && dAType.selRow.ywType==='option4'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions2"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dAType.selRow && dAType.selRow.ywType==='option6'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions3"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dAType.selRow && dAType.selRow.ywType==='option5'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions4"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dAType.selRow && dAType.selRow.ywType==='option8'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions5"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dAType.selRow && dAType.selRow.ywType==='option7'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions6"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+      </div>
+      <div style="text-align: center">
+        <el-button type="primary" @click="sbTypeSubmit">确定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -173,6 +266,40 @@
     dicts: ['task_status', 'yw_type', 'total_task'],
     data() {
       return {
+        // 档案类型
+        dAType: {
+          // 弹出框
+          open: false,
+          sbType: null,
+          // 常住人口登记表
+          sbTypeOptions1: [
+            { label:'常住人口登记表1', value:'option1' },
+            { label:'常住人口登记表2', value:'option3' },
+            { label:'常住人口登记表3', value:'option9' },
+            { label:'常住卡', value:'option2' },
+          ],
+          // 出生医学证明
+          sbTypeOptions2: [
+            { label:'出生医学证明', value:'option4' }
+          ],
+          // 一胎证明
+          sbTypeOptions3: [
+            { label:'一胎证明', value:'option6' }
+          ],
+          // 迁移证
+          sbTypeOptions4: [
+            { label:'迁移证', value:'option5' }
+          ],
+          // 准迁证
+          sbTypeOptions5: [
+            { label:'准迁证', value:'option8' }
+          ],
+          // 转非农业人口批复存根
+          sbTypeOptions6: [
+            { label:'转非农业人口批复存根', value:'option7' }
+          ],
+          selRow: null
+        },
         // 遮罩层
         loading: true,
         // 显示搜索条件
@@ -284,7 +411,30 @@
         this.open = true;
         this.title = "任务详情";
       },
-      async onReRecongnize(row){
+      // 创建识别任务
+      cjsbrw(row){
+        this.dAType.selRow = row;
+
+        if(row.failNum===row.num){
+          this.dAType.sbType = null;
+          this.dAType.open = true;
+        }else {
+          this.onReRecongnize()
+        }
+
+      },
+      // 识别类型选择
+      sbTypeSubmit(){
+        if(this.dAType.sbType){
+          this.dAType.open = false;
+          this.onReRecongnize()
+        }else {
+          this.$alert(`请先选择识别类型！`, `提示`, {
+            type: 'warning'
+          });
+        }
+      },
+      async onReRecongnize(){
         let total_task = this.dict.type.total_task;
         let total1 = await listTask({status: '-1'}).then(response => {
           return response.total;
@@ -303,7 +453,8 @@
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         });
-        reRecongnize({taskId: row.id}).then(response => {
+
+        reRecongnize({taskId: this.dAType.selRow.id, sbType: this.dAType.sbType?this.dAType.sbType:this.dAType.selRow.ywType}).then(response => {
           loading.close();
           this.$modal.msgSuccess(response.msg);
           this.getList()