Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/assets/i18n/language-zh.js

@@ -22,9 +22,9 @@ export const lang = {
     cloud_resources_detail: "云资源详情",
 
     // data analysis
-    data_analysis: "数据分析中心",
-    my_service_data_analysis: "我的服务数据分析",
-    my_application_data_analysis: "我的应用数据分析",
+    data_analysis: "运营管控中心",
+    my_service_data_analysis: "服务分析",
+    my_application_data_analysis: "应用分析",
 
     // message
     message: "消息与推送管理",

src/components/work-flow/super-flow.vue

 
 <template>
-  <div>
   <div class="super-flow-demo1">
     <div class="scale_block">
       <div class="scale_control">
@@ -46,6 +45,16 @@
         </template>
       </super-flow>
     </div>
+    <div class="flow_options">
+      <p class="options_head">操作</p>
+      <div class="options_item">
+        <img :src="require('@/assets/imgs/lcsj_ic_set.png')" class="options_img" />
+        <p class="options_text">常规设置</p>
+      </div>
+      <div class="options_item">
+        <img :src="require('@/assets/imgs/lcsj_ic_chajian.png')" class="options_img" />
+        <p class="options_text">插件设置</p>
+      </div>
     </div>
   </div>
 </template>
@@ -285,6 +294,34 @@ export default {
     height: 100%;
     overflow: hidden;
   }
+  .flow_options {
+    width: 84px;
+    height: 244px;
+    background-color: #f8f9fd;
+    border-radius: 42px;
+    position: absolute;
+    top: 10px;
+    right: 0;
+    text-align: center;
+    .options_head {
+      color: #242c43;
+      font-size: 14px;
+      font-weight: bold;
+      margin-top: 30px;
+    }
+    .options_item {
+      margin-top: 20px;
+      cursor: pointer;
+      color: #242c43;
+      &:hover {
+        color: #515fe7;
+      }
+      .options_img {
+        width: 40px;
+        height: 40px;
+      }
+    }
+  }
 }
 .node-item {
   @node-item-height: 42px;

src/pages/data-analysis/data-analysis.vue

 <template>
   <div class="fwgl_container">
     <side-nav-bar
-      title="数据分析中心"
+      title="运营管控中心"
       imgSrc="tool_fuwu"
       :nav-list="navList"
       :title-path="navList[0] && navList[0].path"
@@ -17,50 +17,62 @@ import sideNavBar from "@/components/side-nav-bar";
 
 export default {
   components: {
-    sideNavBar
+    sideNavBar,
   },
   data: () => ({
     userNav: [
       {
-        name: "我的服务数据分析",
-        path: `/data_analysis/my_service`
+        name: "服务分析",
+        path: `/data_analysis/my_service`,
       },
       {
-        name: "我的应用数据分析",
-        path: `/data_analysis/my_application`
+        name: "应用分析",
+        path: `/data_analysis/my_application`,
       },
+    ],
+    userNav1: [
       {
         name: "组织服务数据分析",
-        path: `/data_analysis/org_service`
+        path: `/data_analysis/org_service`,
       },
       {
         name: "组织应用数据分析",
-        path: `/data_analysis/org_application`
+        path: `/data_analysis/org_application`,
       },
       {
         name: "运行概况-组织",
-        path: `/data_analysis/operation_overview`
+        path: `/data_analysis/operation_overview`,
       },
       {
         name: "服务管控-组织",
-        path: `/data_analysis/service_control`
-      }
+        path: `/data_analysis/service_control`,
+      },
     ],
-    navList: []
+    userNav1: [],
+    navList: [],
   }),
   watch: {
     "$route.fullPath"(path) {
       this.initNavList();
-    }
+    },
   },
   methods: {
     initNavList() {
+      if (
+        this.$store.state.userInfo.is_admin == 3 ||
+        this.$store.state.userInfo.is_admin == 4
+      ) {
         this.navList = this.userNav;
+      } else if (this.$store.state.userInfo.is_admin == 2) {
+        this.navList = this.userNav1;
+      } else if (this.$store.state.userInfo.is_admin == 1) {
+        this.navList = this.userNav2;
       }
     },
+  },
   mounted() {
     this.initNavList();
-  }
+  },
 };
 </script>
 

src/pages/workbench/component-center/process-management/process-design/index.vue

@@ -135,6 +135,8 @@ export default {
       let end_id = "";
       let start_before = 0;
       let end_after = 0;
+      let in_edge = 0;
+      let out_edge = 0;
       data.nodeList.forEach((item) => {
         if (item.meta.type == 0) {
           start_num++;
@@ -144,6 +146,21 @@ export default {
           end_num++;
           end_id = item.id;
         }
+        if (
+          data.linkList.findIndex((el) => {
+            return el.startId == item.id;
+          }) == -1 &&
+          item.id != end_id
+        ) {
+          in_edge++;
+        } else if (
+          data.linkList.findIndex((el) => {
+            return el.endId == item.id;
+          }) == -1 &&
+          item.id != start_id
+        ) {
+          out_edge++;
+        }
       });
       data.linkList.forEach((item) => {
         if (start_id == item.endId) {
@@ -168,6 +185,11 @@ export default {
           message: "结束节点后面不应连接其它节点",
           type: "warning",
         });
+      } else if (in_edge != 0 || out_edge != 0) {
+        this.$message({
+          message: "请保证每个节点都被连接",
+          type: "warning",
+        });
       }
     },
     backToList() {