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

src/pages/index.vue

@@ -16,7 +16,8 @@ export default {
       '/intelligent_drawing',
       '/intelligent_details',
       '/intelligent_appbuilder',
-      '/search_engine'
+      '/search_engine',
+      '/technical_support'
     ]
   }),
   created(){

src/pages/technical-support/index.vue

+<template>
+  <div class="contain"></div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  components: {},
+  computed: {},
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style>
+
+</style>

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

@@ -128,6 +128,7 @@ export default {
     verification() {
       let self = this;
       let data = JSON.parse(JSON.stringify(self.$refs.workFlow.getData()));
+      console.log(JSON.stringify(data))
       let start_num = 0;
       let end_num = 0;
       let start_id = "";
@@ -143,11 +144,11 @@ export default {
           return nodep.id == item.meta.id;
         });
         item.meta = da;
-        if (item.meta.type == 0) {
+        if (item.meta.type == 1) {
           start_num++;
           start_id = item.id;
         }
-        if (item.meta.type == 1) {
+        if (item.meta.type == 2) {
           end_num++;
           end_id = item.id;
         }

src/pages/workbench/workPlace.vue

@@ -38,7 +38,7 @@
           :key="index + 100"
         >
           <img :src="item.pic" alt />
-          <div class="menu_text">
+          <div class="menu_text" :style="now_user == 1||now_user == 2?{marginRight:'30px'}:''">
             <p>{{ item.text }}</p>
             <p
               :style="{ color: item.color }"
@@ -1075,7 +1075,7 @@ export default {
         },
         {
           pic: require("@/assets/imgs/home_tool_ic_message.png"),
-          text: "消息管理",
+          text: "消息与推送管理",
           role: 2,
           url: "/message/recommended"
         },
@@ -2338,7 +2338,7 @@ export default {
 }
 
 .manage_box {
-  width: 145px;
+  width: 155px;
   height: 50px;
   line-height: 50px;
   background-color: #0d1847;

src/router/index.js

@@ -143,6 +143,12 @@ export default new Router({
             },
           ],
         }, // 工作台 - 应用管理模块
+        {
+          path: "/technical_support", // 技术支持
+          name: "technicalSupport",
+          component: () => import("@/pages/technical-support/index"),
+
+        },
         {
           path: "/shop", // 服务超市
           name: "shop",