1111

ruoyi-ui/src/views/register/componentReg/index.vue

@@ -512,7 +512,7 @@
           </el-tabs>
         </el-dialog>
         <el-dialog  @close="clearForm" v-model="dialogVisiblePei" width="70%" title="参数配置">
-          <el-tabs v-model="activeName" type="border-card" style="height: 45vh;">
+          <el-tabs v-model="activeName" type="border-card" style="height: 50vh;">
             <el-tab-pane label="基本信息" name="first" >
               <el-descriptions title="" :column="3" style="margin-top: 0%;margin-left: 1%;background: transparent;">
                 <el-descriptions-item label="模型名称:">{{formJi.name}}</el-descriptions-item>
@@ -645,7 +645,49 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="服务信息" style="height: 50vh;" :key="activeTabKey"> 
-              
+              <el-button @click="showDe(scope.row)" type="primary" plain size="mini" style="margin-left: 1%;">新增服务</el-button>
+              <el-table 
+                :data="tableDataSer"
+                style="width: 98%;margin-left: 1%;margin-top: 1%;height: 38vh;"
+                :cell-style="{ padding:'5px' }"
+                :header-cell-style="{height: heightAll*0.01+'px',}"
+                :row-style="{ fontSize: '16px',textAlign:'center'}"
+                border >
+                <el-table-column type="index" label="序号" width="80">
+                  <template #default="{ $index }">
+                    <div style="text-align: center;">
+                      {{ $index + 1 }}
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="name" label="服务名称"  width="200">
+                </el-table-column>
+                <el-table-column prop="type" label="接口类型"  width="200">
+                </el-table-column>
+                <el-table-column prop="url" label="接口地址"  show-overflow-tooltip/>
+                <el-table-column prop="rqtype" label="请求方式" width="200"/>
+                <el-table-column prop="rptype" label="响应类型" width="150">
+                  <template #default="scope">
+                    <div style="text-align: center;display: flex;" v-if="scope.row.rptype=='1'">
+                      JSON
+                    </div>
+                    <div style="text-align: center;display: flex;" v-if="scope.row.rptype=='2'">
+                      XML
+                    </div>
+                    <div style="text-align: center;display: flex;" v-if="scope.row.rptype=='3'">
+                      HTML
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="address" label="操作" width="150">
+                    <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="delSer(scope.row)">注销</el-button>
+                        </div>
+                    </template>
+                </el-table-column>
+              </el-table>
             </el-tab-pane>
           </el-tabs>
           <template #footer>
@@ -809,7 +851,9 @@
   </div>
 </template>
 <script   setup>
-import { getModelList,addModel,delMdid,getModelDetail,updateModel,addGroup,getParamsList,changePar,delAllPar,getModelParList,delFen,changeShenhe,delModelPar } from "@/api/register/regCom";
+import { getModelList,addModel,delMdid,getModelDetail,updateModel,
+  addGroup,getParamsList,changePar,delAllPar,getModelParList,delFen,changeShenhe,delModelPar } from "@/api/register/regCom";
+  import {getServiceInfo} from "@/api/service/info";
 import { ref, onMounted, onUnmounted, nextTick } from 'vue';
 import { Search } from '@element-plus/icons-vue'
 import {
@@ -851,6 +895,7 @@ const parRow = ref({})
 const initialHeight = 100
 const activeColor = ref(['#6CA8DB','#6CA8DB','#6CA8DB','#6CA8DB','#6CA8DB','#6CA8DB','#6CA8DB'])
 const expandedHeight = 250
+const tableDataSer = ref([])
 const formJi = ref({
   name:'',
   version:'',
@@ -1247,6 +1292,32 @@ async function showPei(row){
   var par = {
     mdid:row.mdid
   }
+  await getServiceInfo(par).then(res=>{
+      if(res.data){
+        tableDataSer.value = res.data.serviceList
+      }
+      var par = [
+      {
+        value:'1',
+        label:'JSON'
+      },
+      {
+        value:'2',
+        label:'XML'
+      },
+      {
+        value:'3',
+        label:'HTML'
+      }
+    ]
+    for(var i = 0; i < par.length; i++){
+      for(var i1 = 0; i1 < tableDataSer.value.length; i1++){
+        if(par[i].value === tableDataSer.value[i1].rptype){
+          tableDataSer.value[i1].rptype = par[i].label
+        }
+      }
+    }
+  })
   await getModelParList(par).then(res=>{
     groupTreeData.value = res.data
     groupTreeData.value.forEach((item, index, array) => { 

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

@@ -1238,8 +1238,9 @@ function deepToRaw(obj) {
 
 async function saveFlow(){
   if(tableDataCanStart.value.length>0&&tableDataCanEnd.value.length>0){
-    if(isAdd.value){
-      tableDataCanStart.value.forEach(item=>{
+    var param = []
+    var paramEnd = []
+    tableDataCanStart.value.forEach(item=>{
       var par = {
         name:item.name,
         dataType:item.dataType,
@@ -1260,7 +1261,7 @@ async function saveFlow(){
     })
     nodes.value.forEach(item=>{
       if(item.id==='1'){
-        item.data.parameters = param 
+        item.data.parameters = param
       }
       if(item.id==='2'){
         item.data.outputDefs = paramEnd 
@@ -1278,6 +1279,7 @@ async function saveFlow(){
         item.type = 'serviceNode'
       }
     })
+    if(isAdd.value){
       const count = computed(() => store.getters.id)
       var par = {
         appId: count.value,