111

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

@@ -257,4 +257,7 @@ export function getDataRen(query) {
     method: "get",
     params: query,
   });
+}
+export function getTaskDe (id) {
+  return request.get(`/flow/dispatch/${id}`);
 }

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

@@ -70,7 +70,7 @@
       @tab-click="handleClick"
     >
       <el-tab-pane label="任务详情" name="first">
-        <el-button :disabled="parMdid" @click="addTask" style="margin-top: 0%;margin-right: 1%;float:right;" type="primary" size="mini" plain>新增</el-button>
+        <el-button :disabled="!parMdid" @click="addTask" style="margin-top: 0%;margin-right: 1%;float:right;" type="primary" size="mini" plain>新增</el-button>
         <div style="width: 100%;margin-left: 0%;padding-top: 0%;" class="tab-container">
         <div>
           <el-table 
@@ -96,8 +96,8 @@
             <el-table-column prop="address" label="操作" width="150">
                 <template #default="scope">
                     <div style="display: flex;">
-                      <el-button @click="testSer(scope.row)" type="primary" text size="mini" style="margin-left: 0%;">编辑</el-button>
-                      <el-button @click="showLog(scope.row)" type="primary" text size="mini" style="margin-left: 0%;">删除</el-button>
+                      <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>
                     </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,deTree,getDataRen,testService,testLog,flowDispatch } from "@/api/service/info";
+import { modelTreeSelect,getSerDe,addService,addServiceParam,delService,addTree,deTree,getDataRen,getTaskDe,testLog,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' 
@@ -742,7 +742,7 @@ function changePage(val){
 function addRen() {
   formRefJi.value.validate((valid) => {
     if (valid) {
-      formJi.value.flowId = parMdid.value
+      formJi.value.appId = parMdid.value
       formJi.value.flowParam = {}
       if(tableDataCanStart.value.length>0){
         tableDataCanStart.value.forEach(item=>{
@@ -757,10 +757,18 @@ function addRen() {
           });
           dialogVisibleTest.value = false
           getDataRen({
-            mdid:parMdid.value,
+            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
+          }
+        })
         }else{
           proxy.$message({
             message: res.message,
@@ -804,6 +812,13 @@ function addTask(row){
     }
   })
 }
+function getEdit(row){
+  isAdd.value = false
+  dialogVisibleTest.value = true
+  getTaskDe(row.flowJobId).then(res=>{
+    formJi.value = res.data
+  })
+}
 function showDe(row){
   getSerDe(row.srvId).then(res=>{
     if(res.code===200){
@@ -859,9 +874,9 @@ function clearFromLev(){
 async function handleNodeClick(node,data,event){
   console.log(data)
   titleTest.value = data.data.label
-  parMdid.value = data.data.id
+  parMdid.value = data.data.appId
   var par = {
-    mdid:data.data.id,
+    appId:data.data.appId,
     pageNum:1,
     pageSize:20
   }
@@ -869,7 +884,7 @@ async function handleNodeClick(node,data,event){
     if(res.rows){
       tableData.value = res.rows
       tableData.value.forEach(item=>{
-        item.type = data.data.label
+        item.type = titleTest.value
       })
       total.value = res.total
     }
@@ -974,7 +989,6 @@ function getList() {
   })
 }
 onMounted(() => {
-  fetchData()
   getList()
 });