Merge branch 'dev_wk' of http://47.108.150.237:10000/www/taais-web into dev_wk

src/views/demo/video2image/index.vue

@@ -33,7 +33,7 @@
           icon="View"
           v-auth="['demo:video2image:start']"
           @click="startVideo2image(scope.row)"
-          v-if="scope.row.status == '0' || scope.row.status == '3'"
+          v-if="scope.row.status == '0' || scope.row.status == '3' || scope.row.status == '4'"
         >
           开始
         </el-button>
@@ -54,7 +54,16 @@
         </el-button>
         <!-- <el-button type="primary" link icon="View" v-auth="['demo:video2image:query']" @click="openDialog(3, '查看', scope.row)"> 查看 </el-button> -->
         <!-- <el-button type="primary" link icon="EditPen" v-auth="['demo:video2image:edit']" @click="openDialog(2, '编辑', scope.row)"> 编辑 </el-button> -->
-        <el-button type="primary" link icon="Delete" v-auth="['demo:video2image:remove']" @click="deleteVideo2image(scope.row)"> 删除 </el-button>
+        <el-button
+          type="primary"
+          link
+          icon="Delete"
+          v-auth="['demo:video2image:remove']"
+          @click="deleteVideo2image(scope.row)"
+          :disabled="scope.row.status == '1'"
+        >
+          删除
+        </el-button>
       </template>
     </ProTable>
     <FormDialog ref="formDialogRef"></FormDialog>
@@ -95,16 +104,13 @@ const startVideo2image = async (params: any) => {
 }
 
 const stopVideo2image = async (params: any) => {
-  const res = await ElMessageBox.confirm('是否确认中止该任务？')
-  if (res) {
-    const res = await stopVideo2imageApi(params.id)
-    if (res.code === 200) {
-      ElMessage.success('终止任务成功！')
-    } else {
-      ElMessage.error('终止任务失败，请检查！')
-    }
-    proTable.value?.getTableList()
+  const res = await stopVideo2imageApi(params.id)
+  if (res.code === 200) {
+    ElMessage.success('终止任务成功！')
+  } else {
+    ElMessage.error('终止任务失败，请检查！')
   }
+  proTable.value?.getTableList()
 }
 
 const dowloadVideo2image = async (params: any) => {
@@ -182,7 +188,7 @@ const statusEnums: EnumProps[] = [
     tagType: 'primary'
   },
   {
-    label: '已结束',
+    label: '完成',
     value: '2',
     disabled: false,
     tagType: 'success'
@@ -192,6 +198,12 @@ const statusEnums: EnumProps[] = [
     value: '3',
     disabled: false,
     tagType: 'danger'
+  },
+  {
+    label: '已中断',
+    value: '4',
+    disabled: false,
+    tagType: 'default'
   }
 ]
 
@@ -216,6 +228,14 @@ const columns = reactive<ColumnProps<any>[]>([
     tag: true,
     enum: statusEnums
   },
+  {
+    prop: 'fps',
+    label: '切割帧率',
+    search: {
+      el: 'input'
+    },
+    width: 120
+  },
   {
     prop: 'outPath',
     label: '输出路径',
@@ -262,14 +282,6 @@ const columns = reactive<ColumnProps<any>[]>([
     label: '视频路径',
     width: 150
   },
-  {
-    prop: 'fps',
-    label: '切割帧率',
-    search: {
-      el: 'input'
-    },
-    width: 120
-  },
   { prop: 'operation', label: '操作', width: 170, fixed: 'right' }
 ])
 // 表单配置项