0926

ruoyi-ui/src/views/service/info/editModel.vue

@@ -108,7 +108,7 @@
               <template #default="scope">
                   <div style="display: flex;justify-content: space-between;width: 100%;">
                     <el-button @click="showDe(scope.row)" type="primary" text size="mini" style="margin-left: 0%;">查看</el-button>
-                    <el-button type="danger" text size="mini" style="margin-left: -5%;" @click="handleDelete(scope.row)">注销</el-button>
+                    <el-button type="danger" text size="mini" style="margin-left: -5%;" @click="delSer(scope.row)">注销</el-button>
                   </div>
               </template>
           </el-table-column>
@@ -1338,9 +1338,9 @@ function saveAdd1Level() {
   });
 }
 
-async function delSer() {
+async function delSer(row) {
   proxy.$modal.confirm('是否确认删除？').then(function () {
-    return delService(parId.value);
+    return delService(row.srvId);
   }).then(() => {
     getTreeLeft();
     proxy.$modal.msgSuccess("删除成功");

ruoyi-ui/src/views/standardization/modeling/index.vue

@@ -1290,19 +1290,18 @@ onNodeClick(({event, node}) => {
   nodeEnd.value = false
   nodeStart.value = false
   nodeDeSer.value = false
-  console.log(node)
   parNodeid.value = node.id
   parTitle.value = node.data.name
   tableDataCan.value = []
   optionsCan.value = []
+  tableDataCanOut.value = []
   var parNode = getPredecessorsNodes(node.id)
-  console.log((JSON.parse(JSON.stringify(parNode))))
   var a = JSON.parse(JSON.stringify(parNode))
   a.forEach((item,index) => {
     console.log(item.data)
     if(item.data.label!=='开始'&&item.data.service&&item.data.service.rpcontent){
       item.data.service.rpcontent = parseJSONWithComments(item.data.service.rpcontent)
-      // console.log((item.data.service.rpcontent))
+      console.log((item.data.service.rpcontent))
       var parShu = Object.keys((item.data.service.rpcontent))
       parShu.forEach(item1=>{
         var count = index+1
@@ -1336,7 +1335,17 @@ onNodeClick(({event, node}) => {
       serviceRqtype.value = res.data.ptService.rqtype
       servieName.value = res.data.ptService.name
       tableDataCan.value = res.data.list
-      tableDataCanOut.value = res.data.returnList
+      var par1 =  parseJSONWithComments(res.data.ptService.rpcontent)
+      var parShu = Object.keys((par1))
+      console.log(parShu)
+      parShu.forEach(item1=>{
+        var par = {
+          paramCode:item1,
+          paramValue:''
+        }
+        tableDataCanOut.value.push(par)
+      })
+      // tableDataCanOut.value = parseJSONWithComments(res.data.ptService.rpcontent)
       serviceUrl.value = res.data.ptService.url
       nodeDeSer.value = true
     })