Skip to content
GitLab
Commit 69191f13 authored by sunxin's avatar sunxin
Browse files

Merge branch '4.7.0' of https://gitee.com/sunxinone/MCMS.git into 4.7.0

parents b8c7cf13 a40c4fb0
Hide whitespace changes
Inline Side-by-side
pom.xml
View file @ 69191f13
......@@ -37,11 +37,6 @@
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-base</artifactId>
<version>1.0.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-basic</artifactId>
......@@ -64,63 +59,6 @@
<scope>provided</scope>
</dependency>
<!-- swagger2接口文档依赖 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
</dependencies>
<build>
<finalName>ms-mcms</finalName>
......
src/main/webapp/WEB-INF/manager/index.ftl
View file @ 69191f13
......@@ -2,18 +2,15 @@
<html>
<head>
<title></title>
<#include "/include/head-file.ftl"/>
<#include "/reset-password.ftl"/>
<#include "/exit-system.ftl"/>
<link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/index.css">
<!-- <#include "/include/head-file.ftl"/>
<#include "/reset-password.ftl"/>
<#include "/exit-system.ftl"/> -->
<link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/index.css">
<!--#include virtual="include/head-file.ftl" -->
<!--#include virtual="./reset-password.ftl" -->
<!--#include virtual="./exit-system.ftl" -->
<!--
<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">
-->
</head>
<body>
<div id="app" class="index">
......@@ -57,7 +54,7 @@
<!--登录-->
<el-dropdown trigger="click" class="ms-admin-login" placement="top-start" @visible-change="loginDown = !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>
<el-dropdown-menu class="ms-admin-login-down" slot="dropdown" @click.native='openModal'>
......@@ -163,6 +160,7 @@
peopleInfo:{
managerName:''//账号
},
subMenuList:[],//
},
watch:{
menuList:function(n,o){
......@@ -174,6 +172,9 @@
parentMenuList:function(n,o){
this.mainParentMenuList = n.slice(0,5);
},
menuActive:function(n,o){
console.log('激活',n);
}
},
methods: {
// 菜单列表
......@@ -254,7 +255,6 @@
},
// 打开修改密码，退出的模态框
openModal:function(){
console.log('event.target',event.target.innerText);
event.target.innerText.indexOf('修改密码')>-1
? resetPasswordVue.isShow=true : exitSystemVue.isShow=true
}
......
src/main/webapp/WEB-INF/manager/login.ftl
View file @ 69191f13
......@@ -8,9 +8,7 @@
<!--#include virtual="include/head-file.ftl"-->
<!--
<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css">
-->
<!-- <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css"> -->
</head>
......
src/main/webapp/static/ms-admin/4.7.0/css/index.css
View file @ 69191f13
......@@ -308,7 +308,7 @@ textarea::-webkit-input-placeholder {
position: absolute;
right: -34px;
top: 50%;
z-index: 9999;
z-index: 999;
cursor: pointer;
}
.ms-admin-menu-aside .ms-admin-menu .ms-menu-expand i {
......
src/main/webapp/static/ms-admin/4.7.0/less/index.less
View file @ 69191f13
......@@ -183,7 +183,7 @@
position: absolute;
right: -34px;
top: 50%;
z-index:9999;
z-index:999;
cursor: pointer;
// 收缩
i{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment