panhui 4 years ago
parent
commit
2c26e2fb55

BIN
src/main/vue/public/favicon.ico


+ 18 - 0
src/main/vue/src/assets/img_defaultphoto.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>img_defaultphoto</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="01-国内申请" transform="translate(-1541.000000, -18.000000)">
+            <g id="路径" transform="translate(1541.000000, 18.000000)">
+                <path d="M0,12 C0,18.627417 5.372583,24 12,24 C18.627417,24 24,18.627417 24,12 C24,5.372583 18.627417,0 12,0 C5.372583,0 0,5.372583 0,12 Z" fill="#F2F4F5"></path>
+                <path d="M15.1515789,9.75 C17.4015789,6.69078947 16.9673684,11.7631579 14.8752632,11.9605263 C11.5792105,13.0460526 15.151579,9.75 15.1515789,9.75 Z" fill="#FBEBE8" fill-rule="nonzero"></path>
+                <path d="M9.11286939,9.73863135 C11.3628694,6.67942082 10.9286589,11.7517892 8.83655362,11.9491577 C5.54050098,13.034684 9.11286941,9.73863135 9.11286939,9.73863135 Z" fill="#FBEBE8" fill-rule="nonzero" transform="translate(9.026916, 10.464264) scale(-1, 1) translate(-9.026916, -10.464264) "></path>
+                <path d="M9.07894737,12.0592105 C9.20493328,12.9723699 9.42775452,14.6894016 7.87559821,16.344478 C6.32344189,17.9995543 12.0394737,20.0921053 12.0394737,20.0921053 C12.0394737,20.0921053 16.8562256,18.2992584 17.1325414,17.4505742 C18.8299098,16.0097847 14.2154712,17.4505742 15.2171053,12.2171053 C13.006579,10.8157895 9.07894737,12.0592105 9.07894737,12.0592105 Z" fill="#FFF0ED" fill-rule="nonzero"></path>
+                <path d="M9.32692869,12.8806632 C9.5759509,13.6533919 12.9948251,16.8740481 16.1168778,16.0845745 C14.8627627,14.8177668 15.0087027,13.3708194 15.375,11.9605263 C15.5906842,11.4868421 13.5746604,11.7935544 9.32692869,12.8806632 Z" fill="#F3E6E4" fill-rule="nonzero"></path>
+                <path d="M12,24 C16.3689474,24 20.1915789,21.6645789 22.2901579,18.1746316 C22.2898421,18.1691053 22.2898421,18.1629474 22.2893684,18.1578947 C21.6841579,17.2368947 17.5261579,15.8420526 15.8946316,15.8420526 C12.5410829,20.8736278 8.25753067,16.9509223 8.25753067,15.8420526 C6.02249057,15.7518137 3.38368423,17.3718947 1.872,18.4327895 C4.0016842,21.7784211 7.7401579,24 12,24 Z" fill="#D7AB41"></path>
+                <path d="M12.1942105,3.94736843 C13.4771053,4.18421053 15.2731579,4.30263159 15.51,6.0986842 C18.0165789,16.5592105 6.80605263,18.0197368 8.2468421,7.04605263 C8.97710527,3.15789473 12.1942105,3.94736843 12.1942105,3.94736843 Z" fill="#FFF4F4"></path>
+                <path d="M9.36789473,5.36842106 C10.0627895,5.84210527 11.4656842,7.39468423 14.8670526,6.63157894 C15.1582105,7.76321051 15.0126316,7.76321051 15.8000526,8.9605263 C16.3757368,9.15789473 18.0434211,3.49342104 13.1595789,2.7236842 C7.44221053,1.8355263 6.69094737,6.95557918 8.16,8.77136865 C8.5173158,8.39636865 8.2561579,6.25657896 9.36789473,5.36842106 Z" fill="#705A48"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 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>

+ 0 - 1
src/main/vue/src/views/Dashboard.vue

@@ -32,7 +32,6 @@
 
 <script>
 import { GridLayout, GridItem } from 'vue-grid-layout';
-import UserWidget from '../widgets/UserWidget';
 import LineChartWidget from '../widgets/LineChartWidget';
 import BarChartWidget from '../widgets/BarChartWidget';
 import PieChartWidget from '../widgets/PieChartWidget';