Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
679d4c29 1 parent 629e1e97

页面状态更新样式修改

Expand all
Inline Side-by-side
Showing 13 changed files with 110 additions and 50 deletions
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 > 35 >
36 <div class="userName-wrapper"> 36 <div class="userName-wrapper">
37 <!-- <img :src="avatar" class="user-avatar" /> --> 37 <!-- <img :src="avatar" class="user-avatar" /> -->
38 - <span>欢迎！{{userName}}</span> 38 + <span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎！{{userName}}</span>
39 </div> 39 </div>
40 <el-dropdown-menu slot="dropdown"> 40 <el-dropdown-menu slot="dropdown">
41 <el-dropdown-item @click.native="logout"> 41 <el-dropdown-item @click.native="logout">
...@@ -212,6 +212,14 @@ export default { ...@@ -212,6 +212,14 @@ export default {
212 .avatar-container { 212 .avatar-container {
213 text-align: center; 213 text-align: center;
214 margin-right: 15px; 214 margin-right: 15px;
215 + font-weight: 700;
216 + i{
217 + display: inline-block;
218 + height: 50px;
219 + margin-right:5px;
220 + font-size: 24px;
221 + line-height: 50px;
222 + }
215 .userName-wrapper { 223 .userName-wrapper {
216 position: relative; 224 position: relative;
217 font-size:14px; 225 font-size:14px;
......
...@@ -847,12 +847,16 @@ export default { ...@@ -847,12 +847,16 @@ export default {
847 }, 847 },
848 created() { 848 created() {
849 this.seleData(); 849 this.seleData();
850 + if(this.$store.state.tagsView.cachedViews.length == 0){
851 + this.select();
852 + }
853 + },
854 + activated(){
850 this.select(); 855 this.select();
851 }, 856 },
852 - // activated(){ 857 + deactivated(){
853 - // this.seleData(); 858 + this.tableData = []
854 - // this.select(); 859 + },
855 - // },
856 mounted() { 860 mounted() {
857 window.addEventListener("keydown", (code) => { 861 window.addEventListener("keydown", (code) => {
858 if (code.keyCode === 16 && code.shiftKey) { 862 if (code.keyCode === 16 && code.shiftKey) {
......
...@@ -152,9 +152,17 @@ export default { ...@@ -152,9 +152,17 @@ export default {
152 loading: false, 152 loading: false,
153 }; 153 };
154 }, 154 },
155 + created() {
156 + if(this.$store.state.tagsView.cachedViews.length == 0){
157 + this.getList();
158 + }
159 + },
155 activated(){ 160 activated(){
156 this.getList() 161 this.getList()
157 }, 162 },
163 + deactivated(){
164 + this.flyList = []
165 + },
158 methods: { 166 methods: {
159 getList() { 167 getList() {
160 this.queryParams.limit = this.limit; 168 this.queryParams.limit = this.limit;
......
...@@ -443,15 +443,16 @@ export default { ...@@ -443,15 +443,16 @@ export default {
443 }, 443 },
444 created() { 444 created() {
445 this.queryParams.portName = this.$store.state.user.activePortName; 445 this.queryParams.portName = this.$store.state.user.activePortName;
446 - this.findSourceFlightRules();
447 this.portNameList = this.$store.state.user.portNames; 446 this.portNameList = this.$store.state.user.portNames;
448 - this.form.portName = this.$store.state.user.activePortName; 447 + if(this.$store.state.tagsView.cachedViews.length == 0){
448 + this.findSourceFlightRules();
449 + }
449 }, 450 },
450 activated(){ 451 activated(){
451 - this.queryParams.portName = this.$store.state.user.activePortName;
452 this.findSourceFlightRules(); 452 this.findSourceFlightRules();
453 - this.portNameList = this.$store.state.user.portNames; 453 + },
454 - this.form.portName = this.$store.state.user.activePortName; 454 + deactivated(){
455 + this.sourceFlightRulesList = []
455 }, 456 },
456 watch:{ 457 watch:{
457 open(val,oldVal){ 458 open(val,oldVal){
...@@ -499,7 +500,7 @@ export default { ...@@ -499,7 +500,7 @@ export default {
499 this.title = "添加原航班顺位规则"; 500 this.title = "添加原航班顺位规则";
500 this.form.id = -1; 501 this.form.id = -1;
501 this.dayOfWeek = []; 502 this.dayOfWeek = [];
502 - // this.form.portName = this.$store.state.user.activePortName; 503 + this.form.portName = this.$store.state.user.activePortName;
503 }, 504 },
504 /** 修改按钮操作 */ 505 /** 修改按钮操作 */
505 handleUpdate(row) { 506 handleUpdate(row) {
......
...@@ -116,9 +116,6 @@ ...@@ -116,9 +116,6 @@
116 this.uploadExcel(file); 116 this.uploadExcel(file);
117 }, 117 },
118 }, 118 },
119 - created() {
120 -
121 - },
122 }; 119 };
123 </script> 120 </script>
124 <style rel="stylesheet/scss" lang="scss"> 121 <style rel="stylesheet/scss" lang="scss">
......
...@@ -768,18 +768,19 @@ export default { ...@@ -768,18 +768,19 @@ export default {
768 }); 768 });
769 }, 769 },
770 770
771 - // activated(){ 771 + activated() {
772 - // findConditionData().then((res) => { 772 + if(this.$store.state.tagsView.cachedViews.length > 0 ){
773 - // if (res.code == 200) { 773 + this.$store.state.tagsView.cachedViews.forEach(item=>{
774 - // this.findConditionData = res.data; 774 + if(item === 'QueryCargo'){
775 - // } else { 775 + this.totalCount>0?this.select():''
776 - // this.$message({ 776 + }
777 - // message: "查询条件不存在", 777 + })
778 - // type: "warning", 778 + }
779 - // }); 779 + },
780 - // } 780 +
781 - // }); 781 + deactivated(){
782 - // }, 782 + this.tableData = []
783 + },
783 784
784 mounted() { 785 mounted() {
785 window.addEventListener("keydown", (code) => { 786 window.addEventListener("keydown", (code) => {
......
...@@ -120,6 +120,13 @@ export default { ...@@ -120,6 +120,13 @@ export default {
120 updated() { 120 updated() {
121 this.menuForm = this.menuData; 121 this.menuForm = this.menuData;
122 }, 122 },
123 + watch:{
124 + dialogVisible(val,oldVal){
125 + if(val){
126 + this.menuForm = this.menuData;
127 + }
128 + }
129 + },
123 methods: { 130 methods: {
124 handleClose() { 131 handleClose() {
125 this.$emit("handleClose", false); 132 this.$emit("handleClose", false);
......
...@@ -106,7 +106,7 @@ import dictLabels from "@/assets/languages/dictLabels.js"; ...@@ -106,7 +106,7 @@ import dictLabels from "@/assets/languages/dictLabels.js";
106 import Drawer from "./drawer.vue"; 106 import Drawer from "./drawer.vue";
107 import { MessageBox } from "element-ui"; 107 import { MessageBox } from "element-ui";
108 export default { 108 export default {
109 - name:"menuConfig", 109 + name:"MenuConfig",
110 components: { 110 components: {
111 Drawer, 111 Drawer,
112 }, 112 },
...@@ -163,6 +163,11 @@ export default { ...@@ -163,6 +163,11 @@ export default {
163 }; 163 };
164 }, 164 },
165 created() { 165 created() {
166 + if(this.$store.state.tagsView.cachedViews.length == 0){
167 + this.menuAll();
168 + }
169 + },
170 + activated(){
166 this.menuAll(); 171 this.menuAll();
167 }, 172 },
168 methods: { 173 methods: {
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
26 v-model.trim="roleForm.name" 26 v-model.trim="roleForm.name"
27 :disabled="roleFormDisabled" 27 :disabled="roleFormDisabled"
28 v-if="!roleFormDisabled" 28 v-if="!roleFormDisabled"
29 + clearable
29 ></el-input> 30 ></el-input>
30 <div v-else>{{ roleData.name }}</div> 31 <div v-else>{{ roleData.name }}</div>
31 </el-form-item> 32 </el-form-item>
...@@ -38,6 +39,7 @@ ...@@ -38,6 +39,7 @@
38 placeholder="请输入角色描述" 39 placeholder="请输入角色描述"
39 :disabled="roleFormDisabled" 40 :disabled="roleFormDisabled"
40 v-if="!roleFormDisabled" 41 v-if="!roleFormDisabled"
42 + clearable
41 ></el-input> 43 ></el-input>
42 <div v-else>{{ roleData.remark }}</div> 44 <div v-else>{{ roleData.remark }}</div>
43 </el-form-item> 45 </el-form-item>
...@@ -152,8 +154,10 @@ export default { ...@@ -152,8 +154,10 @@ export default {
152 roleFormDisabled(){ 154 roleFormDisabled(){
153 this.treeData = this.treeDisabled(this.treeData) 155 this.treeData = this.treeDisabled(this.treeData)
154 }, 156 },
155 - drawer(){ 157 + drawer(val,oldVal){
156 - this.roleForm = this.roleData; 158 + if(val){
159 + this.roleForm = this.roleData;
160 + }
157 } 161 }
158 }, 162 },
159 methods: { 163 methods: {
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
7 <el-input 7 <el-input
8 v-model="formData.name" 8 v-model="formData.name"
9 placeholder="请输入角色名称" 9 placeholder="请输入角色名称"
10 + clearable
10 ></el-input> 11 ></el-input>
11 </el-form-item> 12 </el-form-item>
12 </el-col> 13 </el-col>
...@@ -18,13 +19,14 @@ ...@@ -18,13 +19,14 @@
18 range-separator="至" 19 range-separator="至"
19 start-placeholder="开始日期" 20 start-placeholder="开始日期"
20 end-placeholder="结束日期" 21 end-placeholder="结束日期"
22 + clearable
21 > 23 >
22 </el-date-picker> 24 </el-date-picker>
23 </el-form-item> 25 </el-form-item>
24 </el-col> 26 </el-col>
25 <el-col :span="6"> 27 <el-col :span="6">
26 <el-form-item label="状态"> 28 <el-form-item label="状态">
27 - <el-select v-model="formData.valid" placeholder="角色状态"> 29 + <el-select v-model="formData.valid" placeholder="角色状态" clearable>
28 <el-option label="开启" value="1"> </el-option> 30 <el-option label="开启" value="1"> </el-option>
29 <el-option label="关闭" value="1"> </el-option> 31 <el-option label="关闭" value="1"> </el-option>
30 </el-select> 32 </el-select>
...@@ -32,7 +34,7 @@ ...@@ -32,7 +34,7 @@
32 </el-col> 34 </el-col>
33 </el-row> 35 </el-row>
34 </el-form> 36 </el-form>
35 - <div style="margin: 0 20px"> 37 + <div style="margin:20px">
36 <el-button 38 <el-button
37 type="primary" 39 type="primary"
38 icon="el-icon-search" 40 icon="el-icon-search"
...@@ -52,8 +54,10 @@ ...@@ -52,8 +54,10 @@
52 :totalCount="total" 54 :totalCount="total"
53 :limitSize="formData.size" 55 :limitSize="formData.size"
54 :page="formData.page" 56 :page="formData.page"
57 + :pageSizes="[20,30,40,50]"
55 :loading="tableLoading" 58 :loading="tableLoading"
56 height="600" 59 height="600"
60 + @sizeChange="sizeChange"
57 @currentChange="currentChange" 61 @currentChange="currentChange"
58 > 62 >
59 <template> 63 <template>
...@@ -188,6 +192,11 @@ export default { ...@@ -188,6 +192,11 @@ export default {
188 }; 192 };
189 }, 193 },
190 created() { 194 created() {
195 + if(this.$store.state.tagsView.cachedViews.length == 0){
196 + this.selectRoleList();
197 + }
198 + },
199 + activated(){
191 this.selectRoleList(); 200 this.selectRoleList();
192 }, 201 },
193 methods: { 202 methods: {
...@@ -351,6 +360,10 @@ export default { ...@@ -351,6 +360,10 @@ export default {
351 this.formData.page = val.page; 360 this.formData.page = val.page;
352 this.selectRoleList(); 361 this.selectRoleList();
353 }, 362 },
363 + sizeChange(val){
364 + this.formData.size = val;
365 + this.selectRoleList()
366 + }
354 }, 367 },
355 }; 368 };
356 </script> 369 </script>
......
1 <template> 1 <template>
2 <div class="userDrawer"> 2 <div class="userDrawer">
3 <el-drawer 3 <el-drawer
4 - :data="userData"
5 :title="drawerTitle" 4 :title="drawerTitle"
6 :visible.sync="drawer" 5 :visible.sync="drawer"
7 direction="rtl" 6 direction="rtl"
...@@ -25,7 +24,8 @@ ...@@ -25,7 +24,8 @@
25 v-model.trim="userForm.loginName" 24 v-model.trim="userForm.loginName"
26 v-if="!userFormDisabled" 25 v-if="!userFormDisabled"
27 :disabled="drawerTitle != '新增用户'" 26 :disabled="drawerTitle != '新增用户'"
28 - size="mini" 27 + size="small"
28 + clearable
29 ></el-input> 29 ></el-input>
30 <div v-else>{{ userForm.loginName }}</div> 30 <div v-else>{{ userForm.loginName }}</div>
31 </el-form-item> 31 </el-form-item>
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
37 :disabled="userFormDisabled" 37 :disabled="userFormDisabled"
38 v-model.trim="userForm.username" 38 v-model.trim="userForm.username"
39 v-if="!userFormDisabled" 39 v-if="!userFormDisabled"
40 - size="mini" 40 + size="small"
41 + clearable
41 ></el-input> 42 ></el-input>
42 <div v-else>{{ userForm.username }}</div> 43 <div v-else>{{ userForm.username }}</div>
43 </el-form-item> 44 </el-form-item>
...@@ -61,7 +62,8 @@ ...@@ -61,7 +62,8 @@
61 v-model.trim="userForm.phone" 62 v-model.trim="userForm.phone"
62 :disabled="userFormDisabled" 63 :disabled="userFormDisabled"
63 v-if="!userFormDisabled" 64 v-if="!userFormDisabled"
64 - size="mini" 65 + size="small"
66 + clearable
65 ></el-input> 67 ></el-input>
66 <div v-else>{{ userForm.phone }}</div> 68 <div v-else>{{ userForm.phone }}</div>
67 </el-form-item> 69 </el-form-item>
...@@ -74,7 +76,8 @@ ...@@ -74,7 +76,8 @@
74 v-model.trim="userForm.email" 76 v-model.trim="userForm.email"
75 :disabled="userFormDisabled" 77 :disabled="userFormDisabled"
76 v-if="!userFormDisabled" 78 v-if="!userFormDisabled"
77 - size="mini" 79 + size="small"
80 + clearable
78 ></el-input> 81 ></el-input>
79 <div v-else>{{ userForm.email }}</div> 82 <div v-else>{{ userForm.email }}</div>
80 </el-form-item> 83 </el-form-item>
...@@ -104,19 +107,11 @@ ...@@ -104,19 +107,11 @@
104 label="所属口岸:" 107 label="所属口岸:"
105 prop="portName" 108 prop="portName"
106 > 109 >
107 - <!-- <el-checkbox-group v-model="port" :disabled="userFormDisabled">
108 - <el-checkbox
109 - v-for="item in portNameList"
110 - :label="item.englishName"
111 - :key="item.id"
112 - >{{ item.englishName }}</el-checkbox
113 - >
114 - </el-checkbox-group> -->
115 <el-select 110 <el-select
116 placeholder="不限" 111 placeholder="不限"
117 v-model="port" 112 v-model="port"
118 :disabled="userFormDisabled" 113 :disabled="userFormDisabled"
119 - size="mini" 114 + size="small"
120 style="width: 100%" 115 style="width: 100%"
121 multiple 116 multiple
122 clearable 117 clearable
...@@ -155,7 +150,8 @@ ...@@ -155,7 +150,8 @@
155 placeholder="备注" 150 placeholder="备注"
156 :disabled="userFormDisabled" 151 :disabled="userFormDisabled"
157 v-if="!userFormDisabled" 152 v-if="!userFormDisabled"
158 - size="mini" 153 + size="small"
154 + clearable
159 ></el-input> 155 ></el-input>
160 <div v-else>{{ userForm.remark }}</div> 156 <div v-else>{{ userForm.remark }}</div>
161 </el-form-item> 157 </el-form-item>
...@@ -266,9 +262,11 @@ export default { ...@@ -266,9 +262,11 @@ export default {
266 getRoleList({ size: null, page: null }) 262 getRoleList({ size: null, page: null })
267 .then((res) => { 263 .then((res) => {
268 if (res.code === 200) { 264 if (res.code === 200) {
269 - if(item.valid == 1){ 265 + res.data.list.map(item=>{
270 - this.roleList.push(item) 266 + if(item.valid == 1){
271 - } 267 + this.roleList.push(item)
268 + }
269 + })
272 } else { 270 } else {
273 this.$message({ 271 this.$message({
274 message: res.msg, 272 message: res.msg,
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
7 <el-input 7 <el-input
8 placeholder="请输入用户名称" 8 placeholder="请输入用户名称"
9 v-model="formData.username" 9 v-model="formData.username"
10 + clearable
10 ></el-input> 11 ></el-input>
11 </el-form-item> 12 </el-form-item>
12 </el-col> 13 </el-col>
...@@ -15,12 +16,13 @@ ...@@ -15,12 +16,13 @@
15 <el-input 16 <el-input
16 placeholder="请输入用户名称" 17 placeholder="请输入用户名称"
17 v-model="formData.phone" 18 v-model="formData.phone"
19 + clearable
18 ></el-input> 20 ></el-input>
19 </el-form-item> 21 </el-form-item>
20 </el-col> 22 </el-col>
21 <el-col :span="6"> 23 <el-col :span="6">
22 <el-form-item label="状态"> 24 <el-form-item label="状态">
23 - <el-select placeholder="用户状态" v-model="formData.isValid"> 25 + <el-select placeholder="用户状态" v-model="formData.isValid" clearable>
24 <el-option label="开启" value="1"> </el-option> 26 <el-option label="开启" value="1"> </el-option>
25 <el-option label="关闭" value="2"> </el-option> 27 <el-option label="关闭" value="2"> </el-option>
26 </el-select> 28 </el-select>
...@@ -48,7 +50,9 @@ ...@@ -48,7 +50,9 @@
48 :totalCount="total" 50 :totalCount="total"
49 :loading="loading" 51 :loading="loading"
50 :page="formData.page" 52 :page="formData.page"
53 + :pageSizes="[20,30,40,50]"
51 height="600" 54 height="600"
55 + @sizeChange="sizeChange"
52 @currentChange="currentChange" 56 @currentChange="currentChange"
53 > 57 >
54 <template> 58 <template>
...@@ -236,6 +240,11 @@ export default { ...@@ -236,6 +240,11 @@ export default {
236 }; 240 };
237 }, 241 },
238 created() { 242 created() {
243 + if(this.$store.state.tagsView.cachedViews.length == 0){
244 + this.selectUser();
245 + }
246 + },
247 + activated(){
239 this.selectUser(); 248 this.selectUser();
240 }, 249 },
241 methods: { 250 methods: {
...@@ -376,6 +385,11 @@ export default { ...@@ -376,6 +385,11 @@ export default {
376 this.formData.page = val.page; 385 this.formData.page = val.page;
377 this.selectUser(); 386 this.selectUser();
378 }, 387 },
388 +
389 + sizeChange(val){
390 + this.formData.size = val;
391 + this.selectUser()
392 + }
379 }, 393 },
380 }; 394 };
381 </script> 395 </script>
......