YaolongHan 4 年之前
父节点
当前提交
0c627764f3

+ 1 - 1
src/views/maintain/relationship/relation/components/table.vue

@@ -92,7 +92,7 @@ export default class extends Vue {
     if (row.moreMsg) {
       // 如果为打开更多按钮则合并
       if (columnIndex === 4) {
-        return [1, 5];
+        return [1, 4];
       } else if (columnIndex < 4 && columnIndex > 0) {
         return [0, 0];
       }

+ 2 - 2
src/views/maintain/relationship/relation/index.vue

@@ -360,12 +360,12 @@ export default class extends Vue {
             objList = item.objectInfo.slice(0, 9);
           }
           const objInfo = JSON.parse(JSON.stringify(objList));
-          const rowspan = (objInfo.length >= 9) ? 10 :objInfo.length
+          const rowspan = (objInfo.length >= 9) ? 10 :objInfo.length;
           objInfo.forEach((objItem: any, index: number) => {
             const newItem = JSON.parse(JSON.stringify(item));
             Object.assign(newItem, {
               objectInfo: [objItem],
-              rowspan: index == 0 ? objInfo.length : 0,
+              rowspan: index == 0 ? rowspan : 0,
               firstSpan: true, //首行是否合并
             });
             newList.push(newItem);

+ 10 - 10
vue.config.js

@@ -28,26 +28,26 @@ module.exports = {
                 }
             },
             "/datacenter": {
-                // target: "http://192.168.64.17:28890",
-                target: "http://192.168.0.72:8080",
+                target: "http://192.168.64.17:28890",
+                // target: "http://192.168.0.72:8080",
                 changeOrigin: true
             },
             "/equip-component": {
-                // target: "http://192.168.64.17:28890",
-                target: "http://192.168.0.72:8080",
+                target: "http://192.168.64.17:28890",
+                // target: "http://192.168.0.72:8080",
                 changeOrigin: true
             },
             "/schedulerapi": {
-                // target: "http://192.168.64.17:28890",
-                target: "http://192.168.0.72:8080",
+                target: "http://192.168.64.17:28890",
+                // target: "http://192.168.0.72:8080",
                 changeOrigin: true,
                 pathRewrite: {
                     "^/schedulerapi": "/scheduler"
                 }
             },
             "/modelapi": {
-                // target: "http://192.168.64.17:28890",
-                target: "http://192.168.0.72:8080",
+                target: "http://192.168.64.17:28890",
+                // target: "http://192.168.0.72:8080",
                 changeOrigin: true,
                 pathRewrite: {
                     "^/modelapi": "/revit-algorithm"
@@ -61,8 +61,8 @@ module.exports = {
             //     }
             // },
             "/message-center": {
-                // target: "http://192.168.64.17:28890",
-                target: "http://192.168.0.72:8080",
+                target: "http://192.168.64.17:28890",
+                // target: "http://192.168.0.72:8080",
                 changeOrigin: true
             },
             "/rwd": {