王勇 / dispatch_sys_vue · 提交

转到一个项目

作者 王勇
提交 e00fb3ab524d141113971ac75067ca3ad034481c 1 个父辈 1501509a

简单修改格式

内嵌 并排对比
正在显示 2 个修改的文件 包含 205 行增加 和 137 行删除
@@ -11,7 +11,8 @@ @@ -11,7 +11,8 @@
11 </el-col> 11 </el-col>
12 <el-col :span="4" class="userinfo"> 12 <el-col :span="4" class="userinfo">
13 <el-dropdown trigger="hover"> 13 <el-dropdown trigger="hover">
14 - <span class="el-dropdown-link userinfo-inner"><img :src="this.sysUserAvatar" /> {{sysUserName}}</span> 14 + <span class="el-dropdown-link userinfo-inner"><img
  15 + :src="this.sysUserAvatar"/> {{sysUserName}}</span>
15 <el-dropdown-menu slot="dropdown"> 16 <el-dropdown-menu slot="dropdown">
16 <el-dropdown-item>我的消息</el-dropdown-item> 17 <el-dropdown-item>我的消息</el-dropdown-item>
17 <el-dropdown-item @click.native="editPass">修改密码</el-dropdown-item> 18 <el-dropdown-item @click.native="editPass">修改密码</el-dropdown-item>
@@ -27,7 +28,8 @@ @@ -27,7 +28,8 @@
27 <span>{{sysUserName}}</span> 28 <span>{{sysUserName}}</span>
28 </el-form-item> 29 </el-form-item>
29 <el-form-item label="新密码" prop="newpwd"> 30 <el-form-item label="新密码" prop="newpwd">
30 - <el-input type="password" v-model="resetForm.newpwd" autocomplete="off" placeholder="8-20位字符在数字、小写、大写字母以及特殊字符中四选三"></el-input> 31 + <el-input type="password" v-model="resetForm.newpwd" autocomplete="off"
  32 + placeholder="8-20位字符在数字、小写、大写字母以及特殊字符中四选三"></el-input>
31 </el-form-item> 33 </el-form-item>
32 <el-form-item label="确认密码" prop="renewpwd"> 34 <el-form-item label="确认密码" prop="renewpwd">
33 <el-input type="password" v-model="resetForm.renewpwd" auto-complete="off"></el-input> 35 <el-input type="password" v-model="resetForm.renewpwd" auto-complete="off"></el-input>
@@ -42,57 +44,73 @@ @@ -42,57 +44,73 @@
42 <el-col :span="24" class="main"> 44 <el-col :span="24" class="main">
43 <aside :class="collapsed?'menu-collapsed':'menu-expanded'"> 45 <aside :class="collapsed?'menu-collapsed':'menu-expanded'">
44 <!--导航菜单--> 46 <!--导航菜单-->
45 - <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"> 47 + <el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen"
  48 + @close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed"
  49 + style="min-width: 230px">
46 <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden"> 50 <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
47 <el-submenu :index="index+''" v-if="!item.leaf"> 51 <el-submenu :index="index+''" v-if="!item.leaf">
48 <template slot="title"><i :class="item.iconCls"></i>{{item.name}}</template> 52 <template slot="title"><i :class="item.iconCls"></i>{{item.name}}</template>
49 - <el-menu-item v-for="child in item.children" :index="child.path" :key="child.path" v-if="!child.hidden">{{child.name}}</el-menu-item> 53 + <el-menu-item v-for="child in item.children" :index="child.path" :key="child.path"
  54 + v-if="!child.hidden">{{child.name}}
  55 + </el-menu-item>
50 </el-submenu> 56 </el-submenu>
51 - <el-menu-item v-if="item.leaf&&item.children.length>0" :index="item.children[0].path"><i :class="item.iconCls"></i>{{item.children[0].name}}</el-menu-item> 57 + <el-menu-item v-if="item.leaf&&item.children.length>0" :index="item.children[0].path"><i
  58 + :class="item.iconCls"></i>{{item.children[0].name}}
  59 + </el-menu-item>
52 </template> 60 </template>
53 </el-menu> 61 </el-menu>
54 <!--导航菜单-折叠后--> 62 <!--导航菜单-折叠后-->
55 <ul class="el-menu el-menu-vertical-demo collapsed" v-show="collapsed" ref="menuCollapsed"> 63 <ul class="el-menu el-menu-vertical-demo collapsed" v-show="collapsed" ref="menuCollapsed">
56 <li v-for="(item,index) in $router.options.routes" v-if="!item.hidden" class="el-submenu item"> 64 <li v-for="(item,index) in $router.options.routes" v-if="!item.hidden" class="el-submenu item">
57 <template v-if="!item.leaf"> 65 <template v-if="!item.leaf">
58 - <div class="el-submenu__title" style="padding-left: 20px;" @mouseover="showMenu(index,true)" @mouseout="showMenu(index,false)"><i :class="item.iconCls"></i></div>  
59 - <ul class="el-menu submenu" :class="'submenu-hook-'+index" @mouseover="showMenu(index,true)" @mouseout="showMenu(index,false)">  
60 - <li v-for="child in item.children" v-if="!child.hidden" :key="child.path" class="el-menu-item" style="padding-left: 40px;" :class="$route.path==child.path?'is-active':''" @click="$router.push(child.path)">{{child.name}}</li> 66 + <div class="el-submenu__title" style="padding-left: 20px;" @mouseover="showMenu(index,true)"
  67 + @mouseout="showMenu(index,false)"><i :class="item.iconCls"></i></div>
  68 + <ul class="el-menu submenu" :class="'submenu-hook-'+index" @mouseover="showMenu(index,true)"
  69 + @mouseout="showMenu(index,false)">
  70 + <li v-for="child in item.children" v-if="!child.hidden" :key="child.path"
  71 + class="el-menu-item" style="padding-left: 40px;"
  72 + :class="$route.path==child.path?'is-active':''" @click="$router.push(child.path)">
  73 + {{child.name}}
  74 + </li>
61 </ul> 75 </ul>
62 </template> 76 </template>
63 <template v-else> 77 <template v-else>
64 - <li class="el-submenu">  
65 - <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> 78 + <li class="el-submenu">
  79 + <div class="el-submenu__title el-menu-item"
  80 + style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;"
  81 + :class="$route.path==item.children[0].path?'is-active':''"
  82 + @click="$router.push(item.children[0].path)"><i :class="item.iconCls"></i></div>
  83 + </li>
  84 + </template>
66 </li> 85 </li>
67 -</template>  
68 -</li>  
69 -</ul>  
70 -</aside>  
71 -<section class="content-container">  
72 - <div class="grid-content bg-purple-light">  
73 - <el-col :span="24" class="breadcrumb-container">  
74 - <strong class="title">{{$route.name}}</strong>  
75 - <el-breadcrumb separator="/" class="breadcrumb-inner">  
76 - <el-breadcrumb-item v-for="item in $route.matched" :key="item.path">  
77 - {{ item.name }}  
78 - </el-breadcrumb-item>  
79 - </el-breadcrumb>  
80 - </el-col>  
81 - <el-col :span="24" class="content-wrapper">  
82 - <transition name="fade" mode="out-in">  
83 - <router-view :key="$route.path +$route.query.t"></router-view>  
84 - </transition> 86 + </ul>
  87 + </aside>
  88 + <section class="content-container">
  89 + <div class="grid-content bg-purple-light">
  90 + <el-col :span="24" class="breadcrumb-container">
  91 + <strong class="title">{{$route.name}}</strong>
  92 + <el-breadcrumb separator="/" class="breadcrumb-inner">
  93 + <el-breadcrumb-item v-for="item in $route.matched" :key="item.path">
  94 + {{ item.name }}
  95 + </el-breadcrumb-item>
  96 + </el-breadcrumb>
  97 + </el-col>
  98 + <el-col :span="24" class="content-wrapper">
  99 + <transition name="fade" mode="out-in">
  100 + <router-view :key="$route.path +$route.query.t"></router-view>
  101 + </transition>
  102 + </el-col>
  103 + </div>
  104 + </section>
85 </el-col> 105 </el-col>
86 - </div>  
87 -</section>  
88 -</el-col>  
89 -</el-row> 106 + </el-row>
90 </template> 107 </template>
91 108
92 <script> 109 <script>
93 import rt from '../routes' 110 import rt from '../routes'
94 - import { editPass} from '../api/user'; 111 + import {editPass} from '../api/user';
95 import ElFormItem from "element-ui/packages/form/src/form-item"; 112 import ElFormItem from "element-ui/packages/form/src/form-item";
  113 +
96 export default { 114 export default {
97 115
98 provide() { 116 provide() {
@@ -105,30 +123,48 @@ @@ -105,30 +123,48 @@
105 var validatePass = (rule, value, callback) => { 123 var validatePass = (rule, value, callback) => {
106 if (!value) { 124 if (!value) {
107 callback(new Error('请输入新密码')); 125 callback(new Error('请输入新密码'));
108 - }else {  
109 - var ls=0;  
110 - if(value.match(/([a-z])+/)){ 126 + } else {
  127 + var ls = 0;
  128 + if (value.match(/([a-z])+/)) {
111 ls++; 129 ls++;
112 - } if(value.match(/([0-9])+/)){ 130 + }
  131 + if (value.match(/([0-9])+/)) {
113 ls++; 132 ls++;
114 - } if(value.match(/([A-Z])+/)){ 133 + }
  134 + if (value.match(/([A-Z])+/)) {
115 ls++; 135 ls++;
116 - } if((/([\W])+/) && !value.match(/(![\u4E00-\u9FA5])+/)){ 136 + }
  137 + if ((/([\W])+/) && !value.match(/(![\u4E00-\u9FA5])+/)) {
117 ls++; 138 ls++;
118 - } if (value.toString().length < 8 || value.toString().length > 20) { 139 + }
  140 + if (value.toString().length < 8 || value.toString().length > 20) {
119 callback(new Error('密码长度为8 - 20个字符')); 141 callback(new Error('密码长度为8 - 20个字符'));
120 - ls=0;  
121 - } if(value.match(/([\u4E00-\u9FA5])+/)){ 142 + ls = 0;
  143 + }
  144 + if (value.match(/([\u4E00-\u9FA5])+/)) {
122 callback(new Error('不能包含中文字符')); 145 callback(new Error('不能包含中文字符'));
123 - ls=0; 146 + ls = 0;
124 } 147 }
125 switch (ls) { 148 switch (ls) {
126 - case 0: this.passwordPercent = 0;callback(new Error('数字、小写字母、大写字母以及特殊字符中四选三'));break;  
127 - case 1: this.passwordPercent = 33;callback(new Error('数字、小写字母、大写字母以及特殊字符中四选三'));break;  
128 - case 2: this.passwordPercent = 66;callback(new Error('数字、小写字母 、大写字母以及特殊字符中四选三'));break; 149 + case 0:
  150 + this.passwordPercent = 0;
  151 + callback(new Error('数字、小写字母、大写字母以及特殊字符中四选三'));
  152 + break;
  153 + case 1:
  154 + this.passwordPercent = 33;
  155 + callback(new Error('数字、小写字母、大写字母以及特殊字符中四选三'));
  156 + break;
  157 + case 2:
  158 + this.passwordPercent = 66;
  159 + callback(new Error('数字、小写字母 、大写字母以及特殊字符中四选三'));
  160 + break;
129 case 3: 161 case 3:
130 - case 4: this.passwordPercent = 100;break;  
131 - default: this.passwordPercent = 0;break; 162 + case 4:
  163 + this.passwordPercent = 100;
  164 + break;
  165 + default:
  166 + this.passwordPercent = 0;
  167 + break;
132 } 168 }
133 callback(); 169 callback();
134 } 170 }
@@ -145,10 +181,10 @@ @@ -145,10 +181,10 @@
145 } 181 }
146 }; 182 };
147 return { 183 return {
148 - sysName:'车辆调度系统',  
149 - collapsed:false, 184 + sysName: '车辆调度系统',
  185 + collapsed: false,
150 sysUserName: '', 186 sysUserName: '',
151 - sysUserId:'', 187 + sysUserId: '',
152 sysUserAvatar: '', 188 sysUserAvatar: '',
153 isRouterAlive: true, 189 isRouterAlive: true,
154 form: { 190 form: {
@@ -161,17 +197,17 @@ @@ -161,17 +197,17 @@
161 resource: '', 197 resource: '',
162 desc: '' 198 desc: ''
163 }, 199 },
164 - dialogFormVisible:false, 200 + dialogFormVisible: false,
165 resetForm: { 201 resetForm: {
166 newpwd: '', 202 newpwd: '',
167 renewpwd: '', 203 renewpwd: '',
168 }, 204 },
169 resetFormRules: { 205 resetFormRules: {
170 newpwd: [ 206 newpwd: [
171 - { required: true, validator: validatePass, trigger: 'blur' } 207 + {required: true, validator: validatePass, trigger: 'blur'}
172 ], 208 ],
173 renewpwd: [ 209 renewpwd: [
174 - { required: true, validator: validatePass2, trigger: 'blur' } 210 + {required: true, validator: validatePass2, trigger: 'blur'}
175 ] 211 ]
176 }, 212 },
177 editForm: { 213 editForm: {
@@ -183,32 +219,32 @@ @@ -183,32 +219,32 @@
183 methods: { 219 methods: {
184 reload() { 220 reload() {
185 this.$nextTick(function () { 221 this.$nextTick(function () {
186 - this.$router.push({  
187 - path: this.$router.path,  
188 - query:{  
189 - t: new Date().getTime()  
190 - }  
191 - }) 222 + this.$router.push({
  223 + path: this.$router.path,
  224 + query: {
  225 + t: new Date().getTime()
  226 + }
  227 + })
192 }) 228 })
193 }, 229 },
194 - editPass:function(){  
195 - this.dialogFormVisible=true; 230 + editPass: function () {
  231 + this.dialogFormVisible = true;
196 }, 232 },
197 - submitEdit(formName){ 233 + submitEdit(formName) {
198 this.$refs[formName].validate((valid) => { 234 this.$refs[formName].validate((valid) => {
199 if (valid) { 235 if (valid) {
200 - this.editForm.userId=this.sysUserId;  
201 - this.editForm.password=this.resetForm.renewpwd;  
202 - editPass(this.editForm).then(res=>{  
203 - let response=res.data;  
204 - if(response.code=='200'){ 236 + this.editForm.userId = this.sysUserId;
  237 + this.editForm.password = this.resetForm.renewpwd;
  238 + editPass(this.editForm).then(res => {
  239 + let response = res.data;
  240 + if (response.code == '200') {
205 this.$notify({ 241 this.$notify({
206 title: '密码修改成功', 242 title: '密码修改成功',
207 message: '密码修改成功，退出请重新登录', 243 message: '密码修改成功，退出请重新登录',
208 type: 'success' 244 type: 'success'
209 }); 245 });
210 - this.dialogFormVisible=false;  
211 - }else{ 246 + this.dialogFormVisible = false;
  247 + } else {
212 this.$notify.error({ 248 this.$notify.error({
213 title: '密码修改失败', 249 title: '密码修改失败',
214 message: '密码修改失败！！！' 250 message: '密码修改失败！！！'
@@ -242,7 +278,7 @@ @@ -242,7 +278,7 @@
242 sessionStorage.removeItem('user'); 278 sessionStorage.removeItem('user');
243 sessionStorage.removeItem('menu'); 279 sessionStorage.removeItem('menu');
244 //退出后初始化原来的路由 280 //退出后初始化原来的路由
245 - let sysRoutes = JSON.parse(sessionStorage.getItem('sysMenu')); 281 + let sysRoutes = JSON.parse(sessionStorage.getItem('sysMenu'));
246 console.log(sysRoutes); 282 console.log(sysRoutes);
247 _this.$router.options.routes = sysRoutes; 283 _this.$router.options.routes = sysRoutes;
248 284
@@ -254,11 +290,11 @@ @@ -254,11 +290,11 @@
254 290
255 }, 291 },
256 //折叠导航栏 292 //折叠导航栏
257 - collapse:function(){  
258 - this.collapsed=!this.collapsed; 293 + collapse: function () {
  294 + this.collapsed = !this.collapsed;
259 }, 295 },
260 - showMenu(i,status){  
261 - this.$refs.menuCollapsed.getElementsByClassName('submenu-hook-'+i)[0].style.display=status?'block':'none'; 296 + showMenu(i, status) {
  297 + this.$refs.menuCollapsed.getElementsByClassName('submenu-hook-' + i)[0].style.display = status ? 'block' : 'none';
262 } 298 }
263 }, 299 },
264 mounted() { 300 mounted() {
@@ -267,7 +303,7 @@ @@ -267,7 +303,7 @@
267 if (user) { 303 if (user) {
268 user = JSON.parse(user); 304 user = JSON.parse(user);
269 this.sysUserName = user.username || ''; 305 this.sysUserName = user.username || '';
270 - this.sysUserId=user.userId||''; 306 + this.sysUserId = user.userId || '';
271 this.sysUserAvatar = user.userface || '/static/images/faceDefault.jpg'; 307 this.sysUserAvatar = user.userface || '/static/images/faceDefault.jpg';
272 } 308 }
273 //操作路由,判断本地存储的用户栏目列表是否存在，如果存在则加载路由 309 //操作路由,判断本地存储的用户栏目列表是否存在，如果存在则加载路由
@@ -285,23 +321,28 @@ @@ -285,23 +321,28 @@
285 321
286 <style scoped lang="scss"> 322 <style scoped lang="scss">
287 @import '~scss_vars'; 323 @import '~scss_vars';
  324 +
288 .container { 325 .container {
289 position: absolute; 326 position: absolute;
290 top: 0px; 327 top: 0px;
291 bottom: 0px; 328 bottom: 0px;
292 width: 100%; 329 width: 100%;
  330 +
293 .header { 331 .header {
294 height: 60px; 332 height: 60px;
295 line-height: 60px; 333 line-height: 60px;
296 background: $color-primary url("/static/images/air-banner.png"); 334 background: $color-primary url("/static/images/air-banner.png");
297 - color:#fff; 335 + color: #fff;
  336 +
298 .userinfo { 337 .userinfo {
299 text-align: right; 338 text-align: right;
300 padding-right: 35px; 339 padding-right: 35px;
301 float: right; 340 float: right;
  341 +
302 .userinfo-inner { 342 .userinfo-inner {
303 cursor: pointer; 343 cursor: pointer;
304 - color:#fff; 344 + color: #fff;
  345 +
305 img { 346 img {
306 width: 40px; 347 width: 40px;
307 height: 40px; 348 height: 40px;
@@ -311,38 +352,45 @@ @@ -311,38 +352,45 @@
311 } 352 }
312 } 353 }
313 } 354 }
  355 +
314 .logo { 356 .logo {
315 //width:230px; 357 //width:230px;
316 - height:60px; 358 + height: 60px;
317 font-size: 22px; 359 font-size: 22px;
318 - padding-left:20px;  
319 - padding-right:20px;  
320 - border-color: rgba(238,241,146,0.3); 360 + padding-left: 20px;
  361 + padding-right: 20px;
  362 + border-color: rgba(238, 241, 146, 0.3);
321 border-right-width: 1px; 363 border-right-width: 1px;
322 border-right-style: solid; 364 border-right-style: solid;
  365 +
323 img { 366 img {
324 width: 40px; 367 width: 40px;
325 float: left; 368 float: left;
326 margin: 10px 10px 10px 18px; 369 margin: 10px 10px 10px 18px;
327 } 370 }
  371 +
328 .txt { 372 .txt {
329 - color:#fff; 373 + color: #fff;
330 } 374 }
331 } 375 }
332 - .logo-width{  
333 - width:230px; 376 +
  377 + .logo-width {
  378 + width: 230px;
334 } 379 }
335 - .logo-collapse-width{  
336 - width:60px 380 +
  381 + .logo-collapse-width {
  382 + width: 60px
337 } 383 }
338 - .tools{ 384 +
  385 + .tools {
339 padding: 0px 23px; 386 padding: 0px 23px;
340 - width:14px; 387 + width: 14px;
341 height: 60px; 388 height: 60px;
342 line-height: 60px; 389 line-height: 60px;
343 cursor: pointer; 390 cursor: pointer;
344 } 391 }
345 } 392 }
  393 +
346 .main { 394 .main {
347 display: flex; 395 display: flex;
348 // background: #324057; 396 // background: #324057;
@@ -350,42 +398,49 @@ @@ -350,42 +398,49 @@
350 top: 60px; 398 top: 60px;
351 bottom: 0px; 399 bottom: 0px;
352 overflow: hidden; 400 overflow: hidden;
  401 +
353 aside { 402 aside {
354 - flex:0 0 230px; 403 + flex: 0 0 230px;
355 width: 230px; 404 width: 230px;
356 // position: absolute; 405 // position: absolute;
357 // top: 0px; 406 // top: 0px;
358 // bottom: 0px; 407 // bottom: 0px;
359 - .collapsed{  
360 - width:60px;  
361 - .item{ 408 + .collapsed {
  409 + width: 60px;
  410 +
  411 + .item {
362 position: relative; 412 position: relative;
363 } 413 }
364 - .submenu{  
365 - position:absolute;  
366 - top:0px;  
367 - left:60px;  
368 - z-index:99999;  
369 - height:auto;  
370 - display:none; 414 +
  415 + .submenu {
  416 + position: absolute;
  417 + top: 0px;
  418 + left: 60px;
  419 + z-index: 99999;
  420 + height: auto;
  421 + display: none;
371 } 422 }
372 423
373 } 424 }
374 } 425 }
375 - .menu-collapsed{  
376 - flex:0 0 60px; 426 +
  427 + .menu-collapsed {
  428 + flex: 0 0 60px;
377 width: 60px; 429 width: 60px;
378 } 430 }
379 - .menu-expanded{  
380 - flex:0 0 230px; 431 +
  432 + .menu-expanded {
  433 + flex: 0 0 230px;
381 width: 230px; 434 width: 230px;
382 } 435 }
383 - .menu-expanded ul{ 436 +
  437 + .menu-expanded ul {
384 width: 230px; 438 width: 230px;
385 } 439 }
  440 +
386 .content-container { 441 .content-container {
387 // background: #f1f2f7; 442 // background: #f1f2f7;
388 - flex:1; 443 + flex: 1;
389 // position: absolute; 444 // position: absolute;
390 // right: 0px; 445 // right: 0px;
391 // top: 0px; 446 // top: 0px;
@@ -393,22 +448,29 @@ @@ -393,22 +448,29 @@
393 // left: 230px; 448 // left: 230px;
394 overflow-y: scroll; 449 overflow-y: scroll;
395 padding: 10px; 450 padding: 10px;
  451 +
396 .breadcrumb-container { 452 .breadcrumb-container {
397 //margin-bottom: 15px; 453 //margin-bottom: 15px;
  454 + background: #bfcbd9;
398 .title { 455 .title {
399 width: 200px; 456 width: 200px;
400 float: left; 457 float: left;
401 color: #475669; 458 color: #475669;
402 - margin-left: 10px; 459 + margin-left: 20px;
  460 + margin-top: 8px;
  461 + font-size: 14px;
403 } 462 }
  463 +
404 .breadcrumb-inner { 464 .breadcrumb-inner {
405 float: right; 465 float: right;
406 - margin-right:10px; 466 + margin-right: 20px;
407 } 467 }
408 - .el-breadcrumb{  
409 - line-height:36px; 468 +
  469 + .el-breadcrumb {
  470 + line-height: 36px;
410 } 471 }
411 } 472 }
  473 +
412 .content-wrapper { 474 .content-wrapper {
413 background-color: #fff; 475 background-color: #fff;
414 box-sizing: border-box; 476 box-sizing: border-box;
@@ -418,34 +480,42 @@ @@ -418,34 +480,42 @@
418 } 480 }
419 </style> 481 </style>
420 <style lang="scss"> 482 <style lang="scss">
421 - .darkmenu{ 483 + .darkmenu {
422 .main { 484 .main {
423 aside { 485 aside {
424 - .el-menu{ 486 + .el-menu {
425 height: 100%; 487 height: 100%;
426 background: #606060; 488 background: #606060;
  489 +
427 .el-menu-item { 490 .el-menu-item {
428 - i{ 491 + i {
429 color: white; 492 color: white;
430 } 493 }
  494 +
431 color: white; 495 color: white;
432 } 496 }
433 - .el-menu-item.is-active{  
434 - color:#e6a23c; 497 +
  498 + .el-menu-item.is-active {
  499 + color: #e6a23c;
435 } 500 }
436 - .el-menu-item:hover,.el-menu-item:focus{ 501 +
  502 + .el-menu-item:hover, .el-menu-item:focus {
437 background-color: #1a4496; 503 background-color: #1a4496;
438 } 504 }
  505 +
439 .el-submenu { 506 .el-submenu {
440 - ul.el-menu.el-menu--inline{ 507 + ul.el-menu.el-menu--inline {
441 background: #303030; 508 background: #303030;
442 } 509 }
  510 +
443 .el-submenu__title { 511 .el-submenu__title {
444 color: white; 512 color: white;
445 - i{ 513 +
  514 + i {
446 color: white; 515 color: white;
447 } 516 }
448 } 517 }
  518 +
449 .el-submenu__title:hover { 519 .el-submenu__title:hover {
450 background-color: #1a4496; 520 background-color: #1a4496;
451 } 521 }
@@ -66,7 +66,23 @@ @@ -66,7 +66,23 @@
66 <el-table-column type="index"></el-table-column> 66 <el-table-column type="index"></el-table-column>
67 <el-table-column label="用户名称" prop="userName" width="100"></el-table-column> 67 <el-table-column label="用户名称" prop="userName" width="100"></el-table-column>
68 <el-table-column label="联系方式" prop="userMobile" width="120"></el-table-column> 68 <el-table-column label="联系方式" prop="userMobile" width="120"></el-table-column>
69 - <el-table-column label="车牌号" prop="licensePlateNumber" width="120"></el-table-column> 69 + <el-table-column label="状态" prop="status" width="120">
  70 + <template slot-scope="scope">
  71 + <span v-if="scope.row.status ==='1'">完成状态</span>
  72 + <span v-if="scope.row.status ==='2'">执行状态</span>
  73 + <span v-if="scope.row.status ==='3'">取消状态</span>
  74 + <span v-if="scope.row.status ==='4'">待执行状态</span>
  75 + </template>
  76 + </el-table-column>
  77 + <el-table-column label="业务类型" prop="dispatchType" width="120">
  78 + <template slot-scope="scope">
  79 + <span v-if="scope.row.dispatchType ==='1'">进站送货</span>
  80 + <span v-if="scope.row.dispatchType ==='2'">出站提货</span>
  81 + <span v-if="scope.row.dispatchType ==='3'">货物调拨</span>
  82 + <span v-if="scope.row.dispatchType ==='4'">货物流转</span>
  83 + </template>
  84 + </el-table-column>
  85 + <el-table-column label="车牌号码" prop="licensePlateNumber" width="120"></el-table-column>
70 <el-table-column label="车辆类型" prop="vehicleType" width="120"> 86 <el-table-column label="车辆类型" prop="vehicleType" width="120">
71 <template slot-scope="scope"> 87 <template slot-scope="scope">
72 <span v-if="scope.row.vehicleType ==='1'">重型货车</span> 88 <span v-if="scope.row.vehicleType ==='1'">重型货车</span>
@@ -77,7 +93,6 @@ @@ -77,7 +93,6 @@
77 <span v-if="scope.row.vehicleType ==='6'">叉车</span> 93 <span v-if="scope.row.vehicleType ==='6'">叉车</span>
78 </template> 94 </template>
79 </el-table-column> 95 </el-table-column>
80 -  
81 <el-table-column label="场站位置" prop="station" width="120"> 96 <el-table-column label="场站位置" prop="station" width="120">
82 <template slot-scope="scope"> 97 <template slot-scope="scope">
83 <span v-if="scope.row.station ==='1'">西货站</span> 98 <span v-if="scope.row.station ==='1'">西货站</span>
@@ -86,26 +101,9 @@ @@ -86,26 +101,9 @@
86 <span v-if="scope.row.station ==='4'">快邮</span> 101 <span v-if="scope.row.station ==='4'">快邮</span>
87 </template> 102 </template>
88 </el-table-column> 103 </el-table-column>
89 -  
90 - <el-table-column label="业务类型" prop="dispatchType" width="120">  
91 - <template slot-scope="scope">  
92 - <span v-if="scope.row.dispatchType ==='1'">进站送货</span>  
93 - <span v-if="scope.row.dispatchType ==='2'">出站提货</span>  
94 - <span v-if="scope.row.dispatchType ==='3'">货物调拨</span>  
95 - <span v-if="scope.row.dispatchType ==='4'">货物流转</span>  
96 - </template>  
97 - </el-table-column>  
98 <el-table-column label="创建时间" prop="gmtCreate" width="160"></el-table-column> 104 <el-table-column label="创建时间" prop="gmtCreate" width="160"></el-table-column>
99 <el-table-column label="开始时间" prop="beginTime" width="160"></el-table-column> 105 <el-table-column label="开始时间" prop="beginTime" width="160"></el-table-column>
100 <el-table-column label="完成时间" prop="endTime" width="160"></el-table-column> 106 <el-table-column label="完成时间" prop="endTime" width="160"></el-table-column>
101 - <el-table-column label="状态" prop="status" width="120">  
102 - <template slot-scope="scope">  
103 - <span v-if="scope.row.status ==='1'">完成状态</span>  
104 - <span v-if="scope.row.status ==='2'">执行状态</span>  
105 - <span v-if="scope.row.status ==='3'">取消状态</span>  
106 - <span v-if="scope.row.status ==='4'">待执行状态</span>  
107 - </template>  
108 - </el-table-column>  
109 <el-table-column label="操作" width="220px" fixed="right"> 107 <el-table-column label="操作" width="220px" fixed="right">
110 <template slot-scope="scope"> 108 <template slot-scope="scope">
111 <!--查看按钮--> 109 <!--查看按钮-->