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

src/pages/authority/user/organizationuser.vue

@@ -206,12 +206,12 @@ export default {
       }, 1000);
     };
     var user_name_pass = (rule, value, callback) => {
-      var reg = /^[a-z0-9]+$/;
+      var reg = /^[a-zA-Z0-9|\-|_|\.]+$/;
       setTimeout(() => {
         if (reg.test(value)) {
           callback();
         } else {
-          callback(new Error("只支持小写字母、数字"));
+          callback(new Error("只支持字母、数字、-、_、."));
         }
       }, 100);
     };

src/pages/workbench/workPlace.vue

@@ -1066,17 +1066,19 @@ export default {
           text: "权限管理",
           role: 2,
           url: "/authority/organization"
-        }
-        // {
-        //   pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
-        //   text: "容器管理",
-        //   role: 2,
-        // },
-        // {
-        //   pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
-        //   text: "数据管控",
-        //   role: 2,
-        // },
+        },
+        {
+          pic: require("@/assets/imgs/home_tool_ic_shuju.png"),
+          text: "数据管控",
+          role: 2,
+          url: "/data_analysis/my_service"
+        },
+        {
+          pic: require("@/assets/imgs/home_tool_ic_message.png"),
+          text: "消息管理",
+          role: 2,
+          url: "/message/recommended"
+        },
       ]
     };
   },