朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 f9150254c408148051e971f2a4804a41df02a627 1 个父辈 55cb371a

Merge branch 'nmms' of 118.31.66.166:zp260/vue_cli 

# Conflicts:
#	config/index.js
#	package-lock.json
#	package.json
#	src/api/api.js
#	src/api/http.js
#	src/api/log_api.js
#	src/api/perm_api.js
#	src/api/role_api.js
#	src/api/user.js
#	src/main.js
#	src/routes.js
#	src/views/Home.vue
合并新舱单
内嵌 并排对比
正在显示 10 个修改的文件 包含 51 行增加 和 277 行删除
@@ -3242,15 +3242,9 @@ @@ -3242,15 +3242,9 @@
3242 "dev": true 3242 "dev": true
3243 }, 3243 },
3244 "element-ui": { 3244 "element-ui": {
3245 -<<<<<<< HEAD  
3246 "version": "2.13.0", 3245 "version": "2.13.0",
3247 "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz", 3246 "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
3248 "integrity": "sha512-KYsHWsBXYbLELS8cdfvgJTOMSUby3UEjvsPV1V1VmgJ/DdkOAS4z3MiOrPxrT9w2Cc5lZ4eVSQiGhYFR5NVChw==", 3247 "integrity": "sha512-KYsHWsBXYbLELS8cdfvgJTOMSUby3UEjvsPV1V1VmgJ/DdkOAS4z3MiOrPxrT9w2Cc5lZ4eVSQiGhYFR5NVChw==",
3249 -=======  
3250 - "version": "2.12.0",  
3251 - "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.12.0.tgz",  
3252 - "integrity": "sha1-qJO8Ea5Pfbt+nVQWBvI+ZD8THuQ=",  
3253 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
3254 "requires": { 3248 "requires": {
3255 "async-validator": "~1.8.1", 3249 "async-validator": "~1.8.1",
3256 "babel-helper-vue-jsx-merge-props": "^2.0.0", 3250 "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -12,11 +12,7 @@ @@ -12,11 +12,7 @@
12 "dependencies": { 12 "dependencies": {
13 "axios": "^0.19.0", 13 "axios": "^0.19.0",
14 "echarts": "^3.3.2", 14 "echarts": "^3.3.2",
15 -<<<<<<< HEAD  
16 "element-ui": "^2.13.0", 15 "element-ui": "^2.13.0",
17 -=======  
18 - "element-ui": "^2.12.0",  
19 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
20 "eslint": "^5.14.1", 16 "eslint": "^5.14.1",
21 "file-saver": "^2.0.2", 17 "file-saver": "^2.0.2",
22 "font-awesome": "^4.7.0", 18 "font-awesome": "^4.7.0",
@@ -11,7 +11,7 @@ export const getUserList = params => { return axios.get(`/cloud-user-center/user @@ -11,7 +11,7 @@ export const getUserList = params => { return axios.get(`/cloud-user-center/user
11 11
12 export const getUserListPage = params => { return axios({ 12 export const getUserListPage = params => { return axios({
13 method: 'GET', 13 method: 'GET',
14 - url: `USER-CENTER/user/list`, 14 + url: `/cloud-user-center/user/list`,
15 data: params, 15 data: params,
16 headers: { 16 headers: {
17 'Content-Type': 'application/json;charset=UTF-8' 17 'Content-Type': 'application/json;charset=UTF-8'
@@ -21,7 +21,7 @@ export const getUserListPage = params => { return axios({ @@ -21,7 +21,7 @@ export const getUserListPage = params => { return axios({
21 21
22 export const removeUser = params => { return axios({ 22 export const removeUser = params => { return axios({
23 method: 'DELETE', 23 method: 'DELETE',
24 - url: `USER-CENTER/user/del`, 24 + url: `/cloud-user-center/user/del`,
25 data: params, 25 data: params,
26 headers: { 26 headers: {
27 'Content-Type': 'application/json;charset=UTF-8' 27 'Content-Type': 'application/json;charset=UTF-8'
@@ -32,7 +32,7 @@ export const batchRemoveUser = params => { return axios.get(`USER-CENTER/user/ba @@ -32,7 +32,7 @@ export const batchRemoveUser = params => { return axios.get(`USER-CENTER/user/ba
32 32
33 export const editUser = params => { return axios({ 33 export const editUser = params => { return axios({
34 method: 'PUT', 34 method: 'PUT',
35 - url: `USER-CENTER/user/edit`, 35 + url: `/cloud-user-center/user/edit`,
36 data: params, 36 data: params,
37 headers: { 37 headers: {
38 'Content-Type': 'application/json;charset=UTF-8' 38 'Content-Type': 'application/json;charset=UTF-8'
@@ -41,7 +41,7 @@ export const editUser = params => { return axios({ @@ -41,7 +41,7 @@ export const editUser = params => { return axios({
41 41
42 export const addUser = params => { return axios({ 42 export const addUser = params => { return axios({
43 method: 'POST', 43 method: 'POST',
44 - url: `USER-CENTER/user/add`, 44 + url: `/cloud-user-center/user/add`,
45 data: params, 45 data: params,
46 headers: { 46 headers: {
47 'Content-Type': 'application/json;charset=UTF-8' 47 'Content-Type': 'application/json;charset=UTF-8'
@@ -50,7 +50,7 @@ export const addUser = params => { return axios({ @@ -50,7 +50,7 @@ export const addUser = params => { return axios({
50 50
51 export const setUserRole = params => { return axios({ 51 export const setUserRole = params => { return axios({
52 method: 'PUT', 52 method: 'PUT',
53 - url: `USER-CENTER/user/roleset`, 53 + url: `/cloud-user-center/user/roleset`,
54 data: params, 54 data: params,
55 headers: { 55 headers: {
56 'Content-Type': 'application/json;charset=UTF-8' 56 'Content-Type': 'application/json;charset=UTF-8'
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -<<<<<<< HEAD  
4 let base = '/cloud-user-center/system/log'; 3 let base = '/cloud-user-center/system/log';
5 -=======  
6 -axios.defaults.baseURL = 'http://localhost:8082/api';  
7 -let base = axios.defaults.baseURL+'USER-CENTER/system/log';  
8 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
9 4
10 5
11 export const getList = params => { return axios.get(`${base}/list`, { params: params }); }; 6 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -<<<<<<< HEAD  
4 let base = '/cloud-user-center/perm'; 3 let base = '/cloud-user-center/perm';
5 -=======  
6 -axios.defaults.baseURL = 'http://localhost:8082/api';  
7 -let base = axios.defaults.baseURL+'USER-CENTER/perm';  
8 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
9 4
10 5
11 export const getList = params => { return axios.get(`${base}/list`, { params: params }); }; 6 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -<<<<<<< HEAD  
4 let base = '/cloud-user-center/role'; 3 let base = '/cloud-user-center/role';
5 -=======  
6 -let base = 'USER-CENTER/role';  
7 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
8 4
9 5
10 export const getList = params => { return axios.get(`${base}/list`, { params: params }); }; 6 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
1 import http from './http.js' 1 import http from './http.js'
2 -<<<<<<< HEAD  
3 let baseUrl = '/cloud-user-center/user' 2 let baseUrl = '/cloud-user-center/user'
4 -=======  
5 -let baseUrl = 'user-center/user'  
6 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
7 -  
8 export const getUserList = params => { return http.get(`${baseUrl}/list`, params); }; 3 export const getUserList = params => { return http.get(`${baseUrl}/list`, params); };
9 4
10 export const getUserListPage = params => { return http.get(`/user/list`,params) }; 5 export const getUserListPage = params => { return http.get(`/user/list`,params) };
1 1
2 import Vue from 'vue' 2 import Vue from 'vue'
3 import App from './App' 3 import App from './App'
4 -<<<<<<< HEAD  
5 -=======  
6 import ElementUI from 'element-ui' 4 import ElementUI from 'element-ui'
7 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
8 import 'element-ui/lib/theme-chalk/index.css' 5 import 'element-ui/lib/theme-chalk/index.css'
9 //import './assets/theme/theme-green/index.css' 6 //import './assets/theme/theme-green/index.css'
10 import VueRouter from 'vue-router' 7 import VueRouter from 'vue-router'
@@ -15,13 +12,10 @@ import rout from './routes' @@ -15,13 +12,10 @@ import rout from './routes'
15 import Mock from './mock' 12 import Mock from './mock'
16 import i18n from './lang' 13 import i18n from './lang'
17 import 'font-awesome/css/font-awesome.min.css' 14 import 'font-awesome/css/font-awesome.min.css'
18 -<<<<<<< HEAD  
19 -import ElementUI from 'element-ui'  
20 15
21 import * as socketApi from './api/socket' 16 import * as socketApi from './api/socket'
22 -=======  
23 import '@/styles/index.scss' 17 import '@/styles/index.scss'
24 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861 18 +
25 19
26 //定义一个全局过滤器实现日期格式化 20 //定义一个全局过滤器实现日期格式化
27 Vue.filter('datefmt',function(input,fmtstring){ 21 Vue.filter('datefmt',function(input,fmtstring){
@@ -7,14 +7,13 @@ import Role from './views/nav1/role.vue' @@ -7,14 +7,13 @@ import Role from './views/nav1/role.vue'
7 import Perm from './views/nav1/perm.vue' 7 import Perm from './views/nav1/perm.vue'
8 import LOG from './views/nav1/Log.vue' 8 import LOG from './views/nav1/Log.vue'
9 import PreManifest from './views/agent/PreManifest.vue' 9 import PreManifest from './views/agent/PreManifest.vue'
10 -<<<<<<< HEAD  
11 import Company from './views/nav1/company.vue' 10 import Company from './views/nav1/company.vue'
12 import Department from './views/nav1/department.vue' 11 import Department from './views/nav1/department.vue'
13 import Group from './views/nav1/groupcompany.vue' 12 import Group from './views/nav1/groupcompany.vue'
14 import Process from './views/hqpt/Process.vue' 13 import Process from './views/hqpt/Process.vue'
15 import Job from './views/hqpt/Job.vue' 14 import Job from './views/hqpt/Job.vue'
16 // import Form from './views/nav1/Form.vue' 15 // import Form from './views/nav1/Form.vue'
17 -======= 16 +
18 import OrgManifest from './views/nmms/orgManifest.vue' 17 import OrgManifest from './views/nmms/orgManifest.vue'
19 import ExitFlight from './views/nmms/ExitFlight.vue' 18 import ExitFlight from './views/nmms/ExitFlight.vue'
20 import ExitPre from './views/nmms/ExitPre.vue' 19 import ExitPre from './views/nmms/ExitPre.vue'
@@ -26,7 +25,6 @@ import ExitFlightDesc from './views/nmms/ExitFlightDesc.vue' @@ -26,7 +25,6 @@ import ExitFlightDesc from './views/nmms/ExitFlightDesc.vue'
26 import LostLoad from './views/lostLoadChange/lostLoading.vue' 25 import LostLoad from './views/lostLoadChange/lostLoading.vue'
27 import LostLoadChange from './views/lostLoadChange/lostLoadChange.vue' 26 import LostLoadChange from './views/lostLoadChange/lostLoadChange.vue'
28 27
29 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
30 28
31 import User from './views/nav1/user.vue' 29 import User from './views/nav1/user.vue'
32 import Page4 from './views/nav2/Page4.vue' 30 import Page4 from './views/nav2/Page4.vue'
@@ -71,7 +69,6 @@ let routes = [ @@ -71,7 +69,6 @@ let routes = [
71 name: '系统设置', 69 name: '系统设置',
72 iconCls: 'el-icon-setting',//图标样式class 70 iconCls: 'el-icon-setting',//图标样式class
73 children: [ 71 children: [
74 -<<<<<<< HEAD  
75 { path: '/user', component: User, name: '用户管理' }, 72 { path: '/user', component: User, name: '用户管理' },
76 { path: '/role', component: Role, name: '岗位管理' }, 73 { path: '/role', component: Role, name: '岗位管理' },
77 { path: '/perm', component: Perm, name: '权限管理' }, 74 { path: '/perm', component: Perm, name: '权限管理' },
@@ -79,12 +76,6 @@ let routes = [ @@ -79,12 +76,6 @@ let routes = [
79 { path: '/department', component: Department, name: '部门管理' }, 76 { path: '/department', component: Department, name: '部门管理' },
80 { path: '/company', component: Company, name: '公司管理'}, 77 { path: '/company', component: Company, name: '公司管理'},
81 { path: '/group', component: Group, name: '集团管理'} 78 { path: '/group', component: Group, name: '集团管理'}
82 -=======  
83 - {path: '/user', component: User, name: '用户管理'},  
84 - {path: '/role', component: Role, name: '角色管理'},  
85 - {path: '/perm', component: Perm, name: '权限管理'},  
86 - {path: '/log', component: LOG, name: '系统日志'},  
87 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
88 ] 79 ]
89 }, 80 },
90 { 81 {
@@ -93,10 +84,8 @@ let routes = [ @@ -93,10 +84,8 @@ let routes = [
93 name: '客服系统', 84 name: '客服系统',
94 iconCls: 'fa fa-id-card-o', 85 iconCls: 'fa fa-id-card-o',
95 children: [ 86 children: [
96 -<<<<<<< HEAD  
97 { path: '/process', component: Process, name: '工单管理' }, 87 { path: '/process', component: Process, name: '工单管理' },
98 - { path: '/job', component: Job, name: '任务管理' }  
99 -======= 88 + { path: '/job', component: Job, name: '任务管理' },
100 {path: '/pre1', component: PreManifest, name: '预配'}, 89 {path: '/pre1', component: PreManifest, name: '预配'},
101 ] 90 ]
102 }, 91 },
@@ -122,8 +111,8 @@ let routes = [ @@ -122,8 +111,8 @@ let routes = [
122 iconCls:'el-icon-goods', 111 iconCls:'el-icon-goods',
123 children:[ 112 children:[
124 {path:'/lostLoad',component:LostLoad,name:'落装业务申报'}, 113 {path:'/lostLoad',component:LostLoad,name:'落装业务申报'},
125 - // {path:'/lostLoadChange',component:LostLoadChange,name:'改配业务申报'}  
126 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861 114 + {path:'/lostLoadChange',component:LostLoadChange,name:'改配业务申报'}
  115 +
127 ] 116 ]
128 }, 117 },
129 { 118 {
@@ -132,12 +121,7 @@ let routes = [ @@ -132,12 +121,7 @@ let routes = [
132 name: '能源管理', 121 name: '能源管理',
133 iconCls: 'fa fa-id-card-o', 122 iconCls: 'fa fa-id-card-o',
134 children: [ 123 children: [
135 -<<<<<<< HEAD  
136 { path: '/location', component: Location, name: '能源缴费' }, 124 { path: '/location', component: Location, name: '能源缴费' },
137 -=======  
138 - {path: '/page4', component: Page4, name: '页面4'},  
139 - {path: '/page5', component: Page5, name: '页面5'}  
140 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
141 ] 125 ]
142 }, 126 },
143 { 127 {
@@ -160,16 +144,11 @@ let routes = [ @@ -160,16 +144,11 @@ let routes = [
160 iconCls: 'fa fa-address-card', 144 iconCls: 'fa fa-address-card',
161 // leaf: true,//只有一个节点 145 // leaf: true,//只有一个节点
162 children: [ 146 children: [
163 -<<<<<<< HEAD  
164 -  
165 { path: '/water_stations_patrol', component: WaterStationsPatrol, name: '二水厂-水站巡视记录单管理' }, 147 { path: '/water_stations_patrol', component: WaterStationsPatrol, name: '二水厂-水站巡视记录单管理' },
166 // { path: '/page6', component: Page6, name: '水质量检测' }, 148 // { path: '/page6', component: Page6, name: '水质量检测' },
167 // { path: '/page6', component: Page6, name: '污水站' }, 149 // { path: '/page6', component: Page6, name: '污水站' },
168 // { path: '/page6', component: Page6, name: '一水厂' }, 150 // { path: '/page6', component: Page6, name: '一水厂' },
169 // { path: '/page6', component: Page6, name: '综合楼空调站' }, 151 // { path: '/page6', component: Page6, name: '综合楼空调站' },
170 -=======  
171 - {path: '/page6', component: Page6, name: '导航三'}  
172 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
173 ] 152 ]
174 }, 153 },
175 { 154 {
1 <template> 1 <template>
2 -<<<<<<< HEAD  
3 <el-row class="container"> 2 <el-row class="container">
4 <el-col :span="24" class="header"> 3 <el-col :span="24" class="header">
5 <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'"> 4 <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'">
@@ -24,7 +23,7 @@ @@ -24,7 +23,7 @@
24 <el-col :span="24" class="main"> 23 <el-col :span="24" class="main">
25 <aside :class="collapsed?'menu-collapsed':'menu-expanded'"> 24 <aside :class="collapsed?'menu-collapsed':'menu-expanded'">
26 <!--导航菜单--> 25 <!--导航菜单-->
27 - <el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen" @close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed" style="min-width: 230px" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b"> 26 + <el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen" @close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed" style="min-width: 230px">
28 <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden"> 27 <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
29 <el-submenu :index="index+''" v-if="!item.leaf"> 28 <el-submenu :index="index+''" v-if="!item.leaf">
30 <template slot="title"><i :class="item.iconCls"></i>{{item.name}}</template> 29 <template slot="title"><i :class="item.iconCls"></i>{{item.name}}</template>
@@ -46,92 +45,6 @@ @@ -46,92 +45,6 @@
46 <li class="el-submenu"> 45 <li class="el-submenu">
47 <div class="el-submenu__title el-menu-item" style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;" :class="$route.path==item.children[0].path?'is-active':''" @click="$router.push(item.children[0].path)"><i :class="item.iconCls"></i></div> 46 <div class="el-submenu__title el-menu-item" style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;" :class="$route.path==item.children[0].path?'is-active':''" @click="$router.push(item.children[0].path)"><i :class="item.iconCls"></i></div>
48 </li> 47 </li>
49 - </template>  
50 - </li>  
51 - </ul>  
52 - </aside>  
53 - <section class="content-container">  
54 - <div class="grid-content bg-purple-light">  
55 - <el-col :span="24" class="breadcrumb-container">  
56 - <strong class="title">{{$route.name}}</strong>  
57 - <el-breadcrumb separator="/" class="breadcrumb-inner">  
58 - <el-breadcrumb-item v-for="item in $route.matched" :key="item.path">  
59 - {{ item.name }}  
60 - </el-breadcrumb-item>  
61 - </el-breadcrumb>  
62 - </el-col>  
63 - <el-col :span="24" class="content-wrapper">  
64 - <transition name="fade" mode="out-in">  
65 - <router-view></router-view>  
66 - </transition>  
67 - </el-col>  
68 - </div>  
69 - </section>  
70 - </el-col>  
71 - </el-row>  
72 -=======  
73 - <el-row class="container">  
74 - <el-col :span="24" class="header">  
75 - <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'">  
76 - {{collapsed?'':sysName}}  
77 - </el-col>  
78 - <el-col :span="10">  
79 - <div class="tools" @click.prevent="collapse">  
80 - <i class="fa fa-align-justify"></i>  
81 - </div>  
82 - </el-col>  
83 - <el-col :span="4" class="userinfo">  
84 - <el-dropdown trigger="hover">  
85 - <span class="el-dropdown-link userinfo-inner"><img  
86 - :src="this.sysUserAvatar"/> {{sysUserName}}</span>  
87 - <el-dropdown-menu slot="dropdown">  
88 - <el-dropdown-item>我的消息</el-dropdown-item>  
89 - <el-dropdown-item>设置</el-dropdown-item>  
90 - <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>  
91 - </el-dropdown-menu>  
92 - </el-dropdown>  
93 - </el-col>  
94 - </el-col>  
95 - <el-col :span="24" class="main">  
96 - <aside :class="collapsed?'menu-collapsed':'menu-expanded'">  
97 - <!--导航菜单-->  
98 - <el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen"  
99 - @close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed"  
100 - style="min-width: 230px">  
101 - <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">  
102 - <el-submenu :index="index+''" v-if="!item.leaf">  
103 - <template slot="title"><i :class="item.iconCls"></i>{{item.name}}</template>  
104 - <el-menu-item v-for="child in item.children" :index="child.path" :key="child.path"  
105 - v-if="!child.hidden">{{child.name}}  
106 - </el-menu-item>  
107 - </el-submenu>  
108 - <el-menu-item v-if="item.leaf&&item.children.length>0" :index="item.children[0].path"><i  
109 - :class="item.iconCls"></i>{{item.children[0].name}}  
110 - </el-menu-item>  
111 - </template>  
112 - </el-menu>  
113 - <!--导航菜单-折叠后-->  
114 - <ul class="el-menu el-menu-vertical-demo collapsed" v-show="collapsed" ref="menuCollapsed">  
115 - <li v-for="(item,index) in $router.options.routes" v-if="!item.hidden" class="el-submenu item">  
116 - <template v-if="!item.leaf">  
117 - <div class="el-submenu__title" style="padding-left: 20px;" @mouseover="showMenu(index,true)"  
118 - @mouseout="showMenu(index,false)"><i :class="item.iconCls"></i></div>  
119 - <ul class="el-menu submenu" :class="'submenu-hook-'+index" @mouseover="showMenu(index,true)"  
120 - @mouseout="showMenu(index,false)">  
121 - <li v-for="child in item.children" v-if="!child.hidden" :key="child.path"  
122 - class="el-menu-item" style="padding-left: 40px;"  
123 - :class="$route.path==child.path?'is-active':''" @click="$router.push(child.path)">  
124 - {{child.name}}  
125 - </li>  
126 - </ul>  
127 - </template>  
128 - <template v-else>  
129 - <li class="el-submenu">  
130 - <div class="el-submenu__title el-menu-item"  
131 - style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;"  
132 - :class="$route.path==item.children[0].path?'is-active':''"  
133 - @click="$router.push(item.children[0].path)"><i :class="item.iconCls"></i></div>  
134 - </li>  
135 </template> 48 </template>
136 </li> 49 </li>
137 </ul> 50 </ul>
@@ -148,25 +61,21 @@ @@ -148,25 +61,21 @@
148 </el-col> 61 </el-col>
149 <el-col :span="24" class="content-wrapper"> 62 <el-col :span="24" class="content-wrapper">
150 <transition name="fade" mode="out-in"> 63 <transition name="fade" mode="out-in">
151 - <router-view :key="$route.path +$route.query.t"></router-view> 64 + <router-view></router-view>
152 </transition> 65 </transition>
153 </el-col> 66 </el-col>
154 </div> 67 </div>
155 </section> 68 </section>
156 </el-col> 69 </el-col>
157 </el-row> 70 </el-row>
158 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
159 </template> 71 </template>
160 72
161 -  
162 <script> 73 <script>
163 import rt from '../routes' 74 import rt from '../routes'
164 -  
165 export default { 75 export default {
166 -<<<<<<< HEAD  
167 data() { 76 data() {
168 return { 77 return {
169 - sysName:'后勤管理平台', 78 + sysName:'流浪地球管理系统',
170 collapsed:false, 79 collapsed:false,
171 sysUserName: '', 80 sysUserName: '',
172 sysUserAvatar: '', 81 sysUserAvatar: '',
@@ -202,68 +111,11 @@ @@ -202,68 +111,11 @@
202 //type: 'warning' 111 //type: 'warning'
203 }).then(() => { 112 }).then(() => {
204 sessionStorage.removeItem('user'); 113 sessionStorage.removeItem('user');
205 -=======  
206 -  
207 - provide() {  
208 - return {  
209 - reload: this.reload  
210 - }  
211 - },  
212 - data() {  
213 - return {  
214 - sysName: '流浪地球管理系统',  
215 - collapsed: false,  
216 - sysUserName: '',  
217 - sysUserAvatar: '',  
218 - isRouterAlive: true,  
219 - form: {  
220 - name: '',  
221 - region: '',  
222 - date1: '',  
223 - date2: '',  
224 - delivery: false,  
225 - type: [],  
226 - resource: '',  
227 - desc: ''  
228 - }  
229 - }  
230 - },  
231 - methods: {  
232 - reload() {  
233 - this.$nextTick(function () {  
234 - this.$router.push({  
235 - path: this.$router.path,  
236 - query:{  
237 - t: new Date().getTime()  
238 - }  
239 - })  
240 - })  
241 - },  
242 - onSubmit() {  
243 - console.log('submit!');  
244 - },  
245 - handleopen() {  
246 - console.log('handleopen');  
247 - },  
248 - handleclose() {  
249 - console.log('handleclose');  
250 - },  
251 - handleselect: function (a, b) {  
252 - this.reload()  
253 - },  
254 - //退出登录  
255 - logout: function () {  
256 - var _this = this;  
257 - this.$confirm('确认退出吗?', '提示', {  
258 - //type: 'warning'  
259 - }).then(() => {  
260 - sessionStorage.removeItem('user');  
261 ->>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861  
262 sessionStorage.removeItem('menu'); 114 sessionStorage.removeItem('menu');
263 115
264 //退出后初始化原来的路由 116 //退出后初始化原来的路由
265 let sysRoutes = JSON.parse(sessionStorage.getItem('sysMenu')); 117 let sysRoutes = JSON.parse(sessionStorage.getItem('sysMenu'));
266 - // console.log(sysRoutes); 118 + console.log(sysRoutes);
267 _this.$router.options.routes = sysRoutes; 119 _this.$router.options.routes = sysRoutes;
268 120
269 _this.$router.push('/login'); 121 _this.$router.push('/login');
@@ -274,11 +126,11 @@ @@ -274,11 +126,11 @@
274 126
275 }, 127 },
276 //折叠导航栏 128 //折叠导航栏
277 - collapse: function () {  
278 - this.collapsed = !this.collapsed; 129 + collapse:function(){
  130 + this.collapsed=!this.collapsed;
279 }, 131 },
280 - showMenu(i, status) {  
281 - this.$refs.menuCollapsed.getElementsByClassName('submenu-hook-' + i)[0].style.display = status ? 'block' : 'none'; 132 + showMenu(i,status){
  133 + this.$refs.menuCollapsed.getElementsByClassName('submenu-hook-'+i)[0].style.display=status?'block':'none';
282 } 134 }
283 }, 135 },
284 mounted() { 136 mounted() {
@@ -294,8 +146,8 @@ @@ -294,8 +146,8 @@
294 if (userRouters) { 146 if (userRouters) {
295 userRouters = JSON.parse(userRouters); 147 userRouters = JSON.parse(userRouters);
296 _this.$router.options.routes = userRouters; 148 _this.$router.options.routes = userRouters;
297 - // console.log("home:");  
298 - // console.log(_this.$router.options.routes); 149 + console.log("home:");
  150 + console.log(_this.$router.options.routes);
299 } 151 }
300 } 152 }
301 } 153 }
@@ -310,22 +162,18 @@ @@ -310,22 +162,18 @@
310 top: 0px; 162 top: 0px;
311 bottom: 0px; 163 bottom: 0px;
312 width: 100%; 164 width: 100%;
313 -  
314 .header { 165 .header {
315 height: 60px; 166 height: 60px;
316 line-height: 60px; 167 line-height: 60px;
317 background: $color-primary; 168 background: $color-primary;
318 - color: #fff;  
319 - 169 + color:#fff;
320 .userinfo { 170 .userinfo {
321 text-align: right; 171 text-align: right;
322 padding-right: 35px; 172 padding-right: 35px;
323 float: right; 173 float: right;
324 -  
325 .userinfo-inner { 174 .userinfo-inner {
326 cursor: pointer; 175 cursor: pointer;
327 - color: #fff;  
328 - 176 + color:#fff;
329 img { 177 img {
330 width: 40px; 178 width: 40px;
331 height: 40px; 179 height: 40px;
@@ -335,45 +183,38 @@ @@ -335,45 +183,38 @@
335 } 183 }
336 } 184 }
337 } 185 }
338 -  
339 .logo { 186 .logo {
340 //width:230px; 187 //width:230px;
341 - height: 60px; 188 + height:60px;
342 font-size: 22px; 189 font-size: 22px;
343 - padding-left: 20px;  
344 - padding-right: 20px;  
345 - border-color: rgba(238, 241, 146, 0.3); 190 + padding-left:20px;
  191 + padding-right:20px;
  192 + border-color: rgba(238,241,146,0.3);
346 border-right-width: 1px; 193 border-right-width: 1px;
347 border-right-style: solid; 194 border-right-style: solid;
348 -  
349 img { 195 img {
350 width: 40px; 196 width: 40px;
351 float: left; 197 float: left;
352 margin: 10px 10px 10px 18px; 198 margin: 10px 10px 10px 18px;
353 } 199 }
354 -  
355 .txt { 200 .txt {
356 - color: #fff; 201 + color:#fff;
357 } 202 }
358 } 203 }
359 -  
360 - .logo-width {  
361 - width: 230px; 204 + .logo-width{
  205 + width:230px;
362 } 206 }
363 -  
364 - .logo-collapse-width {  
365 - width: 60px 207 + .logo-collapse-width{
  208 + width:60px
366 } 209 }
367 -  
368 - .tools { 210 + .tools{
369 padding: 0px 23px; 211 padding: 0px 23px;
370 - width: 14px; 212 + width:14px;
371 height: 60px; 213 height: 60px;
372 line-height: 60px; 214 line-height: 60px;
373 cursor: pointer; 215 cursor: pointer;
374 } 216 }
375 } 217 }
376 -  
377 .main { 218 .main {
378 display: flex; 219 display: flex;
379 // background: #324057; 220 // background: #324057;
@@ -381,53 +222,45 @@ @@ -381,53 +222,45 @@
381 top: 60px; 222 top: 60px;
382 bottom: 0px; 223 bottom: 0px;
383 overflow: hidden; 224 overflow: hidden;
384 -  
385 aside { 225 aside {
386 - flex: 0 0 230px; 226 + flex:0 0 230px;
387 width: 230px; 227 width: 230px;
388 // position: absolute; 228 // position: absolute;
389 // top: 0px; 229 // top: 0px;
390 // bottom: 0px; 230 // bottom: 0px;
391 - .el-menu { 231 + .el-menu{
392 height: 100%; 232 height: 100%;
393 } 233 }
394 -  
395 - .collapsed {  
396 - width: 60px;  
397 -  
398 - .item { 234 + .collapsed{
  235 + width:60px;
  236 + .item{
399 position: relative; 237 position: relative;
400 } 238 }
401 -  
402 - .submenu {  
403 - position: absolute;  
404 - top: 0px;  
405 - left: 60px;  
406 - z-index: 99999;  
407 - height: auto;  
408 - display: none; 239 + .submenu{
  240 + position:absolute;
  241 + top:0px;
  242 + left:60px;
  243 + z-index:99999;
  244 + height:auto;
  245 + display:none;
409 } 246 }
410 247
411 } 248 }
412 } 249 }
413 -  
414 - .menu-collapsed {  
415 - flex: 0 0 60px; 250 + .menu-collapsed{
  251 + flex:0 0 60px;
416 width: 60px; 252 width: 60px;
417 } 253 }
418 -  
419 - .menu-expanded {  
420 - flex: 0 0 230px; 254 + .menu-expanded{
  255 + flex:0 0 230px;
421 width: 230px; 256 width: 230px;
422 } 257 }
423 -  
424 - .menu-expanded ul { 258 + .menu-expanded ul{
425 width: 230px; 259 width: 230px;
426 } 260 }
427 -  
428 .content-container { 261 .content-container {
429 // background: #f1f2f7; 262 // background: #f1f2f7;
430 - flex: 1; 263 + flex:1;
431 // position: absolute; 264 // position: absolute;
432 // right: 0px; 265 // right: 0px;
433 // top: 0px; 266 // top: 0px;
@@ -435,7 +268,6 @@ @@ -435,7 +268,6 @@
435 // left: 230px; 268 // left: 230px;
436 overflow-y: scroll; 269 overflow-y: scroll;
437 padding: 20px; 270 padding: 20px;
438 -  
439 .breadcrumb-container { 271 .breadcrumb-container {
440 //margin-bottom: 15px; 272 //margin-bottom: 15px;
441 .title { 273 .title {
@@ -443,12 +275,10 @@ @@ -443,12 +275,10 @@
443 float: left; 275 float: left;
444 color: #475669; 276 color: #475669;
445 } 277 }
446 -  
447 .breadcrumb-inner { 278 .breadcrumb-inner {
448 float: right; 279 float: right;
449 } 280 }
450 } 281 }
451 -  
452 .content-wrapper { 282 .content-wrapper {
453 background-color: #fff; 283 background-color: #fff;
454 box-sizing: border-box; 284 box-sizing: border-box;