Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
9de4a43d 2 parents 85ea5627 114be4f6

Merge branch 'test' into uat

Inline Side-by-side
Showing 22 changed files with 209 additions and 191 deletions
...@@ -261,7 +261,7 @@ export default { ...@@ -261,7 +261,7 @@ export default {
261 size: 100, 261 size: 100,
262 allWeight: 0, 262 allWeight: 0,
263 allQty: 0, 263 allQty: 0,
264 - tableHeight: 300, 264 + tableHeight: null,
265 dialogVisible: false, 265 dialogVisible: false,
266 shiftKey: false, 266 shiftKey: false,
267 createDate: null, 267 createDate: null,
...@@ -282,14 +282,14 @@ export default { ...@@ -282,14 +282,14 @@ export default {
282 if (this.$store.state.tagsView.cachedViews.length == 0) { 282 if (this.$store.state.tagsView.cachedViews.length == 0) {
283 this.select(); 283 this.select();
284 } 284 }
285 - this.$nextTick(()=>{ 285 + // this.$nextTick(()=>{
286 - let height = window.innerHeight - this.$refs.form.$el.offsetHeight - 60; 286 + // let height = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
287 - if(height < 300){ 287 + // if(height < 300){
288 - this.tableHeight = 300; 288 + // this.tableHeight = 300;
289 - }else{ 289 + // }else{
290 - this.tableHeight = height; 290 + // this.tableHeight = height;
291 - } 291 + // }
292 - }) 292 + // })
293 }, 293 },
294 activated() { 294 activated() {
295 this.tableSelection = [] 295 this.tableSelection = []
...@@ -311,6 +311,7 @@ export default { ...@@ -311,6 +311,7 @@ export default {
311 this.shiftKey = false; 311 this.shiftKey = false;
312 } 312 }
313 }); 313 });
314 + this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60
314 }, 315 },
315 methods: { 316 methods: {
316 //查询条件 317 //查询条件
......
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
95 colData: {}, 95 colData: {},
96 curPage: 1, 96 curPage: 1,
97 total: 0, 97 total: 0,
98 - tableHeight: 300, 98 + tableHeight: null,
99 open: false, 99 open: false,
100 loading: false, 100 loading: false,
101 }; 101 };
...@@ -104,17 +104,17 @@ export default { ...@@ -104,17 +104,17 @@ export default {
104 if (this.$store.state.tagsView.cachedViews.length == 0) { 104 if (this.$store.state.tagsView.cachedViews.length == 0) {
105 this.getList(); 105 this.getList();
106 } 106 }
107 - this.$nextTick(()=>{ 107 + // this.$nextTick(()=>{
108 - let height = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200; 108 + // let height = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
109 - if(height < 300){ 109 + // if(height < 300){
110 - this.tableHeight = 300; 110 + // this.tableHeight = 300;
111 - }else{ 111 + // }else{
112 - this.tableHeight = height; 112 + // this.tableHeight = height;
113 - } 113 + // }
114 - }) 114 + // })
115 }, 115 },
116 mounted() { 116 mounted() {
117 - 117 + this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200
118 }, 118 },
119 activated() { 119 activated() {
120 this.getList() 120 this.getList()
......
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
187 // 总条数 187 // 总条数
188 total: 0, 188 total: 0,
189 //table高度 189 //table高度
190 - tableHeight: 300, 190 + tableHeight: null,
191 // 原航班规则数据 191 // 原航班规则数据
192 sourceFlightRulesList: [], 192 sourceFlightRulesList: [],
193 //目的航班数据 193 //目的航班数据
...@@ -247,16 +247,17 @@ export default { ...@@ -247,16 +247,17 @@ export default {
247 if (this.$store.state.tagsView.cachedViews.length == 0) { 247 if (this.$store.state.tagsView.cachedViews.length == 0) {
248 this.findSourceFlightRules(); 248 this.findSourceFlightRules();
249 } 249 }
250 - this.$nextTick(()=>{ 250 + // this.$nextTick(()=>{
251 - let height = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200; 251 + // let height = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
252 - if(height < 300){ 252 + // if(height < 300){
253 - this.tableHeight = 300; 253 + // this.tableHeight = 300;
254 - }else{ 254 + // }else{
255 - this.tableHeight = height; 255 + // this.tableHeight = height;
256 - } 256 + // }
257 - }) 257 + // })
258 }, 258 },
259 mounted() { 259 mounted() {
260 + this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200
260 }, 261 },
261 activated() { 262 activated() {
262 this.findSourceFlightRules(); 263 this.findSourceFlightRules();
......
...@@ -99,21 +99,21 @@ export default { ...@@ -99,21 +99,21 @@ export default {
99 },//表单规则 99 },//表单规则
100 dialogVisible: false, 100 dialogVisible: false,
101 total: 0, 101 total: 0,
102 - tableHeight: 300, 102 + tableHeight: null,
103 loading: false, 103 loading: false,
104 tableLoading: false, 104 tableLoading: false,
105 }; 105 };
106 }, 106 },
107 created() { 107 created() {
108 this.preQuery(1) 108 this.preQuery(1)
109 - this.$nextTick(()=>{ 109 + // this.$nextTick(()=>{
110 - let height = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300; 110 + // let height = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
111 - if(height < 300){ 111 + // if(height < 300){
112 - this.tableHeight = 300; 112 + // this.tableHeight = 300;
113 - }else{ 113 + // }else{
114 - this.tableHeight = height; 114 + // this.tableHeight = height;
115 - } 115 + // }
116 - }) 116 + // })
117 }, 117 },
118 activated() { 118 activated() {
119 if (this.flightData.length > 0) { 119 if (this.flightData.length > 0) {
...@@ -121,6 +121,7 @@ export default { ...@@ -121,6 +121,7 @@ export default {
121 } 121 }
122 }, 122 },
123 mounted() { 123 mounted() {
124 + this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300
124 }, 125 },
125 methods: { 126 methods: {
126 //搜索 127 //搜索
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 </el-switch> 53 </el-switch>
54 </div> 54 </div>
55 </el-form> 55 </el-form>
56 - <el-table height="300" highlight-current-row border stripe v-loading="loading" :data="tableData"> 56 + <el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="tableData">
57 <el-table-column label="运单号" align="center" prop="waybillNo" /> 57 <el-table-column label="运单号" align="center" prop="waybillNo" />
58 <el-table-column label="申报类别" align="center" prop="typeName" /> 58 <el-table-column label="申报类别" align="center" prop="typeName" />
59 <el-table-column label="件数" align="center" prop="qty" width="70" /> 59 <el-table-column label="件数" align="center" prop="qty" width="70" />
......
...@@ -466,7 +466,7 @@ export default { ...@@ -466,7 +466,7 @@ export default {
466 //总条数 466 //总条数
467 total: 0, 467 total: 0,
468 //表格高度 468 //表格高度
469 - tableHeight: 250, 469 + tableHeight: null,
470 //新增修改查看规则弹出层 470 //新增修改查看规则弹出层
471 open: false, 471 open: false,
472 //是否显示查看目的航班弹出层 472 //是否显示查看目的航班弹出层
...@@ -482,14 +482,14 @@ export default { ...@@ -482,14 +482,14 @@ export default {
482 this.findFltConditionData(); 482 this.findFltConditionData();
483 this.findAllFltData(); 483 this.findAllFltData();
484 } 484 }
485 - this.$nextTick(()=>{ 485 + // this.$nextTick(()=>{
486 - let height = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120; 486 + // let height = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
487 - if(height < 300){ 487 + // if(height < 300){
488 - this.tableHeight = 300; 488 + // this.tableHeight = 300;
489 - }else{ 489 + // }else{
490 - this.tableHeight = height; 490 + // this.tableHeight = height;
491 - } 491 + // }
492 - }) 492 + // })
493 }, 493 },
494 activated() { 494 activated() {
495 this.ids = [] 495 this.ids = []
...@@ -510,6 +510,7 @@ export default { ...@@ -510,6 +510,7 @@ export default {
510 this.shiftKey = false; 510 this.shiftKey = false;
511 } 511 }
512 }); 512 });
513 + this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
513 }, 514 },
514 methods: { 515 methods: {
515 //输入航班号后 516 //输入航班号后
......
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
81 checkData: [], 81 checkData: [],
82 fileList: [], 82 fileList: [],
83 errorData: [], 83 errorData: [],
84 - tableHeight: 300, 84 + tableHeight: null,
85 totalCount: 0, 85 totalCount: 0,
86 openStatus: '', 86 openStatus: '',
87 loading: false, 87 loading: false,
...@@ -89,16 +89,17 @@ export default { ...@@ -89,16 +89,17 @@ export default {
89 } 89 }
90 }, 90 },
91 created() { 91 created() {
92 - this.$nextTick(()=>{ 92 + // this.$nextTick(()=>{
93 - let height = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200; 93 + // let height = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
94 - if(height < 300){ 94 + // if(height < 300){
95 - this.tableHeight = 300; 95 + // this.tableHeight = 300;
96 - }else{ 96 + // }else{
97 - this.tableHeight = height; 97 + // this.tableHeight = height;
98 - } 98 + // }
99 - }) 99 + // })
100 }, 100 },
101 mounted() { 101 mounted() {
102 + this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200
102 this.selection(1) 103 this.selection(1)
103 }, 104 },
104 watch: { 105 watch: {
......
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
81 checkData: [], 81 checkData: [],
82 fileList: [], 82 fileList: [],
83 errorData: [], 83 errorData: [],
84 - tableHeight: 300, 84 + tableHeight: null,
85 totalCount: 0, 85 totalCount: 0,
86 openStatus: '', 86 openStatus: '',
87 loading: false, 87 loading: false,
...@@ -89,16 +89,17 @@ export default { ...@@ -89,16 +89,17 @@ export default {
89 } 89 }
90 }, 90 },
91 created() { 91 created() {
92 - this.$nextTick(()=>{ 92 + // this.$nextTick(()=>{
93 - let height = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200; 93 + // let height = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
94 - if(height < 300){ 94 + // if(height < 300){
95 - this.tableHeight = 300; 95 + // this.tableHeight = 300;
96 - }else{ 96 + // }else{
97 - this.tableHeight = height; 97 + // this.tableHeight = height;
98 - } 98 + // }
99 - }) 99 + // })
100 }, 100 },
101 mounted() { 101 mounted() {
102 + this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200
102 this.selection(1) 103 this.selection(1)
103 }, 104 },
104 watch: { 105 watch: {
......
...@@ -64,23 +64,24 @@ export default { ...@@ -64,23 +64,24 @@ export default {
64 tableData: [], 64 tableData: [],
65 tableHeader: this.tableHeaders['goodsStationFlight'], 65 tableHeader: this.tableHeaders['goodsStationFlight'],
66 checkData: [], 66 checkData: [],
67 - tableHeight: 300, 67 + tableHeight: null,
68 totalCount: 0, 68 totalCount: 0,
69 loading: false, 69 loading: false,
70 open: false, 70 open: false,
71 } 71 }
72 }, 72 },
73 created() { 73 created() {
74 - this.$nextTick(()=>{ 74 + // this.$nextTick(()=>{
75 - let height = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200; 75 + // let height = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
76 - if(height < 300){ 76 + // if(height < 300){
77 - this.tableHeight = 300; 77 + // this.tableHeight = 300;
78 - }else{ 78 + // }else{
79 - this.tableHeight = height; 79 + // this.tableHeight = height;
80 - } 80 + // }
81 - }) 81 + // })
82 }, 82 },
83 mounted() { 83 mounted() {
84 + this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200
84 this.selection(1) 85 this.selection(1)
85 }, 86 },
86 watch: { 87 watch: {
......
...@@ -353,7 +353,7 @@ export default { ...@@ -353,7 +353,7 @@ export default {
353 limitSize: 100, //无限制-1 353 limitSize: 100, //无限制-1
354 page: 1, 354 page: 1,
355 progress: 0, 355 progress: 0,
356 - tableHeight: 250, 356 + tableHeight: null,
357 dialogVisible: false, 357 dialogVisible: false,
358 openView: false, 358 openView: false,
359 openTransfer: false, 359 openTransfer: false,
...@@ -368,14 +368,14 @@ export default { ...@@ -368,14 +368,14 @@ export default {
368 this.tableHeader = this.tableHeaders['cargo'] 368 this.tableHeader = this.tableHeaders['cargo']
369 } 369 }
370 this.select(0,'create') 370 this.select(0,'create')
371 - this.$nextTick(()=>{ 371 + // this.$nextTick(()=>{
372 - let height = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50; 372 + // let height = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50;
373 - if(height < 300){ 373 + // if(height < 300){
374 - this.tableHeight = 300; 374 + // this.tableHeight = 300;
375 - }else{ 375 + // }else{
376 - this.tableHeight = height; 376 + // this.tableHeight = height;
377 - } 377 + // }
378 - }) 378 + // })
379 }, 379 },
380 380
381 activated() { 381 activated() {
...@@ -449,6 +449,7 @@ export default { ...@@ -449,6 +449,7 @@ export default {
449 this.shiftKey = false; 449 this.shiftKey = false;
450 } 450 }
451 }); 451 });
452 + this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
452 }, 453 },
453 watch: { 454 watch: {
454 $route: { 455 $route: {
......
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
96 totalWeight: 0,//航班总重量 96 totalWeight: 0,//航班总重量
97 allocationWeight: 0,//航班已配重量 97 allocationWeight: 0,//航班已配重量
98 type: "", 98 type: "",
99 - tableHeight: 300, 99 + tableHeight: null,
100 total: 0, 100 total: 0,
101 loading: false, 101 loading: false,
102 }; 102 };
...@@ -104,19 +104,20 @@ export default { ...@@ -104,19 +104,20 @@ export default {
104 created() { 104 created() {
105 this.selectData.fltDate = this.nowDate(); 105 this.selectData.fltDate = this.nowDate();
106 this.getFltKindId() 106 this.getFltKindId()
107 - this.$nextTick(()=>{ 107 + // this.$nextTick(()=>{
108 - let height = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350; 108 + // let height = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350;
109 - if(height < 300){ 109 + // if(height < 300){
110 - this.tableHeight = 300; 110 + // this.tableHeight = 300;
111 - }else{ 111 + // }else{
112 - this.tableHeight = height; 112 + // this.tableHeight = height;
113 - } 113 + // }
114 - }) 114 + // })
115 }, 115 },
116 // activated() { 116 // activated() {
117 // this.getFlight() 117 // this.getFlight()
118 // }, 118 // },
119 mounted() { 119 mounted() {
120 + this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350
120 this.getFlight() 121 this.getFlight()
121 }, 122 },
122 methods: { 123 methods: {
......
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
77 tableData: [], 77 tableData: [],
78 errorData: [], 78 errorData: [],
79 tableHeaders: this.tableHeaders['flightToArea'], 79 tableHeaders: this.tableHeaders['flightToArea'],
80 - tableHeight: 300, 80 + tableHeight: null,
81 total: 0, 81 total: 0,
82 flightType: [], 82 flightType: [],
83 form: { 83 form: {
...@@ -97,16 +97,17 @@ export default { ...@@ -97,16 +97,17 @@ export default {
97 }; 97 };
98 }, 98 },
99 created() { 99 created() {
100 - this.$nextTick(()=>{ 100 + // this.$nextTick(()=>{
101 - let height = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170; 101 + // let height = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
102 - if(height < 300){ 102 + // if(height < 300){
103 - this.tableHeight = 300; 103 + // this.tableHeight = 300;
104 - }else{ 104 + // }else{
105 - this.tableHeight = height; 105 + // this.tableHeight = height;
106 - } 106 + // }
107 - }) 107 + // })
108 }, 108 },
109 mounted() { 109 mounted() {
110 + this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170
110 this.selection(1) 111 this.selection(1)
111 }, 112 },
112 activated() { 113 activated() {
......
...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
129 tableHeader: this.tableHeaders['preMdeSelect'], 129 tableHeader: this.tableHeaders['preMdeSelect'],
130 accsDate: [], 130 accsDate: [],
131 valueFormat: "yyyy-MM-dd", 131 valueFormat: "yyyy-MM-dd",
132 - tableHeight: 250, 132 + tableHeight: null,
133 tableLoading: false, 133 tableLoading: false,
134 downloading: false, 134 downloading: false,
135 totalCount: 0, 135 totalCount: 0,
...@@ -137,16 +137,17 @@ export default { ...@@ -137,16 +137,17 @@ export default {
137 }, 137 },
138 created() { 138 created() {
139 this.selectOptionData() 139 this.selectOptionData()
140 - this.$nextTick(()=>{ 140 + // this.$nextTick(()=>{
141 - let height = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150; 141 + // let height = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
142 - if(height < 300){ 142 + // if(height < 300){
143 - this.tableHeight = 300; 143 + // this.tableHeight = 300;
144 - }else{ 144 + // }else{
145 - this.tableHeight = height; 145 + // this.tableHeight = height;
146 - } 146 + // }
147 - }) 147 + // })
148 }, 148 },
149 mounted() { 149 mounted() {
150 + this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150
150 this.select(0) 151 this.select(0)
151 }, 152 },
152 watch: { 153 watch: {
......
...@@ -106,16 +106,17 @@ export default { ...@@ -106,16 +106,17 @@ export default {
106 this.formData.pickUpDate = this.nowDate() 106 this.formData.pickUpDate = this.nowDate()
107 this.getOption() 107 this.getOption()
108 this.select() 108 this.select()
109 - this.$nextTick(()=>{ 109 + // this.$nextTick(()=>{
110 - let height = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240; 110 + // let height = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240;
111 - if(height < 300){ 111 + // if(height < 300){
112 - this.tableHeight = 300; 112 + // this.tableHeight = 300;
113 - }else{ 113 + // }else{
114 - this.tableHeight = height; 114 + // this.tableHeight = height;
115 - } 115 + // }
116 - }) 116 + // })
117 }, 117 },
118 activated() { 118 activated() {
119 + this.tableHeight = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240
119 this.select() 120 this.select()
120 }, 121 },
121 mounted() { 122 mounted() {
......
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
78 tableData: [], 78 tableData: [],
79 errorData: [], 79 errorData: [],
80 tableHeaders: this.tableHeaders['ursaToArea'], 80 tableHeaders: this.tableHeaders['ursaToArea'],
81 - tableHeight: 300, 81 + tableHeight: null,
82 total: 0, 82 total: 0,
83 flightType: [], 83 flightType: [],
84 form: { 84 form: {
...@@ -98,16 +98,17 @@ export default { ...@@ -98,16 +98,17 @@ export default {
98 }; 98 };
99 }, 99 },
100 created() { 100 created() {
101 - this.$nextTick(()=>{ 101 + // this.$nextTick(()=>{
102 - let height = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170; 102 + // let height = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
103 - if(height < 300){ 103 + // if(height < 300){
104 - this.tableHeight = 300; 104 + // this.tableHeight = 300;
105 - }else{ 105 + // }else{
106 - this.tableHeight = height; 106 + // this.tableHeight = height;
107 - } 107 + // }
108 - }) 108 + // })
109 }, 109 },
110 mounted() { 110 mounted() {
111 + this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170
111 this.selection(1) 112 this.selection(1)
112 }, 113 },
113 activated() { 114 activated() {
......
...@@ -204,7 +204,7 @@ export default { ...@@ -204,7 +204,7 @@ export default {
204 addDictionary: {},//选择数据 204 addDictionary: {},//选择数据
205 nowSelect: [], 205 nowSelect: [],
206 tableName: '', 206 tableName: '',
207 - tableHeight: 300, 207 + tableHeight: null,
208 total: 0, 208 total: 0,
209 status: null, 209 status: null,
210 loading: false, 210 loading: false,
...@@ -213,14 +213,14 @@ export default { ...@@ -213,14 +213,14 @@ export default {
213 }, 213 },
214 created() { 214 created() {
215 this.dictNameSelect() 215 this.dictNameSelect()
216 - this.$nextTick(()=>{ 216 + // this.$nextTick(()=>{
217 - let height = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270; 217 + // let height = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270;
218 - if(height < 300){ 218 + // if(height < 300){
219 - this.tableHeight = 300; 219 + // this.tableHeight = 300;
220 - }else{ 220 + // }else{
221 - this.tableHeight = height; 221 + // this.tableHeight = height;
222 - } 222 + // }
223 - }) 223 + // })
224 }, 224 },
225 activated() { 225 activated() {
226 // if (this.$store.state.tagsView.cachedViews.length > 0) { 226 // if (this.$store.state.tagsView.cachedViews.length > 0) {
...@@ -228,7 +228,7 @@ export default { ...@@ -228,7 +228,7 @@ export default {
228 // } 228 // }
229 }, 229 },
230 mounted() { 230 mounted() {
231 - 231 + this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
232 }, 232 },
233 filters: { 233 filters: {
234 // 是否为ET86航线 234 // 是否为ET86航线
......
...@@ -77,23 +77,24 @@ export default { ...@@ -77,23 +77,24 @@ export default {
77 roleFormDisabled: false, 77 roleFormDisabled: false,
78 tableLoading: false, 78 tableLoading: false,
79 total: 0, 79 total: 0,
80 - tableHeight: 300 80 + tableHeight: null
81 }; 81 };
82 }, 82 },
83 created() { 83 created() {
84 if (this.$store.state.tagsView.cachedViews.length == 0) { 84 if (this.$store.state.tagsView.cachedViews.length == 0) {
85 this.selectRoleList(); 85 this.selectRoleList();
86 } 86 }
87 - this.$nextTick(()=>{ 87 + // this.$nextTick(()=>{
88 - let height = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250; 88 + // let height = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250;
89 - if(height < 300){ 89 + // if(height < 300){
90 - this.tableHeight = 300; 90 + // this.tableHeight = 300;
91 - }else{ 91 + // }else{
92 - this.tableHeight = height; 92 + // this.tableHeight = height;
93 - } 93 + // }
94 - }) 94 + // })
95 }, 95 },
96 mounted() { 96 mounted() {
97 + this.tableHeight = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250
97 }, 98 },
98 activated() { 99 activated() {
99 this.selectRoleList(); 100 this.selectRoleList();
......
...@@ -71,23 +71,24 @@ export default { ...@@ -71,23 +71,24 @@ export default {
71 serviceCodeList: [] 71 serviceCodeList: []
72 }, 72 },
73 dialogStatus: 'add', 73 dialogStatus: 'add',
74 - tableHeight: 300, 74 + tableHeight: null,
75 totalCount: 0, 75 totalCount: 0,
76 dialogVisible: false, 76 dialogVisible: false,
77 loading: false, 77 loading: false,
78 } 78 }
79 }, 79 },
80 created() { 80 created() {
81 - this.$nextTick(()=>{ 81 + // this.$nextTick(()=>{
82 - let height = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250; 82 + // let height = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250;
83 - if(height < 300){ 83 + // if(height < 300){
84 - this.tableHeight = 300; 84 + // this.tableHeight = 300;
85 - }else{ 85 + // }else{
86 - this.tableHeight = height; 86 + // this.tableHeight = height;
87 - } 87 + // }
88 - }) 88 + // })
89 }, 89 },
90 mounted() { 90 mounted() {
91 + this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250
91 this.selection(1) 92 this.selection(1)
92 }, 93 },
93 methods: { 94 methods: {
......
...@@ -104,23 +104,24 @@ export default { ...@@ -104,23 +104,24 @@ export default {
104 drawerTitle: "", 104 drawerTitle: "",
105 total: 0, 105 total: 0,
106 loading: false, 106 loading: false,
107 - tableHeight: 300 107 + tableHeight: null
108 }; 108 };
109 }, 109 },
110 created() { 110 created() {
111 if (this.$store.state.tagsView.cachedViews.length == 0) { 111 if (this.$store.state.tagsView.cachedViews.length == 0) {
112 this.selectUser(); 112 this.selectUser();
113 } 113 }
114 - this.$nextTick(()=>{ 114 + // this.$nextTick(()=>{
115 - let height = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250; 115 + // let height = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
116 - if(height < 300){ 116 + // if(height < 300){
117 - this.tableHeight = 300; 117 + // this.tableHeight = 300;
118 - }else{ 118 + // }else{
119 - this.tableHeight = height; 119 + // this.tableHeight = height;
120 - } 120 + // }
121 - }) 121 + // })
122 }, 122 },
123 mounted() { 123 mounted() {
124 + this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250
124 }, 125 },
125 activated() { 126 activated() {
126 this.selectUser(); 127 this.selectUser();
......
...@@ -55,23 +55,24 @@ export default { ...@@ -55,23 +55,24 @@ export default {
55 }, 55 },
56 data: [], 56 data: [],
57 tableHeader: this.tableHeaders['archiveData'], 57 tableHeader: this.tableHeaders['archiveData'],
58 - tableHeight: 300, 58 + tableHeight: null,
59 total: 0, 59 total: 0,
60 loading: false, 60 loading: false,
61 } 61 }
62 }, 62 },
63 created() { 63 created() {
64 this.selectLog() 64 this.selectLog()
65 - this.$nextTick(()=>{ 65 + // this.$nextTick(()=>{
66 - let height = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200; 66 + // let height = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200;
67 - if(height < 300){ 67 + // if(height < 300){
68 - this.tableHeight = 300; 68 + // this.tableHeight = 300;
69 - }else{ 69 + // }else{
70 - this.tableHeight = height; 70 + // this.tableHeight = height;
71 - } 71 + // }
72 - }) 72 + // })
73 }, 73 },
74 mounted() { 74 mounted() {
75 + this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200
75 }, 76 },
76 methods: { 77 methods: {
77 selectLog(val) { 78 selectLog(val) {
......
...@@ -115,21 +115,21 @@ export default { ...@@ -115,21 +115,21 @@ export default {
115 selectDate: null, 115 selectDate: null,
116 createTimes: [], 116 createTimes: [],
117 total: 0, 117 total: 0,
118 - tableHeight: 300, 118 + tableHeight: null,
119 loading: false, 119 loading: false,
120 valueFormat: "yyyy-MM-dd", 120 valueFormat: "yyyy-MM-dd",
121 }; 121 };
122 }, 122 },
123 created() { 123 created() {
124 this.selectForm.createTime = this.nowDate(); 124 this.selectForm.createTime = this.nowDate();
125 - this.$nextTick(()=>{ 125 + // this.$nextTick(()=>{
126 - let height = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130; 126 + // let height = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
127 - if(height < 300){ 127 + // if(height < 300){
128 - this.tableHeight = 300; 128 + // this.tableHeight = 300;
129 - }else{ 129 + // }else{
130 - this.tableHeight = height; 130 + // this.tableHeight = height;
131 - } 131 + // }
132 - }) 132 + // })
133 }, 133 },
134 activated() { 134 activated() {
135 this.selectDMData(); 135 this.selectDMData();
......
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
96 children: 'children', 96 children: 'children',
97 label: 'label' 97 label: 'label'
98 }, 98 },
99 - tableHeight: 300, 99 + tableHeight: null,
100 total: 0, 100 total: 0,
101 loading: false 101 loading: false
102 } 102 }
...@@ -104,19 +104,20 @@ export default { ...@@ -104,19 +104,20 @@ export default {
104 created() { 104 created() {
105 this.getModule() 105 this.getModule()
106 this.selectLog(1) 106 this.selectLog(1)
107 - this.$nextTick(()=>{ 107 + // this.$nextTick(()=>{
108 - let height = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240; 108 + // let height = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240;
109 - if(height < 300){ 109 + // if(height < 300){
110 - this.tableHeight = 300; 110 + // this.tableHeight = 300;
111 - }else{ 111 + // }else{
112 - this.tableHeight = height; 112 + // this.tableHeight = height;
113 - } 113 + // }
114 - }) 114 + // })
115 }, 115 },
116 activated() { 116 activated() {
117 this.selectLog(); 117 this.selectLog();
118 }, 118 },
119 mounted() { 119 mounted() {
120 + this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240
120 }, 121 },
121 methods: { 122 methods: {
122 getModule() { 123 getModule() {
......