ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

错误修改

This commit is contained in:
guwd 2020-09-07 17:00:02 +08:00
parent 622ff4504d
commit 734b8c0c01
2 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/main/webapp/WEB-INF/manager/index.ftl
View File

@ -54,17 +54,17 @@
<!--头部--> <!--头部-->
<el-header class="ms-admin-header" v-cloak> <el-header class="ms-admin-header" v-cloak>
<#--展示合并菜单--> <#--展示合并菜单-->
<div class="ms-admin-header-menu-shrink" @click="collapseMenu = !collapseMenu"><i class="iconfont" <div class="ms-admin-header-menu-shrink" @click="collapseMenu = !collapseMenu">
<i class="iconfont"
:class="collapseMenu?'icon-liebiaoxiangyou':'icon-shousuo'"></i> :class="collapseMenu?'icon-liebiaoxiangyou':'icon-shousuo'"></i>
</div> </div>
<!--头部menu--> <!--头部menu-->
<el-menu menu-trigger="hover" class="ms-admin-header-menu" background-color="rgba(255,255,255,1)" <el-menu menu-trigger="hover" class="ms-admin-header-menu" :default-active="headMenuActive"
text-color="#333333" active-text-color="#409EFF" :default-active="headMenuActive"
mode="horizontal"> mode="horizontal">
<el-submenu style="height: 100%;"> <el-submenu style="height: 100%;">
<template slot="title"> <template slot="title">
<i class="iconfont icon-gezi" style="font-size: 17px"></i> <i class="iconfont icon-gezi" style="font-size: 17px;margin-right:8PX"></i>
<span>功能大全</span> <span>功能大全</span>
</template> </template>
<div class="ms-admin-header-menu-all"> <div class="ms-admin-header-menu-all">
@ -89,8 +89,7 @@
</el-menu> </el-menu>
<!--头部右侧--> <!--头部右侧-->
<div class="ms-admin-header-right"> <div class="ms-admin-header-right">
<el-menu menu-trigger="hover" class="ms-admin-header-menu" background-color="rgba(255,255,255,1)" <el-menu menu-trigger="hover" class="ms-admin-header-menu"
text-color="#333333" active-text-color="#409EFF"
mode="horizontal"> mode="horizontal">
<el-submenu style="height: 100%;" popper-class="theme-select"> <el-submenu style="height: 100%;" popper-class="theme-select">
<template slot="title"> <template slot="title">
@ -117,18 +116,27 @@
<#-- <el-dropdown-item v-for="(item,index) in localeCommands" :command="item">{{item.text}}</el-dropdown-item>--> <#-- <el-dropdown-item v-for="(item,index) in localeCommands" :command="item">{{item.text}}</el-dropdown-item>-->
<#-- </el-dropdown-menu>--> <#-- </el-dropdown-menu>-->
<#-- </el-dropdown>--> <#-- </el-dropdown>-->
<el-dropdown trigger="hover" class="ms-admin-login" placement="top-start"
@visible-change="loginDown = !loginDown"> <el-menu menu-trigger="hover" class="ms-admin-header-menu " mode="horizontal">
<span class="el-dropdown-link"> <el-submenu>
<div class="ms-admin-people-head" <template slot="title" >
v-text="peopleInfo.managerName && peopleInfo.managerName.substr(0, 2)"></div> <span class="ms-admin-people-head"
v-text="peopleInfo.managerName && peopleInfo.managerName.substr(0, 2)"></span>
<span v-text='peopleInfo.managerName'></span> <span v-text='peopleInfo.managerName'></span>
</span> </template>
<el-dropdown-menu class="ms-admin-login-down" slot="dropdown" @click.native='openModal'> <el-menu-item @click="handleCommand('ms-theme-light')"
<el-dropdown-item icon="iconfont icon-suo">修改密码</el-dropdown-item> style="display: flex;align-items: center" @click.native='openModal'>
<el-dropdown-item icon="iconfont icon-tuichu1">退出</el-dropdown-item> <i class="el-icon-key"></i>
</el-dropdown-menu> <span slot="title">修改密码</span>
</el-dropdown>
</el-menu-item>
<el-menu-item @click="handleCommand('ms-theme-dark')"
style="display: flex;align-items: center" @click.native='openModal'>
<i class="el-icon-switch-button"></i>
<span slot="title">退出</span>
</el-menu-item>
</el-submenu>
</el-menu>
<!--mstore按钮--> <!--mstore按钮-->
<ms-store client="${client}"></ms-store> <ms-store client="${client}"></ms-store>
</div> </div>
@ -143,8 +151,8 @@
:name="item.modelTitle" :name="item.modelTitle"
:data-modelId='item.modelId' :data-modelModelId='item.modelModelId'> :data-modelId='item.modelId' :data-modelModelId='item.modelModelId'>
<keep-alive> <keep-alive>
<iframe :src='item.isStore?item.modelUrl:ms.manager+"/"+item.modelUrl+(item.modelUrl.indexOf("?")==-1?"?":"&")+"modelId="+item.modelId+"&modelCode="+item.modelCode+"&modelTitle="+encodeURI(item.modelTitle)' <!--iframe :src='item.isStore?item.modelUrl:ms.manager+"/"+item.modelUrl+(item.modelUrl.indexOf("?")==-1?"?":"&")+"modelId="+item.modelId+"&modelCode="+item.modelCode+"&modelTitle="+encodeURI(item.modelTitle)'
:ref="item.modelTitle"></iframe> :ref="item.modelTitle"></iframe-->
</keep-alive> </keep-alive>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -568,7 +576,7 @@
} }
.ms-admin-header-menu-shrink:hover { .ms-admin-header-menu-shrink:hover {
background: rgba(250, 250, 250, 1); background: rgba(250, 250, 250, 0.2);
} }
.el-menu-vertical-demo:not(.el-menu--collapse) { .el-menu-vertical-demo:not(.el-menu--collapse) {
@ -602,12 +610,30 @@
.ms-admin-header-menu .el-submenu__title { .ms-admin-header-menu .el-submenu__title {
height: 50px !important; height: 50px !important;
line-height: 50px !important; line-height: 50px !important;
display: flex;
align-items: center;
}
.ms-admin-header-menu .el-submenu__title:hover {
background-color: #F2F6FC !important;
color:#409EFF !important;
} }
.ms-admin-header-menu .el-submenu__title:hover { .ms-admin-header-menu .el-submenu__title:hover i{
background: rgba(250, 250, 250, 1) !important; color:#409EFF !important;
} }
.ms-admin-header-menu .el-submenu__icon-arrow {
margin-top: 4px !important;
}
.ms-admin-header-menu .el-menu-item:focus, .ms-admin-header-menu .el-menu-item:hover {
background-color: #F2F6FC !important;
color:#409EFF !important;
}
.ms-admin-header-menu-all { .ms-admin-header-menu-all {
width: 560px; width: 560px;
height: auto; height: auto;
@ -654,6 +680,7 @@
color: rgba(64, 158, 255, 1); color: rgba(64, 158, 255, 1);
} }
.ms-admin-login-down { .ms-admin-login-down {
top: 55px !important; top: 55px !important;
} }
@ -701,10 +728,6 @@
font-weight: normal; font-weight: normal;
} }
.theme-select .el-menu--popup {
width: 100px;
min-width: 100px;
}
.top-operate-select .el-menu--popup { .top-operate-select .el-menu--popup {
width: 162px; width: 162px;

0
src/main/webapp/static/plugins/vue-i18n/vue-i18n.js → src/main/webapp/static/plugins/vue-i18n/8.18.2/vue-i18n.js
View File