Hua 2 달 전
부모
커밋
bebeac0ed3
1개의 변경된 파일30개의 추가작업 그리고 26개의 파일을 삭제
  1. 30 26
      ruoyi-ui/src/views/standardization/modeling/index.vue

+ 30 - 26
ruoyi-ui/src/views/standardization/modeling/index.vue

@@ -1094,7 +1094,7 @@ function closeDe(){
   servieName.value = null
 }
 function saveNode(){
-  console.log(parTitle.value)
+  console.log(tableDataCan.value)
   var par = {
     title:parTitle.value, 
     parameters:[]
@@ -1131,29 +1131,32 @@ function saveNode(){
       par.parameters.push(par1)
     }
   })
-  parNodeAll.value.forEach(item=>{
-    if(item.id===parNodeid.value){
-      parNodeAll.value.tableDataCan.forEach(item1=>{
-        par.parameters.forEach(item2=>{
-          if(item1.paramCode === item2.name){
-            item1.paramValue = item2.value
-          }
-        })
-      })
-    }
-    if(item.ptService.srvId===parNodeid.value){
-      parNodeAll.value.list.forEach(item1=>{
-        par.parameters.forEach(item2=>{
-          if(item1.paramCode === item2.name){
-            item1.paramValue = item2.value
-          }
-        })
-      })
-    }
-  })
+  // if(parNodeAll.value.length>0){
+  //   parNodeAll.value.forEach(item=>{
+  //     if(item.id===parNodeid.value){
+  //       parNodeAll.value.tableDataCan.forEach(item1=>{
+  //         par.parameters.forEach(item2=>{
+  //           if(item1.paramCode === item2.name){
+  //             item1.paramValue = item2.value
+  //           }
+  //         })
+  //       })
+  //     }
+  //     if(item.ptService.srvId===parNodeid.value){
+  //       parNodeAll.value.list.forEach(item1=>{
+  //         par.parameters.forEach(item2=>{
+  //           if(item1.paramCode === item2.name){
+  //             item1.paramValue = item2.value
+  //           }
+  //         })
+  //       })
+  //     }
+  //   })
+  // }
+  console.log(nodes.value,parNodeid.value)
   nodes.value.forEach(item=>{
     if(item.id===parNodeid.value){
-      // console.log(item.id)
+      console.log(item.id)
       item.data.parameters = par.parameters
       item.data.service = serInfo.value
       if(item.data.service){
@@ -1387,10 +1390,7 @@ function deepToRaw(obj) {
   return obj;
 }
 async function startTest(){ 
-  const baseUrl = window.location.origin.toString().substring(6)
   messages.value = []
-  const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-  const host = window.location.host;
   console.log('ws:/' + import.meta.env.VITE_APP_WEBSOCKET_PATH + '/websocket/websocket/message')
   ws.value = new WebSocket('/websocket/websocket/message')
   // ws.value = new WebSocket('wss://10.91.9.204:18082/websocket/websocket/message')
@@ -1439,7 +1439,10 @@ async function startTest(){
       a.nodes.forEach(item=>{
         if(item.data.value==="存储节点"){
           item.type = 'saveNode'
-          item.data.parameters = item.data.tableDataCan
+          item.data.parameters.forEach(item1=>{
+            item1.dataType = 'object'
+          })
+          // item.data.parameters = item.data.tableDataCan
           delete item.data.tableDataCan
           delete item.data.tableDataCanOut
         }
@@ -1702,6 +1705,7 @@ onNodeClick(({event, node}) => {
     a.forEach((item,index) => {
       console.log(item.data)
       if(item.data.label!=='开始'&&item.data.service&&item.data.service.rpcontent){
+        console.log(item.data.service.rpcontent)
         item.data.service.rpcontent = parseJSONWithComments(item.data.service.rpcontent)
         var parShu = Object.keys((item.data.service.rpcontent))
         parShu.forEach(item1=>{