11

ruoyi-ui/src/api/service/info.js

@@ -267,4 +267,10 @@ export function editTask(data) {
     method: 'put',
     data: data
   })
+}
+export function delTask(id) {
+  return request({
+    url: '/flow/dispatch/' + id,
+    method: 'delete'
+  })
 }

ruoyi-ui/src/views/dpp/calculateDev/index.vue

@@ -97,7 +97,7 @@
                 <template #default="scope">
                     <div style="display: flex;">
                       <el-button @click="getEdit(scope.row)" type="primary" text size="mini" style="margin-left: 0%;">编辑</el-button>
-                      <el-button @click="showLog(scope.row)" type="danger" text size="mini" style="margin-left: 0%;">删除</el-button>
+                      <el-button @click="delTaskDe(scope.row)" type="danger" text size="mini" style="margin-left: 0%;">删除</el-button>
                     </div>
                 </template>
             </el-table-column>
@@ -485,7 +485,7 @@ import {getCatalog} from "@/api/service/catalog";
 import { Plus,Search,Filter,Promotion,Check  } from '@element-plus/icons-vue'
 import { reactive } from 'vue'
 import {getModellist} from '@/api/standardization/modeling'
-import { modelTreeSelect,getSerDe,addService,addServiceParam,delService,addTree,editTask,getDataRen,getTaskDe,testLog,flowDispatch } from "@/api/service/info";
+import { modelTreeSelect,getSerDe,addService,addServiceParam,delService,addTree,editTask,getDataRen,getTaskDe,delTask,flowDispatch } from "@/api/service/info";
 import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
 import JsonViewer from 'vue-json-viewer'
 import 'vue-json-viewer/style.css' 
@@ -825,14 +825,25 @@ function addStart(){
 function delCanStart(index){
   tableDataCanStart.value.splice(index,1)
 }
-function showLog(row){
-  dialogVisibleLevel.value = true
-  var par = {
-    serId:row.srvId
-  }
-  testLog(par).then(res=>{
-    tableDataLog.value = res.rows
-  })
+function delTaskDe(row){
+  proxy.$modal.confirm('是否确认删除？').then(function () {
+    return delTask(row.flowJobId);
+  }).then(() => {
+    getDataRen({
+        appId:parMdid.value,
+        pageNum:pageNum.value,
+        pageSize:20
+      }).then(res=>{
+      if(res.rows){
+        tableData.value = res.rows
+        tableData.value.forEach(item=>{ 
+          item.type = titleTest.value
+        })
+        total.value = res.total
+      }
+    })
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
 }
 function handleShowCron() {
   expression.value = formJi.value.triggerInterval;
@@ -913,9 +924,17 @@ function filterModelNodes(nodes) {
   return result;
 }
 function clearAdd(){
-  tableDataCan.value = [
-  ]
-  dataReturn.value = ''
+  formJi.value = {
+    routeKey:4,
+    blockStrategy:1,
+    triggerType:2,
+    triggerInterval:10,
+    executorTimeout:10,
+    maxRetryTimes:3,
+    retryInterval:1,
+    jobStatus:1,
+  }
+  tableDataCanStart.value = []
 }
 function clearFromLev(){
   tableDataLog.value = []