0928

ruoyi-ui/src/views/platform/plugin/peizhi.vue

@@ -18,7 +18,7 @@
       </div>
         <div style="display: flex;align-items: center;margin-right: 3%;">
             
-            <el-button type="primary" style="margin-left:5%;" @click="reg" icon="Plus">注册</el-button>
+            <!-- <el-button type="primary" style="margin-left:5%;" @click="reg" icon="Plus">注册</el-button> -->
         </div>
     </div>
     <div style="margin-top: 0%;margin-left: 0%;width: 100%;">

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

@@ -18,7 +18,7 @@
       </div>
         <div style="display: flex;align-items: center;margin-right: 3%;">
             
-            <el-button type="primary" style="margin-left:5%;" @click="reg" icon="Plus">注册</el-button>
+            <!-- <el-button type="primary" style="margin-left:5%;" @click="reg" icon="Plus">注册</el-button> -->
         </div>
     </div>
     <div style="margin-top: 0%;margin-left: 0%;width: 100%;">

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

@@ -99,16 +99,16 @@
           </el-table-column>
           <el-table-column prop="cateCode" label="服务分类" width="140" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="audit" label="审核状态" width="140">
+          <el-table-column prop="audit" label="审核状态" width="100">
             <template #default="scope">
               <div style="text-align: center;display: flex;" v-if="scope.row.audit=='4'">
                 <el-tag class="ml-2" type="success">已审核</el-tag>
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'">
-                <el-tag class="ml-2" type="success">未审核</el-tag>
+              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'||scope.row.audit==null">
+                <el-tag class="ml-2" type="danger">未审核</el-tag>
               </div>
               <div style="text-align: center;display: flex;" v-if="scope.row.audit=='0'">
-                <el-tag class="ml-2" type="success">驳回</el-tag>
+                <el-tag class="ml-2" type="warning">驳回</el-tag>
               </div>
             </template>
           </el-table-column>
@@ -184,7 +184,7 @@
             </span>
           </template>
         </el-dialog>
-        <el-dialog @close="clearAdd" v-model="dialogVisibleTest" title="" width="40%" destroy-on-close :key="tableKey">
+        <el-dialog @close="clearAdd" v-model="dialogVisibleTest" :title="titleShen" width="40%" destroy-on-close :key="tableKey">
           <el-form size="mini" :key="tableKey" style="margin-top: 1%;width: 90%;"   label-position="right" label-width="120px" :rules="rulesLev">
             <el-form-item label="是否通过:" prop="" style="">
               <el-radio-group v-model="audit" style="margin-top: -0.5%;">
@@ -192,11 +192,18 @@
                 <el-radio value="0" size="large">不通过</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="说明:" prop="" style="">
+            <el-form-item label="*说明:" prop="" style="">
               <el-input v-model="auditRemark" style="width: 100%;" type="textarea"/>
             </el-form-item>
           </el-form>
-          
+          <div style="display: flex;font-size: 13px;align-items: center;line-height: 1.5;margin-left: 1%;margin-top: 5%;">
+            <div style="">
+              当前审核人：
+            </div>
+            <div>
+              {{userName}}
+            </div>
+          </div>
           <template #footer>
             <span class="dialog-footer">
                 <el-button size="mini" @click="dialogVisibleTest = false">取消</el-button>
@@ -206,7 +213,7 @@
             </span>
           </template>
         </el-dialog>
-        <el-dialog @close="clearFromLev" title="" v-model="dialogVisibleLevel" width="30%" destroy-on-close :key="tableKey">
+        <el-dialog @close="clearFromLev" :title="titleShen" v-model="dialogVisibleLevel" width="50%" destroy-on-close :key="tableKey">
           <el-table 
           style="margin-top: 1%;width: 98%;"
           :data="tableDataLog" 
@@ -218,6 +225,19 @@
               </el-table-column>
               <el-table-column prop="createTime" label="审核时间">
               </el-table-column>
+              <el-table-column prop="audit" label="审核状态" width="100">
+                <template #default="scope">
+                  <div style="text-align: center;display: flex;" v-if="scope.row.audit=='4'">
+                    <el-tag class="ml-2" type="success">已审核</el-tag>
+                  </div>
+                  <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'||scope.row.audit==null">
+                    <el-tag class="ml-2" type="danger">未审核</el-tag>
+                  </div>
+                  <div style="text-align: center;display: flex;" v-if="scope.row.audit=='0'">
+                    <el-tag class="ml-2" type="warning">驳回</el-tag>
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column prop="remark" label="审核备注" show-overflow-tooltip>
               </el-table-column>
           </el-table>
@@ -237,6 +257,7 @@ import { reactive } from 'vue'
 import { changeSerShenhe } from "@/api/register/regCom";
 import { modelTreeSelect,getSerDe,addService,shenheLog,editService,editParam,addServiceParam,delService,getTreeDe,addTree,deTree,getServiceInfo,testService } from "@/api/service/info";
 import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
+import { getUserProfile } from "@/api/system/user";
 import JsonViewer from 'vue-json-viewer'
 import 'vue-json-viewer/style.css' 
 import  JsonEditorVue from 'json-editor-vue3'
@@ -254,10 +275,12 @@ const detail = ref({
   rptype:''
 })
 const audit = ref()
-const auditRemark = ref()
+const titleShen = ref()
+const auditRemark = ref(null)
 const show1Lev = ref(true)
 const inputNode =ref('')
 const isEdit = ref(true)
+const userName = ref()
 const dataReturn = ref('')
 const optionsCan = ref([
   {
@@ -458,17 +481,29 @@ function showLog(row){
   })
 }
 function saveShenhe(){
+  
   parShenhe.value.audit = audit.value
-  parShenhe.value.auditRemark = auditRemark.value
-  changeSerShenhe(par).then(res=>{
-    if(res.code===200){
-      proxy.$modal.msgSuccess("已审核！");
-      handleNodeClick(parMdid.value)
-    }
-    dialogVisibleTest.value = false
-  })
+  if(audit.value==='0'&&!auditRemark.value){
+    proxy.$modal.msgWarning("未通过时请填写说明！");
+  }
+  else{
+    parShenhe.value.auditRemark = auditRemark.value
+    console.log(parShenhe.value)
+    changeSerShenhe(parShenhe.value).then(res=>{
+      if(res.code===200){
+        proxy.$modal.msgSuccess(res.msg);
+        var par1  = {
+          data:{id:parMdid.value}
+        }
+        handleNodeClick(null,par1,null)
+      }
+      dialogVisibleTest.value = false
+    })
+  }
+  
 }
 function shenhe(row){
+  titleShen.value = row.name
   dialogVisibleTest.value = true
   parShenhe.value = {
     srvIds:row.srvId,
@@ -693,7 +728,6 @@ async function handleNodeClick(node,data,event){
   console.log(parOptions.value)
   for(var i = 0; i < parOptions.value.length; i++){
     for(var i1 = 0; i1 < tableData.value.length; i1++){
-      console.log(i1);
       if(parOptions.value[i].value === tableData.value[i1].cateCode){
          tableData.value[i1].cateCode = parOptions.value[i].label
       }
@@ -734,7 +768,6 @@ async function getTreeLeft(){
     
   })
   optionsMdid.value = filterModelNodes(par)
-  console.log(optionsMdid.value)
 }
 function renameTreeProperties(tree) {
   // 深拷贝避免修改原始数据（可选，根据需求）
@@ -764,6 +797,9 @@ function renameTreeProperties(tree) {
   return newTree;
 }
 function fetchData() {
+  getUserProfile().then(response => {
+    userName.value = response.data.userName
+  });
   getCatalog().then((r) => {
     parOptions.value = r.data
     cascaderOptions.value = renameTreeProperties(buildTree(r.data))

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

@@ -104,12 +104,12 @@
           </el-table-column>
           <el-table-column prop="cateCode" label="服务分类" width="140" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="audit" label="测试状态" width="140">
+          <el-table-column prop="audit" label="测试状态" width="100">
             <template #default="scope">
               <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'">
                 <el-tag class="ml-2" type="success">已测试</el-tag>
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='2'">
+              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='2'||scope.row.audit==null">
                 <el-tag class="ml-2" type="danger">未测试</el-tag>
               </div>
             </template>
@@ -185,17 +185,18 @@
             </span>
           </template>
         </el-dialog>
-        <el-dialog @close="clearAdd" v-model="dialogVisibleTest" title="" width="60%" destroy-on-close :key="tableKey">
-          <div style="display: flex;align-items: center;width: 98%;">
+        <el-dialog @close="clearAdd" v-model="dialogVisibleTest" :title="titleTest" width="60%" destroy-on-close :key="tableKey">
+          <div style="margin-left: 1%;">
+            {{ detailJson.name }}:
+          </div>
+          <div style="display: flex;align-items: center;width: 98%;margin-top: 1%;">
             <div v-if="detailJson.rqtype==='GET'">
               <el-tag class="ml-2" type="warning">GET</el-tag>
             </div>
             <div v-if="detailJson.rqtype==='POST'">
               <el-tag class="ml-2" type="warning">POST</el-tag>
             </div>
-            <div style="margin-left: 1%;">
-              {{ detailJson.name }}:
-            </div>
+            
             <div style="margin-left: 1%;">
               {{ detailJson.url }}
             </div>
@@ -329,6 +330,7 @@ import  JsonEditorVue from 'json-editor-vue3'
 import { cloneDeep } from 'lodash'
 import { useClipboard } from "@vueuse/core";
 
+const titleTest = ref('')
 const { proxy } = getCurrentInstance();
 const JsonAdd= ref(JSON.stringify({ data: "初始值1" }))
 const exampleAdd = ref('')
@@ -739,6 +741,8 @@ async function handleNodeClick(node,data,event){
   //   }
     
   // })
+  console.log(data)
+  titleTest.value = data.data.label
   parMdid.value = data.data.id
   var par = {
     mdid:data.data.id

ruoyi-ui/src/views/service/test/index.vue

@@ -109,7 +109,7 @@
               <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'">
                 <el-tag class="ml-2" type="success">已测试</el-tag>
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='2'">
+              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='2'||scope.row.audit==null">
                 <el-tag class="ml-2" type="danger">未测试</el-tag>
               </div>
             </template>
@@ -130,7 +130,6 @@
           </el-table-column>
         </el-table>
       </div>
-      
         <el-dialog @close="clearAdd" v-model="dialogVisible" title="" width="60%" destroy-on-close :key="tableKey">
           <div style="display: flex;align-items: center;">
             <div v-if="detailJson.rqtype==='GET'">
@@ -186,17 +185,18 @@
             </span>
           </template>
         </el-dialog>
-        <el-dialog @close="clearAdd" v-model="dialogVisibleTest" title="" width="60%" destroy-on-close :key="tableKey">
-          <div style="display: flex;align-items: center;width: 98%;">
+        <el-dialog @close="clearAdd" v-model="dialogVisibleTest" :title="titleTest" width="60%" destroy-on-close :key="tableKey">
+          <div style="margin-left: 1%;">
+            {{ detailJson.name }}:
+          </div>
+          <div style="display: flex;align-items: center;width: 98%;margin-top: 1%;">
             <div v-if="detailJson.rqtype==='GET'">
               <el-tag class="ml-2" type="warning">GET</el-tag>
             </div>
             <div v-if="detailJson.rqtype==='POST'">
               <el-tag class="ml-2" type="warning">POST</el-tag>
             </div>
-            <div style="margin-left: 1%;">
-              {{ detailJson.name }}:
-            </div>
+            
             <div style="margin-left: 1%;">
               {{ detailJson.url }}
             </div>
@@ -330,6 +330,7 @@ import  JsonEditorVue from 'json-editor-vue3'
 import { cloneDeep } from 'lodash'
 import { useClipboard } from "@vueuse/core";
 
+const titleTest = ref('')
 const { proxy } = getCurrentInstance();
 const JsonAdd= ref(JSON.stringify({ data: "初始值1" }))
 const exampleAdd = ref('')
@@ -740,6 +741,8 @@ async function handleNodeClick(node,data,event){
   //   }
     
   // })
+  console.log(data)
+  titleTest.value = data.data.label
   parMdid.value = data.data.id
   var par = {
     mdid:data.data.id

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

@@ -67,16 +67,28 @@
               <el-radio value="raw">raw</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="失败处理">
-            <el-select v-model="form.errorPolicy" style="width: 50%">
-              <el-option label="报错" value="ABORT"></el-option>
-              <el-option label="忽视" value="IGNORE"></el-option>
-              <el-option label="重连" value="RETRY"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item  label="失败重连次数">
-            <el-input-number  v-model="form.retryCount" :min="1" style="width: 50%" :max="30"/>
-          </el-form-item>
+          <el-row :gutter="48">
+            <el-col :span="12">
+              <el-form-item label="失败处理:" prop="name" style="">
+                <div style="display: flex;width: 100%;justify-content: space-between;">
+                  <el-select v-model="form.errorPolicy" style="width: 100%">
+                    <el-option label="报错" value="ABORT"></el-option>
+                    <el-option label="忽视" value="IGNORE"></el-option>
+                    <el-option label="重连" value="RETRY"></el-option>
+                  </el-select>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="失败重连次数:" prop="" style="">
+                <div style="display: flex;width: 100%;justify-content: space-between;">
+                  <el-input-number  v-model="form.retryCount" :min="1" style="width: 100%" :max="30"/>
+                  <div style="display: flex;">
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item  label="输出">
             <el-table :data="tableDataCanOut" border style="width: 100%">
               <el-table-column prop="paramCode" label="参数名" width="" />