Home Explore Help
Register Sign In
hx
/
expo
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

sunxin 6 years ago
parent
b8c7cf13d4 a40c4fb02e
commit
69191f13a7
6 changed files with 12 additions and 76 deletions
Unified View Show Diff Stats
  1. 0 62
      pom.xml
  2. 9 9
      src/main/webapp/WEB-INF/manager/index.ftl
  3. 1 3
      src/main/webapp/WEB-INF/manager/login.ftl
  4. 1 1
      src/main/webapp/static/ms-admin/4.7.0/css/index.css
  5. BIN
      src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg
  6. 1 1
      src/main/webapp/static/ms-admin/4.7.0/less/index.less

+ 0 - 62
pom.xml
View File 

@@ -39,11 +39,6 @@
 
 	<dependencies>
 
 	<dependencies>
 
 		<dependency>
 
 		<dependency>
 
 			<groupId>net.mingsoft</groupId>
 
 			<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>
 
 			<artifactId>ms-basic</artifactId>
 
 			<version>1.0.8.1-SNAPSHOT</version>
 
 			<version>1.0.8.1-SNAPSHOT</version>
 
 			<classifier>classes</classifier>
 
 			<classifier>classes</classifier>
 
@@ -64,63 +59,6 @@
 
 			<scope>provided</scope>
 
 			<scope>provided</scope>
 
 		</dependency>
 
 		</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>
 
 	</dependencies>
 
 	<build>
 
 	<build>
 
 		<finalName>ms-mcms</finalName>
 
 		<finalName>ms-mcms</finalName>

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

@@ -2,18 +2,15 @@
 
 <html>

 <html>

    <head>

    <head>

       <title></title>

       <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="include/head-file.ftl" -->

     <!--#include virtual="./reset-password.ftl" -->

     <!--#include virtual="./reset-password.ftl" -->

     <!--#include virtual="./exit-system.ftl" --> 

     <!--#include virtual="./exit-system.ftl" --> 

-    <!--

     <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">

     <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">

-    -->

-

    </head>

    </head>

    <body>

    <body>

       <div id="app" class="index">

       <div id="app" class="index">

@@ -57,7 +54,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'>

@@ -163,6 +160,7 @@
 
         peopleInfo:{

         peopleInfo:{

         	managerName:''//账号

         	managerName:''//账号

         },

         },

+        subMenuList:[],//

       },

       },

       watch:{

       watch:{

           menuList:function(n,o){

           menuList:function(n,o){

@@ -174,6 +172,9 @@
 
           parentMenuList:function(n,o){

           parentMenuList:function(n,o){

              this.mainParentMenuList = n.slice(0,5);

              this.mainParentMenuList = n.slice(0,5);

           },

           },

+          menuActive:function(n,o){

+              console.log('激活',n);

+          }

       },

       },

       methods: {

       methods: {

         // 菜单列表

         // 菜单列表

@@ -254,7 +255,6 @@
 
          },

          },

         //  打开修改密码，退出的模态框

         //  打开修改密码，退出的模态框

          openModal:function(){

          openModal:function(){

-             console.log('event.target',event.target.innerText);

             event.target.innerText.indexOf('修改密码')>-1

             event.target.innerText.indexOf('修改密码')>-1

             ? resetPasswordVue.isShow=true : exitSystemVue.isShow=true

             ? resetPasswordVue.isShow=true : exitSystemVue.isShow=true

          }

          }

+ 1 - 3
src/main/webapp/WEB-INF/manager/login.ftl
View File 

@@ -8,9 +8,7 @@
 
 	  

 	  

 	  

 	  

       <!--#include virtual="include/head-file.ftl"-->

       <!--#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>

    </head>

+ 1 - 1
src/main/webapp/static/ms-admin/4.7.0/css/index.css
View File 

@@ -308,7 +308,7 @@ textarea::-webkit-input-placeholder {
 
   position: absolute;
 
   position: absolute;
 
   right: -34px;
 
   right: -34px;
 
   top: 50%;
 
   top: 50%;
 
-  z-index: 9999;
 
+  z-index: 999;
 
   cursor: pointer;
 
   cursor: pointer;
 
 }
 
 }
 
 .ms-admin-menu-aside .ms-admin-menu .ms-menu-expand i {
 
 .ms-admin-menu-aside .ms-admin-menu .ms-menu-expand i {

BIN
src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg
View File


+ 1 - 1
src/main/webapp/static/ms-admin/4.7.0/less/index.less
View File 

@@ -183,7 +183,7 @@
 
             position: absolute;
 
             position: absolute;
 
             right: -34px;
 
             right: -34px;
 
             top: 50%;
 
             top: 50%;
 
-            z-index:9999;
 
+            z-index:999;
 
             cursor: pointer;
 
             cursor: pointer;
 
             // 收缩
 
             // 收缩
 
             i{
 
             i{