Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
This commit is contained in:
commit
7dc07bcffb
|
@ -1,6 +1,10 @@
|
||||||
|
server:
|
||||||
|
port: 4000
|
||||||
|
servlet.context-path: /
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:mysql://172.17.0.5:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
|
url: jdbc:mysql://172.17.0.3:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
|
||||||
username: root
|
username: root
|
||||||
password: root
|
password: root
|
||||||
filters: wall,mergeStat
|
filters: wall,mergeStat
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
<!--登录-->
|
<!--登录-->
|
||||||
<el-dropdown trigger="click" class="ms-admin-login" placement="top-start" @visible-change="loginDown = !loginDown">
|
<el-dropdown trigger="click" class="ms-admin-login" placement="top-start" @visible-change="loginDown = !loginDown">
|
||||||
<span class="el-dropdown-link" :class="{'active':loginDown}">
|
<span class="el-dropdown-link" :class="{'active':loginDown}">
|
||||||
<img src="http://cdn.mingsoft.net/global/static/ms-admin/4.7.0//msheader.png" />
|
<img src="${base}/static/ms-admin/4.7.0/images/default_handsome.jpg" />
|
||||||
<span v-text='peopleInfo.managerName'></span>
|
<span v-text='peopleInfo.managerName'></span>
|
||||||
</span>
|
</span>
|
||||||
<el-dropdown-menu class="ms-admin-login-down" slot="dropdown" @click.native='openModal'>
|
<el-dropdown-menu class="ms-admin-login-down" slot="dropdown" @click.native='openModal'>
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 3.4 KiB |
Loading…
Reference in New Issue