Merge branch 'ldx' into dev

src/assets/css/index.css

@@ -198,8 +198,18 @@ div {
   font-size: 16px;
   font-weight: 700;
   color: #1d1e20;
-  border-left: 4px solid #0367f6;
   padding-left: 8px;
+  position: relative;
+}
+.el-dialog__title::before {
+  content: "";
+  position: absolute;
+  width: 4px;
+  height: 16px;
+  border-radius: 2px;
+  background-color: #515fe7;
+  left: 0;
+  top: 2px;
 }
 .el-dialog__body {
   font-size: 18px;

src/pages/authority/menu/menus.vue

@@ -143,7 +143,7 @@ export default {
       rules: {
         menu_name: [
           { required: true, message: "请填写菜单名称", trigger: "blur" },
-          { min: 0, max: 8, message: "菜单名称不超过8位", trigger: "blur" }
+          { min: 0, max: 16, message: "菜单名称不超过16位", trigger: "blur" }
         ],
         visit_url: [
           { required: true, message: "请填写菜单访问地址", trigger: "blur" },

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

@@ -48,13 +48,13 @@ export default {
         path: `/data_analysis/service_control`,
       },
     ],
-    userNav1: [],
+    userNav2: [],
     navList: [],
   }),
   watch: {
-    "$route.fullPath"(path) {
-      this.initNavList();
-    },
+    // "$route.fullPath"(path) {
+    //   this.initNavList();
+    // },
   },
   methods: {
     initNavList() {
@@ -65,6 +65,7 @@ export default {
         this.navList = this.userNav;
       } else if (this.$store.state.userInfo.is_admin == 2) {
         this.navList = this.userNav1;
+        this.$router.push({ name: "orgServiceDataAnalysis" });
       } else if (this.$store.state.userInfo.is_admin == 1) {
         this.navList = this.userNav2;
       }

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

@@ -127,8 +127,7 @@ export default {
   methods: {
     verification() {
       let self = this;
-      let data = self.$refs.workFlow.getData();
-      console.log(data);
+      let data = JSON.parse(JSON.stringify(self.$refs.workFlow.getData()));
       let start_num = 0;
       let end_num = 0;
       let start_id = "";
@@ -137,7 +136,13 @@ export default {
       let end_after = 0;
       let in_edge = 0;
       let out_edge = 0;
-      data.nodeList.forEach((item) => {
+      let datas = { ...data.obj };
+      console.log(data);
+      datas.nodeList.forEach((item) => {
+        let da = data.params.find((nodep) => {
+          return nodep.id == item.meta.id;
+        });
+        item.meta = da;
         if (item.meta.type == 0) {
           start_num++;
           start_id = item.id;
@@ -147,14 +152,14 @@ export default {
           end_id = item.id;
         }
         if (
-          data.linkList.findIndex((el) => {
+          datas.linkList.findIndex((el) => {
             return el.startId == item.id;
           }) == -1 &&
           item.id != end_id
         ) {
           in_edge++;
         } else if (
-          data.linkList.findIndex((el) => {
+          datas.linkList.findIndex((el) => {
             return el.endId == item.id;
           }) == -1 &&
           item.id != start_id
@@ -162,7 +167,7 @@ export default {
           out_edge++;
         }
       });
-      data.linkList.forEach((item) => {
+      datas.linkList.forEach((item) => {
         if (start_id == item.endId) {
           start_before++;
         }
@@ -191,6 +196,7 @@ export default {
           type: "warning",
         });
       }
+      console.log(datas);
     },
     backToList() {
       this.$router.push("/message/directed_push");
@@ -250,11 +256,11 @@ export default {
 <style>
 .block_item .el-textarea__inner {
   border-radius: 8px;
-  background-color: #e3e5ef;
+  background-color: #f7f8f9;
   border: solid 1px #e3e5ef;
 }
 .block_item .el-input__inner {
-  background-color: #e3e5ef;
+  background-color: #f7f8f9;
   border: solid 1px #e3e5ef;
 }
 .block_item .el-select {