Merge remote-tracking branch 'origin/master'

src/components/dashboard/commonFuncManage/function.vue

@@ -84,9 +84,8 @@ export default {
 <style lang="less" scoped>
 .function-btn {
   width: 95%;
-  height: 60px;
-  margin: 5px 10px;
-  line-height: 30px;
+  height: 40px;
+  margin: 10px 10px;
   position: relative;
   cursor: pointer;
   border: 1px solid #e5f2ff;
@@ -98,16 +97,15 @@ export default {
   flex-wrap: nowrap;
   .function-icon {
     margin-left: 10%;
-    margin-top: 10px;
     display: inline-block;
     .function-avatar {
-      width: 50px;
-      height: 50px;
-    }
-    .function-avatar-small {
       width: 30px;
       height: 30px;
     }
+    .function-avatar-small {
+      width: 20px;
+      height: 20px;
+    }
   }
   .function-title {
     width: 55%;

src/components/dashboard/iocDashboard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ioc-dashboard">
-    <a-row :gutter="[12,12]">
+    <a-row :gutter="[12, 12]">
       <a-col :span="18">
         <!--常用功能-->
         <div class="dashboard-popFunc card-style">
@@ -11,36 +11,26 @@
                 <a-icon type="right"></a-icon>
               </a-button>
             </template>
-            <a-row>
-              <a-col v-for="(item, index) in commonMenu" :span="6" :key="index" >
-                <div @click="toRoute(item.router)">
-                  <IocFunction :item="item" ></IocFunction>
-                </div>
-              </a-col>
-            </a-row>
+            <div class="common-tool-box">
+              <div v-for="(item, index) in commonMenu" :key="index">
+                <div @click="toRoute(item.router)"><IocFunction :item="item"></IocFunction></div>
+              </div>
+            </div>
           </IocCard>
         </div>
       </a-col>
       <a-col :span="6">
-        <div class="dashboard-msg card-style">
-          <DashboardMessageCard  ></DashboardMessageCard>
-        </div>
+        <div class="dashboard-msg card-style"><DashboardMessageCard></DashboardMessageCard></div>
       </a-col>
       <a-col :span="18">
-        <div class="dashboard-summary card-style">
-          <DashboardPortrait ></DashboardPortrait>
-        </div>
+        <div class="dashboard-summary card-style"><DashboardPortrait></DashboardPortrait></div>
       </a-col>
       <a-col :span="6">
-        <div class="dashboard-more card-style">
-          <DashboardMore></DashboardMore>
-        </div>
+        <div class="dashboard-more card-style"><DashboardMore></DashboardMore></div>
       </a-col>
     </a-row>
 
-
     <FunctionManage v-if="showFuncManage" :visible.sync="showFuncManage" :common-function.sync="commonMenu"></FunctionManage>
-
   </div>
 </template>
 
@@ -52,13 +42,12 @@ import DashboardPortrait from "@/components/dashboard/portrait/dashboardPortrait
 import DashboardMore from "@/components/dashboard/more/dashboardMore.vue";
 import FunctionManage from "@/components/dashboard/commonFuncManage/functionManage.vue";
 
-
 export default {
   data() {
     return {
       showFuncManage: false,
       commonMenu: []
-    }
+    };
   },
   components: {
     IocCard,
@@ -66,7 +55,7 @@ export default {
     DashboardMessageCard,
     DashboardPortrait,
     DashboardMore,
-    FunctionManage,
+    FunctionManage
   },
   mounted() {
     this.commonMenu = this.$store.menuStore().commonFunction;
@@ -76,13 +65,30 @@ export default {
       this.showFuncManage = true;
     },
     toRoute(route) {
-      this.$router.push({path: route})
-    },
+      this.$router.push({ path: route });
+    }
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
+.common-tool-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+  & > div {
+    height: 40px;
+    width: 25%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 15px 0;
+    & > div {
+      width: 80%;
+    }
+  }
+}
 .ioc-dashboard {
   width: 100%;
   height: 100%;
@@ -106,7 +112,6 @@ export default {
     background-color: white;
     height: 765px;
     overflow-y: hidden;
-
   }
 }
-</style>
+</style>

src/components/home/HomeLeft.vue

@@ -14,7 +14,6 @@
         <template slot="title">
           <div style="margin-left: 24px;"><span style="color: #FFF;cursor: default;display: inline-block;">常用功能</span></div>
         </template>
-
         <a-menu-item @click="handleClickMenuItem('/dashboard')">
           <span class="anticon" style="vertical-align: middle">
             <a-avatar :size="20" :src="requireImg('function/智能看板.png')" />
@@ -26,6 +25,7 @@
             <a-avatar :size="20" :src="requireImg('function/智享生活.png')" />
           </span>
           智享生活
+          <div>智慧餐厅</div>
         </a-menu-item>
         <a-menu-item @click="handleClickMenuItem('/work')">
           <span class="anticon" style="vertical-align: middle">
@@ -46,6 +46,18 @@
           智慧场景
         </a-menu-item>
       </a-menu-item-group>
+      <a-menu-item-group key="g2">
+        <template slot="title">
+          <div @mouseover="showNav" class="allNavBtn2">
+            <div>单点登录</div>
+            <div class="allNavBtn2-menuList">
+              <div><span>能源系统</span></div>
+              <div><span>文印管理系统</span></div>
+              <div><span>资产管理系统</span></div>
+            </div>
+          </div>
+        </template>
+      </a-menu-item-group>
     </a-menu>
 
     <div class="ioc-nav" v-if="navVisible"><NavigationPage :to-route="toRoute" /></div>
@@ -111,6 +123,36 @@ export default {
     padding-left: 24px;
     margin: 12px 0;
   }
+  .allNavBtn2 {
+    width: 100%;
+    cursor: default;
+    font-size: 16px;
+    font-weight: 400;
+    padding-bottom: 10px;
+    padding-left: 24px;
+    margin: 12px 0;
+    color: #fff;
+    &-menuList {
+      & div {
+        margin: 5px;
+        cursor: pointer;
+        &:hover {
+          & span {
+            background: rgba(178, 229, 255, 0.5);
+            color: #fff;
+          }
+        }
+        & span {
+          box-sizing: border-box;
+          padding: 2px 5px;
+          font-size: 14px;
+          background: rgba(178, 229, 255, 0.3);
+          border-radius: 5px;
+          color: #d9efff;
+        }
+      }
+    }
+  }
   //.allNavBtn:hover {
   //  background-color: @primary-color;
   //}

src/components/home/NavigationPage.vue

@@ -11,7 +11,7 @@
         <ul class="menu-content">
           <li class="menu-content-item" v-for="item in menu.children" :key="item.name" @click="toRoute(item, menu)">
             <span class="anticon" style="vertical-align: middle;margin: 1px 2px">
-              <a-avatar shape="square" :size="20" :src="requireImg('functionColor/small/' + item.icon)"
+              <a-avatar shape="square" :size="20" :src="requireImg('functionColor/small2/' + item.icon)"
             /></span>
             {{ item.name }}
           </li>
@@ -57,6 +57,7 @@ export default {
 .left-dashboard {
   width: 100%;
   height: 100%;
+  background-color: #fff;
   .menu {
     display: inline-block;
     vertical-align: top;
@@ -73,8 +74,9 @@ export default {
     .menu-content {
       list-style: none;
       font-size: 16px;
-      margin: 12px 0 0 30px;
-      padding: 0;
+      margin: 5px 0 0 20px;
+      padding: 5px;
+      background-color: #fafafa;
       .menu-content-item {
         margin-bottom: 6px;
         line-height: 30px;