修改工作台首页样式

src/components/e-charts/dashboard.vue

@@ -35,11 +35,11 @@ export default {
             text: self.data.data + "{a|%}",
             show: !self.is_word,
             x: "center",
-            y: "center",
+            y: "30%",
             textStyle: {
               fontSize: 36,
               fontWeight: "lighter",
-              color: ["#67828c"],
+              color: self.dangerousValue == "workplace"?["#0d1847"]:["#67828c"],
               rich: {
                 a: {
                   fontSize: 14,
@@ -205,7 +205,7 @@ export default {
             barMaxWidth: 10,
             name: "C",
             roundCap: true,
-            color: "#ddd",
+            color: "#f4f4f5",
             barGap: "-100%"
           },
           {

src/components/menu.vue

@@ -22,11 +22,13 @@
         <div
           v-for="(item, index) in user_arr"
           :key="index + 700"
+          @mouseleave.stop="change_now_hover(-1)"
+          @mouseenter.stop="change_now_hover(index)"
           @click="gotopage(item.visit_url)"
         >{{ item.menu_name }}</div>
         <div @click="gotopage('logout')">退出登录</div>
       </div>
-      <div v-if="userInfo.user_name && userInfo.user_name != ''" class="sj"></div>
+      <div v-if="userInfo.user_name && userInfo.user_name != ''" class="sj" :style="now_hover==0?{backgroundColor:'#e56600'}:{}"></div>
     </div>
     <div
       v-if="show_shop_menu"
@@ -85,10 +87,12 @@
           <div
             v-for="(v, indexs) in item.Child"
             :key="indexs + 700"
+            @mouseleave.stop="change_now_hover(-1)"
+            @mouseenter.stop="change_now_hover(indexs)"
             @click.stop="gotoChildPage(v, item.visit_url)"
           >{{ v.menu_name }}</div>
         </div>
-        <div class="sj" v-if="item.Child && item.Child.length" style="left: 60px;"></div>
+        <div class="sj" v-if="item.Child && item.Child.length" :style="now_hover==0?{backgroundColor:'#e56600',left: '60px'}:{left: '60px'}"></div>
         <div class="bottom_show" v-if="now_menu == item.visit_url"></div>
       </div>
     </div>
@@ -110,6 +114,7 @@ export default {
       ],
       shopping_list: [],
       menuCartNum: 0,
+      now_hover:-1,
       show_shop_menu: false
     };
   },
@@ -131,6 +136,9 @@ export default {
     }
   },
   methods: {
+    change_now_hover(n){
+      this.now_hover = n
+    },
     gotopage(n) {
       if (n == "logout") {
         window.location.href = "/iam/api/logout";
@@ -306,7 +314,7 @@ export default {
   box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.05);
   border-radius: 8px;
   position: absolute;
-  top: 80px;
+  top: 70px;
   left: -20px;
   overflow: hidden;
   font-size: 14px;
@@ -356,9 +364,9 @@ export default {
 .sj {
   width: 16px;
   height: 16px;
-  background-color: #e56600;
+  background-color: #fff;
   position: absolute;
-  top: 72px;
+  top: 62px;
   transform: rotate(45deg);
   display: none;
 }

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-z0-9]+$/;
       setTimeout(() => {
         if (reg.test(value)) {
           callback();
         } else {
-          callback(new Error("只支持小写字母、数字、-、_、."));
+          callback(new Error("只支持小写字母、数字"));
         }
       }, 100);
     };