panhui 4 лет назад
Родитель
Сommit
ce29db2b41

+ 5 - 0
src/main/vue/src/styles/app.less

@@ -48,6 +48,11 @@ li {
     list-style-type: none;
 }
 
+.el-menu-item {
+    line-height: 66px !important;
+    height: 66px !important;
+}
+
 .el-menu-item.is-active {
     background: @menu-bg-active !important;
     // border-left: 2px solid @menu-text-color-active;

+ 11 - 2
src/main/vue/src/views/Admin.vue

@@ -41,8 +41,17 @@
                     </div>
                 </el-tooltip>
 
-                <el-dropdown @command="onCommand" style="margin-left: 20px;" trigger="click">
-                    <img :src="userInfo ? userInfo.avatar || '' : ''" class="avatar" />
+                <div class="header-btn">
+                    <i class="iconfont icon-message2" style="font-size: 18px;"></i>
+                </div>
+
+                <el-dropdown @command="onCommand" trigger="hover">
+                    <div class="header-btn">
+                        <el-avatar size="small" shape="circle" :src="userInfo ? userInfo.avatar || '' : ''" fit="fill">
+                            <img src="../assets/img_defaultphoto.svg" alt="" />
+                        </el-avatar>
+                    </div>
+
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item command="pwd" style="word-break:keep-all">修改密码 </el-dropdown-item>
                         <el-dropdown-item command="logout">退出登录 </el-dropdown-item>

+ 2 - 13
src/main/vue/src/views/Dashboard.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="dashboard">
         <grid-layout
-            style="margin:  -10px;"
+            style="margin: 0 -10px;"
             :layout="layout"
             :col-num="12"
             :row-height="30"
@@ -32,9 +32,6 @@
 
 <script>
 import { GridLayout, GridItem } from 'vue-grid-layout';
-import MenusWidget from '../widgets/MenusWidget';
-import WaitWidget from '../widgets/WaitWidget';
-import DoingWidget from '../widgets/DoingWidget';
 import LineChartWidget from '../widgets/LineChartWidget';
 import BarChartWidget from '../widgets/BarChartWidget';
 import PieChartWidget from '../widgets/PieChartWidget';
@@ -43,6 +40,7 @@ import WaitWidget from '../widgets/WaitWidget';
 import DoingWidget from '../widgets/DoingWidget';
 
 export default {
+    created() {},
     data() {
         return {
             layout: [
@@ -54,15 +52,6 @@ export default {
             editable: false
         };
     },
-    beforeRouteEnter(to, from, next) {
-        next(vm => {
-            vm.$store.commit('updateHeaderHeight', 'home');
-        });
-    },
-    beforeRouteLeave(to, from, next) {
-        this.$store.commit('updateHeaderHeight');
-        next();
-    },
     methods: {
         save() {
             console.log(JSON.stringify(this.layout));