1018

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

@@ -156,7 +156,7 @@ export function delGuan(id) {
 }
 export function publishModel(query) {
   return request({
-    url: "/model/info/publish",
+    url: "/pt/service/publish",
     method: "get",
     params: query,
   });

ruoyi-ui/src/utils/request.js

@@ -93,7 +93,11 @@ service.interceptors.response.use(res => {
       });
     }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code === 500) {
+    } 
+    else if (code === 444) {
+      return  Promise.resolve(res.data)
+    }
+    else if (code === 500) {
       ElMessage({ message: msg, type: 'error' })
       return Promise.reject(new Error(msg))
     } else if (code === 601) {
@@ -103,9 +107,8 @@ service.interceptors.response.use(res => {
       ElNotification.error({ title: msg })
       return Promise.reject('error')
     } 
-    else if (code === 444) {
-      return  Promise.resolve(res.data)
-    } else {
+    
+    else {
       return  Promise.resolve(res.data)
     }
   },

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

@@ -64,7 +64,7 @@
             </template>
         </el-table-column>
       </el-table>
-        <el-dialog v-model="dialogVisible" title="" width="60%" @close="clearForm" destroy-on-close>
+        <el-dialog v-model="dialogVisible" title="" width="60%" @close="clearForm">
                 <div class="card-header">
                   <span style="font-size: 20px;margin-left: 1%;">基本信息</span>
                   <el-divider style="margin-top: 1%;"/>
@@ -1162,13 +1162,13 @@ async function showEdit(row){
   })
 }
 async function subEdit(){
-  if(fileList.value.length>0&&fileList1.value.length===0){
+  if(fileList.value&&fileList.value.length>0&&fileList1.value.length===0){
     await proxy.$refs["uploadRef"].submit();
   }
-  else if(fileList.value.length>0&&fileList.value.length===0){
+  else if(fileList1.value&&fileList1.value.length>0&&fileList1.value.length===0){
     await proxy.$refs["uploadRef1"].submit();
   }
-  else if(fileList.value.length>0&&fileList.value.length>0){
+  else if(fileList.value&&fileList1.value&&fileList.value.length>0&&fileList1.value.length>0){
     await proxy.$refs["uploadRef1"].submit();
     await proxy.$refs["uploadRef"].submit();
   }

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

@@ -63,7 +63,7 @@
             </template>
         </el-table-column>
       </el-table>
-        <el-dialog v-model="dialogVisible" title="" width="60%" @close="clearForm" destroy-on-close>
+        <el-dialog v-model="dialogVisible" title="" width="60%" @close="clearForm">
                 <div class="card-header">
                   <span style="font-size: 20px;margin-left: 1%;">基本信息</span>
                   <el-divider style="margin-top: 1%;"/>
@@ -640,7 +640,7 @@
                 </div>
               </div>
             </el-tab-pane>
-            <el-tab-pane label="模型状态">Role</el-tab-pane>
+            <el-tab-pane label="模型状态"></el-tab-pane>
           </el-tabs>
           <template #footer>
           <span class="dialog-footer">
@@ -1161,13 +1161,13 @@ async function showEdit(row){
   })
 }
 async function subEdit(){
-  if(fileList.value.length>0&&fileList1.value.length===0){
+  if(fileList.value&&fileList.value.length>0&&fileList1.value.length===0){
     await proxy.$refs["uploadRef"].submit();
   }
-  else if(fileList.value.length>0&&fileList.value.length===0){
+  else if(fileList1.value&&fileList1.value.length>0&&fileList1.value.length===0){
     await proxy.$refs["uploadRef1"].submit();
   }
-  else if(fileList.value.length>0&&fileList.value.length>0){
+  else if(fileList.value&&fileList1.value&&fileList.value.length>0&&fileList1.value.length>0){
     await proxy.$refs["uploadRef1"].submit();
     await proxy.$refs["uploadRef"].submit();
   }

ruoyi-ui/src/views/register/modelData/metaData.vue

@@ -9,20 +9,18 @@
     </template>
       <el-tree :expand-on-click-node="false" ref="treeRef" :filter-node-method="filterNode" :current-node-key="currentNodeKey" class="treeLeft" :data="data" @node-click="handleNodeClick" 
       node-key="id" style="margin-left:-15%;margin-top: 1%;width: 99%;background-color: transparent;" default-expand-all :key="valueKet">
-          <template #default="{ node, data }">
-            <span  style="display: flex;width: 30%;align-items: center;margin-left: 1%;line-height: 1.5;">
-              <div class="custom-tree-node" style="width: 50%;line-height: 1.5;align-items: center;">
-                  <!-- <el-tag v-if="data.nodeType=='MODEL'" class="ml-2" type="warning">模型</el-tag> -->
-                  <el-icon><Coin /></el-icon>
-                <span style="font-size: 1rem;">{{ node.label }}</span>
-                
-              </div>
-              <el-icon :size="size" color="red" style="position: absolute;left: 110%;" @click="delTree(data)">
-                  <Delete />
-                </el-icon>
-            </span>
-          </template>
-        </el-tree>
+        <template #default="{ node, data }">
+          <span  style="display: flex;width: 100%;align-items: center;margin-left: 5%;line-height: 1.5;">
+            <div class="custom-tree-node" style="width: 150%;line-height: 1.5;align-items: center;">
+              <el-icon><Coin /></el-icon>
+              <span style="font-size: 1rem;position: absolute;left: 25%;">{{ node.label }}</span>
+            </div>
+            <el-icon :size="size" color="red" style="position: absolute;left: 110%;" @click="delTree(data)">
+              <Delete/>
+            </el-icon>
+          </span>
+        </template>
+      </el-tree>
     </el-card>
     <div style="width: 80%;margin-left: 1%;background-color: white;">
         <div style="display: flex;justify-content: space-between;width: 100%;align-items: center;margin-left: 0%;padding: 1%;">
@@ -274,7 +272,7 @@ function delTree(data) {
   proxy.$modal.confirm('是否确认删除？').then(function () {
     return delDataSource(data.dsCode);
   }).then(() => {
-    getTable();
+    getTree();
     proxy.$modal.msgSuccess("删除成功");
   }).catch(() => {});
 };
@@ -513,9 +511,9 @@ onMounted(() => {
   background-color: #eaf7ff !important;
 }
  :deep(.treeLeft) .el-tree-node__content {
-  width: 150%;
+  width: 150% !important;
   display: flex !important;
-  height: 30px !important;
+  height: 28px;                  /* 按设计稿调整高度 */
   align-items: center;
   padding-top: 0 !important;
 }

ruoyi-ui/src/views/service/fabu/fabu.vue

@@ -14,53 +14,17 @@
       </div>
       <!-- <Plus style="width: 1em; height: 1em; margin-left:90%;cursor: pointer;color: #337ecc;" @click="showAddTree"/> -->
       <el-tree :expand-on-click-node="false" ref="treeRef" :filter-node-method="filterNode" :current-node-key="currentNodeKey" class="treeLeft" :data="data" @node-click="handleNodeClick" node-key="id" style="margin-left: 5%;margin-top: 5%;width: 90%;background-color: transparent;" default-expand-all :key="valueKet">
-          <template #default="{ node, data }">
-            <span  style="justify-content: space-between;display: flex;width: 100%;align-items: center;">
-              <div class="custom-tree-node">
-                   <svg-icon icon-class="model2" style="color: #eebe77;" v-if="data.nodeType=='MODEL'"/>
-                  <svg-icon icon-class="model" dstyle="color: #13E03B;" v-if="data.nodeType=='SERVICE'"/>
-                  <svg-icon svg-icon icon-class="cate" style="color: red;" v-if="data.nodeType=='TREE'"/>
-                <span>{{ node.label }}</span>
-              </div>
-              <!-- <div style="margin-right: 1%;position: absolute;margin-left: 75%;">
-                <el-dropdown trigger="hover" @click.stop v-if="currentNodeKey === data.id&&data.nodeType!=='SERVICE'">
-                    <el-icon class="el-icon--right" style="color: black;">
-                      <plus />
-                    </el-icon>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item style="display: flex;" @click="add1Level">
-                        <el-icon class="el-icon--right" style="color: black;">
-                          <CirclePlus />
-                        </el-icon>
-                        <div>
-                          添加同级
-                        </div>
-                      </el-dropdown-item>
-                      <el-dropdown-item style="display: flex;"  @click="addNextLevel">
-                        <el-icon class="el-icon--right" style="color: black;">
-                          <Connection />
-                        </el-icon>
-                        <div>
-                          新建下级
-                        </div>
-                      </el-dropdown-item>
-                      <divider/>
-                      <el-dropdown-item style="display: flex;"  @click="delAll" divided>
-                        <el-icon class="el-icon--right" style="color: black;">
-                          <CircleClose />
-                        </el-icon>
-                        <div>
-                          删除节点
-                        </div>
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </div> -->
-            </span>
-          </template>
-        </el-tree>
+        <template #default="{ node, data }">
+          <span  style="justify-content: space-between;display: flex;width: 100%;align-items: center;">
+            <div class="custom-tree-node">
+                <svg-icon icon-class="model2" style="color: #eebe77;" v-if="data.nodeType=='MODEL'"/>
+                <svg-icon icon-class="model" dstyle="color: #13E03B;" v-if="data.nodeType=='SERVICE'"/>
+                <svg-icon svg-icon icon-class="cate" style="color: red;" v-if="data.nodeType=='TREE'"/>
+              <span>{{ node.label }}</span>
+            </div>
+          </span>
+        </template>
+      </el-tree>
     </div>
     <div style="width: 84%;margin-left: 1%;padding-top: 0.5%;" class="tab-container">
       <div>
@@ -201,7 +165,7 @@
               {{userName}}
             </div>
             <div style="margin-left: 5%;">
-              当前日期：
+              当前日期： 
             </div>
             <div>
               {{date}}

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

@@ -1627,23 +1627,24 @@ watch(messages, (newMessages) => {
     item = JSON.parse(item)
     nodes.value.forEach(item1=>{
       if(item1.id===item.id){
-        console.log(1)
         if(item.nodeState&&item.nodeState==='START'){
-          console.log(2)
           item1.data.loading = true
-        }
-        if(item.nodeState&&item.nodeState==='END'){
-          console.log(2)
-          item1.data.loading = false
           item1.data.isSuccess = true
           item1.data.isFail = false
         }
         if(item.nodeState&&item.nodeState==='ERROR'){
-          console.log(2)
+          console.log(3)
           item1.data.loading = false
           item1.data.isSuccess = false
           item1.data.isFail = true
           item1.data.erMsg = item.errorMessage
+          // throw new TypeError(`期望传入一个数字，但收到的是`)
+        }
+        if(item.nodeState&&item.nodeState==='END'){
+          console.log(2)
+          item1.data.loading = false
+          // item1.data.isSuccess = true
+          // item1.data.isFail = false
         }
       }
     })