Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
6fb45477 1 parent 2b9acb98

【IMAC-ET86】配舱设置-新增ET86配舱

Inline Side-by-side
Showing 23 changed files with 68 additions and 69 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: null, 264 + tableHeight: 300,
265 dialogVisible: false, 265 dialogVisible: false,
266 shiftKey: false, 266 shiftKey: false,
267 createDate: null, 267 createDate: null,
...@@ -303,7 +303,7 @@ export default { ...@@ -303,7 +303,7 @@ export default {
303 this.shiftKey = false; 303 this.shiftKey = false;
304 } 304 }
305 }); 305 });
306 - this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60 306 + // this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
307 }, 307 },
308 methods: { 308 methods: {
309 //查询条件 309 //查询条件
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
149 <el-input 149 <el-input
150 v-model.trim="queryForm.minWeight" 150 v-model.trim="queryForm.minWeight"
151 clearable 151 clearable
152 - placeholder="请输入最小重量" 152 + placeholder="最小重量"
153 @blur="inputBlur('minWeight')" 153 @blur="inputBlur('minWeight')"
154 ></el-input> 154 ></el-input>
155 <span ref="minWeight" class="el-form-item__error"></span> 155 <span ref="minWeight" class="el-form-item__error"></span>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
159 <el-input 159 <el-input
160 v-model.trim="queryForm.maxWeight" 160 v-model.trim="queryForm.maxWeight"
161 clearable 161 clearable
162 - placeholder="请输入最大重量" 162 + placeholder="最大重量"
163 @blur="inputBlur('maxWeight')" 163 @blur="inputBlur('maxWeight')"
164 ></el-input> 164 ></el-input>
165 <span ref="maxWeight" class="el-form-item__error"></span> 165 <span ref="maxWeight" class="el-form-item__error"></span>
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
173 <el-input 173 <el-input
174 v-model.trim="queryForm.minNumOfPieces" 174 v-model.trim="queryForm.minNumOfPieces"
175 clearable 175 clearable
176 - placeholder="请输入最少件数" 176 + placeholder="最少件数"
177 @blur="inputBlur('minNumOfPieces')" 177 @blur="inputBlur('minNumOfPieces')"
178 ></el-input> 178 ></el-input>
179 <span ref="minNumOfPieces" class="el-form-item__error"></span> 179 <span ref="minNumOfPieces" class="el-form-item__error"></span>
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
183 <el-input 183 <el-input
184 v-model.trim="queryForm.maxNumOfPieces" 184 v-model.trim="queryForm.maxNumOfPieces"
185 clearable 185 clearable
186 - placeholder="请输入最多件数" 186 + placeholder="最多件数"
187 @blur="inputBlur('maxNumOfPieces')" 187 @blur="inputBlur('maxNumOfPieces')"
188 ></el-input> 188 ></el-input>
189 <span ref="maxNumOfPieces" class="el-form-item__error"></span> 189 <span ref="maxNumOfPieces" class="el-form-item__error"></span>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
242 242
243 <el-col :span="24"> 243 <el-col :span="24">
244 <el-form-item label="类别Class"> 244 <el-form-item label="类别Class">
245 - <el-card shadow="never" style="width: 95%"> 245 + <el-card shadow="never">
246 <el-checkbox-group 246 <el-checkbox-group
247 v-model="queryForm.checkboxClsssType" 247 v-model="queryForm.checkboxClsssType"
248 @change="checkboxSingleName" 248 @change="checkboxSingleName"
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
283 <el-input 283 <el-input
284 v-model.trim="queryForm.minCustomVal" 284 v-model.trim="queryForm.minCustomVal"
285 clearable 285 clearable
286 - placeholder="请输入最小申报价值" 286 + placeholder="最小申报价值"
287 @blur="inputBlur('minCustomVal')" 287 @blur="inputBlur('minCustomVal')"
288 ></el-input> 288 ></el-input>
289 <span ref="minCustomVal" class="el-form-item__error"></span> 289 <span ref="minCustomVal" class="el-form-item__error"></span>
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
293 <el-input 293 <el-input
294 v-model.trim="queryForm.maxCustomVal" 294 v-model.trim="queryForm.maxCustomVal"
295 clearable 295 clearable
296 - placeholder="请输入最大申报价值" 296 + placeholder="最大申报价值"
297 @blur="inputBlur('maxCustomVal')" 297 @blur="inputBlur('maxCustomVal')"
298 ></el-input> 298 ></el-input>
299 <span ref="maxCustomVal" class="el-form-item__error"></span> 299 <span ref="maxCustomVal" class="el-form-item__error"></span>
...@@ -386,18 +386,8 @@ export default { ...@@ -386,18 +386,8 @@ export default {
386 this.getAllDictData(); 386 this.getAllDictData();
387 this.getEdit(); 387 this.getEdit();
388 this.PostFindDestinationFltRuleByFlightNo(); 388 this.PostFindDestinationFltRuleByFlightNo();
389 - /*
390 - 件数：正整数大于0 且小于1000
391 - 重量：正数保留3位小数
392 - 申报价值: 正数保留2位小数
393 - 航班号: 不能输入纯数字或者纯字母，以字母或者数字开头，不能有空格符或者特殊符号
394 - URSA: 不能输入纯数字或者纯字母，以字母或开头，不能有空格符指定特殊符号
395 - ^(([1-9]\d+)|([2-9]))$
396 - */
397 - },
398 - mounted() {
399 - console.log(this.$refs.ruleForm);
400 }, 389 },
390 + mounted() {},
401 filters: { 391 filters: {
402 isEdit: function (value) { 392 isEdit: function (value) {
403 switch (value) { 393 switch (value) {
...@@ -652,7 +642,7 @@ export default { ...@@ -652,7 +642,7 @@ export default {
652 </script> 642 </script>
653 <style lang='scss' scoped> 643 <style lang='scss' scoped>
654 .rowPadding { 644 .rowPadding {
655 - padding: 10px 50px; 645 + padding: 10px 0;
656 font-size: 12px; 646 font-size: 12px;
657 } 647 }
658 .label-title{ 648 .label-title{
......
...@@ -98,7 +98,7 @@ export default { ...@@ -98,7 +98,7 @@ export default {
98 colData: {}, 98 colData: {},
99 curPage: 1, 99 curPage: 1,
100 total: 0, 100 total: 0,
101 - tableHeight: null, 101 + tableHeight: 300,
102 open: false, 102 open: false,
103 loading: false, 103 loading: false,
104 }; 104 };
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
109 } 109 }
110 }, 110 },
111 mounted() { 111 mounted() {
112 - this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200 112 + // this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
113 }, 113 },
114 activated() { 114 activated() {
115 this.getList() 115 this.getList()
......
...@@ -720,7 +720,7 @@ export default { ...@@ -720,7 +720,7 @@ export default {
720 this.infoForm.fltDate = res.data.list.ruleDate 720 this.infoForm.fltDate = res.data.list.ruleDate
721 this.infoForm.route = res.data.list.flightRoute 721 this.infoForm.route = res.data.list.flightRoute
722 this.infoForm.list.push(this.dataHandle(res.data.list)) 722 this.infoForm.list.push(this.dataHandle(res.data.list))
723 - console.log(this.infoForm) 723 + console.log('A：',this.infoForm.list)
724 } else { 724 } else {
725 this.isEmpty = true 725 this.isEmpty = true
726 } 726 }
...@@ -760,6 +760,7 @@ export default { ...@@ -760,6 +760,7 @@ export default {
760 res.data.list.forEach(item => { 760 res.data.list.forEach(item => {
761 this.infoForm.list.push(this.dataHandle(item)) 761 this.infoForm.list.push(this.dataHandle(item))
762 }) 762 })
763 + console.log('B：',this.infoForm.list)
763 } else { 764 } else {
764 //航班类型为Purple Tail则显示所有航线维度 765 //航班类型为Purple Tail则显示所有航线维度
765 this.routeList.forEach(route => { 766 this.routeList.forEach(route => {
...@@ -781,6 +782,7 @@ export default { ...@@ -781,6 +782,7 @@ export default {
781 }) 782 })
782 } 783 }
783 }) 784 })
785 + console.log('C：',this.infoForm.list)
784 } 786 }
785 } else { 787 } else {
786 //航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度） 788 //航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
...@@ -803,6 +805,7 @@ export default { ...@@ -803,6 +805,7 @@ export default {
803 }) 805 })
804 } 806 }
805 }) 807 })
808 + console.log('D：',this.infoForm.list)
806 } 809 }
807 } else { 810 } else {
808 //未请求到数据 811 //未请求到数据
...@@ -830,6 +833,7 @@ export default { ...@@ -830,6 +833,7 @@ export default {
830 }) 833 })
831 this.infoForm.list.push(this.dataHandle(item)) 834 this.infoForm.list.push(this.dataHandle(item))
832 }) 835 })
836 + console.log('E：',this.infoForm.list)
833 } else { 837 } else {
834 //航班类型Purple Tail展示全部航线维度 838 //航班类型Purple Tail展示全部航线维度
835 let routesStatus = 1 839 let routesStatus = 1
...@@ -853,6 +857,7 @@ export default { ...@@ -853,6 +857,7 @@ export default {
853 }) 857 })
854 } 858 }
855 }) 859 })
860 + console.log('F：',this.infoForm.list)
856 } 861 }
857 } else { 862 } else {
858 //未查询到,插入占位基础数据使用户新建 863 //未查询到,插入占位基础数据使用户新建
...@@ -868,6 +873,7 @@ export default { ...@@ -868,6 +873,7 @@ export default {
868 }) 873 })
869 } 874 }
870 }) 875 })
876 + console.log('G：',this.infoForm.list)
871 } else { 877 } else {
872 //航班类型Purple Tail展示全部航线维度 878 //航班类型Purple Tail展示全部航线维度
873 // this.isEmpty = true 879 // this.isEmpty = true
...@@ -879,6 +885,7 @@ export default { ...@@ -879,6 +885,7 @@ export default {
879 routePriority: route.routePriority, 885 routePriority: route.routePriority,
880 }) 886 })
881 }) 887 })
888 + console.log('H：',this.infoForm.list)
882 } 889 }
883 } 890 }
884 }).catch(err => { 891 }).catch(err => {
...@@ -921,6 +928,7 @@ export default { ...@@ -921,6 +928,7 @@ export default {
921 }) 928 })
922 } 929 }
923 }) 930 })
931 + console.log('I：',this.infoForm.list)
924 } else { 932 } else {
925 this.routeList.forEach((route) => { 933 this.routeList.forEach((route) => {
926 this.infoForm.list.push({ 934 this.infoForm.list.push({
...@@ -930,6 +938,7 @@ export default { ...@@ -930,6 +938,7 @@ export default {
930 routePriority: route.routePriority, 938 routePriority: route.routePriority,
931 }) 939 })
932 }) 940 })
941 + console.log('J：',this.infoForm.list)
933 } 942 }
934 }).catch(err => { 943 }).catch(err => {
935 this.isEmpty = true 944 this.isEmpty = true
...@@ -944,6 +953,7 @@ export default { ...@@ -944,6 +953,7 @@ export default {
944 routePriority: route.routePriority, 953 routePriority: route.routePriority,
945 }) 954 })
946 }) 955 })
956 + console.log('K：',this.infoForm.list)
947 } 957 }
948 } 958 }
949 } 959 }
...@@ -975,6 +985,7 @@ export default { ...@@ -975,6 +985,7 @@ export default {
975 routePriority: item.ordinal 985 routePriority: item.ordinal
976 }) 986 })
977 }) 987 })
988 + console.log('L：',this.infoForm.list)
978 } else { 989 } else {
979 this.msgWarning('未查询到航线信息！') 990 this.msgWarning('未查询到航线信息！')
980 this.routeList = [] 991 this.routeList = []
......
...@@ -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: null, 190 + tableHeight: 300,
191 // 原航班规则数据 191 // 原航班规则数据
192 sourceFlightRulesList: [], 192 sourceFlightRulesList: [],
193 //目的航班数据 193 //目的航班数据
...@@ -249,7 +249,7 @@ export default { ...@@ -249,7 +249,7 @@ export default {
249 } 249 }
250 }, 250 },
251 mounted() { 251 mounted() {
252 - this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200 252 + // this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
253 }, 253 },
254 activated() { 254 activated() {
255 this.findSourceFlightRules(); 255 this.findSourceFlightRules();
......
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
99 },//表单规则 99 },//表单规则
100 dialogVisible: false, 100 dialogVisible: false,
101 total: 0, 101 total: 0,
102 - tableHeight: null, 102 + tableHeight: 300,
103 loading: false, 103 loading: false,
104 tableLoading: false, 104 tableLoading: false,
105 }; 105 };
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
113 } 113 }
114 }, 114 },
115 mounted() { 115 mounted() {
116 - this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300 116 + // this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
117 }, 117 },
118 methods: { 118 methods: {
119 //搜索 119 //搜索
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 }}</el-button> 53 }}</el-button>
54 </div> 54 </div>
55 </el-form> 55 </el-form>
56 - <el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="tableData"> 56 + <el-table max-height="300" 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: null, 469 + tableHeight: 250,
470 //新增修改查看规则弹出层 470 //新增修改查看规则弹出层
471 open: false, 471 open: false,
472 //是否显示查看目的航班弹出层 472 //是否显示查看目的航班弹出层
...@@ -502,8 +502,7 @@ export default { ...@@ -502,8 +502,7 @@ export default {
502 this.shiftKey = false; 502 this.shiftKey = false;
503 } 503 }
504 }); 504 });
505 - this.tableHeight = 505 + // this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
506 - window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
507 }, 506 },
508 methods: { 507 methods: {
509 //输入航班号后 508 //输入航班号后
......
...@@ -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: null, 84 + tableHeight: 300,
85 totalCount: 0, 85 totalCount: 0,
86 openStatus: '', 86 openStatus: '',
87 loading: false, 87 loading: false,
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
92 92
93 }, 93 },
94 mounted() { 94 mounted() {
95 - this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200 95 + // this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
96 this.selection(1) 96 this.selection(1)
97 }, 97 },
98 watch: { 98 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: null, 84 + tableHeight: 300,
85 totalCount: 0, 85 totalCount: 0,
86 openStatus: '', 86 openStatus: '',
87 loading: false, 87 loading: false,
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
92 92
93 }, 93 },
94 mounted() { 94 mounted() {
95 - this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200 95 + // this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
96 this.selection(1) 96 this.selection(1)
97 }, 97 },
98 watch: { 98 watch: {
......
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
64 tableData: [], 64 tableData: [],
65 tableHeader: this.tableHeaders['goodsStationFlight'], 65 tableHeader: this.tableHeaders['goodsStationFlight'],
66 checkData: [], 66 checkData: [],
67 - tableHeight: null, 67 + tableHeight: 300,
68 totalCount: 0, 68 totalCount: 0,
69 loading: false, 69 loading: false,
70 open: false, 70 open: false,
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
73 created() { 73 created() {
74 }, 74 },
75 mounted() { 75 mounted() {
76 - this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200 76 + // this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
77 this.selection(1) 77 this.selection(1)
78 }, 78 },
79 watch: { 79 watch: {
......
...@@ -53,7 +53,7 @@ export default { ...@@ -53,7 +53,7 @@ export default {
53 size: 100 53 size: 100
54 }, 54 },
55 tableHeader: this.tableHeaders['cargoLog'], 55 tableHeader: this.tableHeaders['cargoLog'],
56 - tableHeight: 600, 56 + tableHeight: 300,
57 loading: false 57 loading: false
58 } 58 }
59 }, 59 },
......
...@@ -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: null, 356 + tableHeight: 250,
357 dialogVisible: false, 357 dialogVisible: false,
358 openView: false, 358 openView: false,
359 openTransfer: false, 359 openTransfer: false,
...@@ -367,7 +367,7 @@ export default { ...@@ -367,7 +367,7 @@ export default {
367 } else { 367 } else {
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 }, 371 },
372 372
373 activated() { 373 activated() {
...@@ -441,7 +441,7 @@ export default { ...@@ -441,7 +441,7 @@ export default {
441 this.shiftKey = false; 441 this.shiftKey = false;
442 } 442 }
443 }); 443 });
444 - this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50 444 + // this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
445 }, 445 },
446 watch: { 446 watch: {
447 $route: { 447 $route: {
...@@ -489,7 +489,7 @@ export default { ...@@ -489,7 +489,7 @@ export default {
489 } 489 }
490 }, 490 },
491 formShow(val, oldVal) { 491 formShow(val, oldVal) {
492 - this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120 492 + // this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
493 }, 493 },
494 }, 494 },
495 methods: { 495 methods: {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </el-form-item> 34 </el-form-item>
35 <el-form-item label="航班种类"> 35 <el-form-item label="航班种类">
36 <el-select v-model="selectData.kindId" placeholder="不限" @change="getFlight" clearable> 36 <el-select v-model="selectData.kindId" placeholder="不限" @change="getFlight" clearable>
37 - <el-option v-for="item in fltKindIdList" :label="item.englishName" :value="item.id"></el-option> 37 + <el-option v-for="item in fltKindIdList" :label="item.englishName" :value="item.id" :key="item.id"></el-option>
38 </el-select> 38 </el-select>
39 </el-form-item> 39 </el-form-item>
40 <el-form-item> 40 <el-form-item>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </el-form-item> 42 </el-form-item>
43 </el-form> 43 </el-form>
44 <el-row class="card2"> 44 <el-row class="card2">
45 - <el-col :span="1" v-for="item in fltBox"> 45 + <el-col :span="1" v-for="item in fltBox" :key="item">
46 <div class="fltBox" @click="rowClick({ fltNo: item.fltNo, fltDate: item.fltDate, route: '' })" 46 <div class="fltBox" @click="rowClick({ fltNo: item.fltNo, fltDate: item.fltDate, route: '' })"
47 :style="{ backgroundColor: (item.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (item.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949' }"> 47 :style="{ backgroundColor: (item.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (item.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949' }">
48 <div class="fltName">{{ item.fltNo }}</div> 48 <div class="fltName">{{ item.fltNo }}</div>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 <template v-slot:percentage="scope"> 60 <template v-slot:percentage="scope">
61 <el-progress stroke-width="100" 61 <el-progress stroke-width="100"
62 :color="(scope.row.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (scope.row.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949'" 62 :color="(scope.row.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (scope.row.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949'"
63 - :stroke-width="18" 63 + :strokeWidth="18"
64 :percentage="scope.row.percentage == 0 ? 0 : Number((scope.row.percentage * 100).toFixed(2))"> 64 :percentage="scope.row.percentage == 0 ? 0 : Number((scope.row.percentage * 100).toFixed(2))">
65 </el-progress> 65 </el-progress>
66 </template> 66 </template>
...@@ -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: null, 99 + tableHeight: 300,
100 total: 0, 100 total: 0,
101 loading: false, 101 loading: false,
102 }; 102 };
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
109 // this.getFlight() 109 // this.getFlight()
110 // }, 110 // },
111 mounted() { 111 mounted() {
112 - this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350 112 + // this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350
113 this.getFlight() 113 this.getFlight()
114 }, 114 },
115 methods: { 115 methods: {
......
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
78 tableData: [], 78 tableData: [],
79 errorData: [], 79 errorData: [],
80 tableHeaders: this.tableHeaders['flightToArea'], 80 tableHeaders: this.tableHeaders['flightToArea'],
81 - tableHeight: null, 81 + tableHeight: 300,
82 total: 0, 82 total: 0,
83 flightType: [], 83 flightType: [],
84 form: { 84 form: {
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
100 created() { 100 created() {
101 }, 101 },
102 mounted() { 102 mounted() {
103 - this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170 103 + // this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
104 this.selection(1) 104 this.selection(1)
105 }, 105 },
106 activated() { 106 activated() {
......
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
131 tableHeader: this.tableHeaders['preMdeSelect'], 131 tableHeader: this.tableHeaders['preMdeSelect'],
132 accsDate: [], 132 accsDate: [],
133 valueFormat: "yyyy-MM-dd", 133 valueFormat: "yyyy-MM-dd",
134 - tableHeight: null, 134 + tableHeight: 250,
135 tableLoading: false, 135 tableLoading: false,
136 downloading: false, 136 downloading: false,
137 totalCount: 0, 137 totalCount: 0,
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
141 this.selectOptionData() 141 this.selectOptionData()
142 }, 142 },
143 mounted() { 143 mounted() {
144 - this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150 144 + // this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
145 this.select(0) 145 this.select(0)
146 }, 146 },
147 watch: { 147 watch: {
......
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
79 tableData: [], 79 tableData: [],
80 errorData: [], 80 errorData: [],
81 tableHeaders: this.tableHeaders['ursaToArea'], 81 tableHeaders: this.tableHeaders['ursaToArea'],
82 - tableHeight: null, 82 + tableHeight: 300,
83 total: 0, 83 total: 0,
84 flightType: [], 84 flightType: [],
85 form: { 85 form: {
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
101 created() { 101 created() {
102 }, 102 },
103 mounted() { 103 mounted() {
104 - this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170 104 + // this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
105 this.selection(1) 105 this.selection(1)
106 }, 106 },
107 activated() { 107 activated() {
......
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
199 addDictionary: {},//选择数据 199 addDictionary: {},//选择数据
200 nowSelect: [], 200 nowSelect: [],
201 tableName: '', 201 tableName: '',
202 - tableHeight: null, 202 + tableHeight: 300,
203 total: 0, 203 total: 0,
204 status: null, 204 status: null,
205 loading: false, 205 loading: false,
...@@ -215,7 +215,7 @@ export default { ...@@ -215,7 +215,7 @@ export default {
215 // } 215 // }
216 }, 216 },
217 mounted() { 217 mounted() {
218 - this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270 218 + // this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
219 }, 219 },
220 watch: { 220 watch: {
221 tableName(val, oldVal) { 221 tableName(val, oldVal) {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 :limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading" 34 :limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading"
35 :height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange"> 35 :height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange">
36 <template slot="optionColumn"> 36 <template slot="optionColumn">
37 - <el-table-column header-align="center" align="center" label="操作"> 37 + <el-table-column header-align="center" align="left" label="操作" min-width="210px">
38 <template slot-scope="scope"> 38 <template slot-scope="scope">
39 <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button> 39 <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
40 <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']">修改 40 <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']">修改
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 <el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini" 42 <el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini"
43 v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)">{{ scope.row.valid == 1 ? "停用" : "启用" }} 43 v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)">{{ scope.row.valid == 1 ? "停用" : "启用" }}
44 </el-button> 44 </el-button>
45 - <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']">删除角色 45 + <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']" style="margin-top: 5px;margin-left: 0;">删除角色
46 </el-button> 46 </el-button>
47 </template> 47 </template>
48 </el-table-column> 48 </el-table-column>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 :loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight" 32 :loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight"
33 @sizeChange="sizeChange" @currentChange="currentChange"> 33 @sizeChange="sizeChange" @currentChange="currentChange">
34 <template slot="optionColumn"> 34 <template slot="optionColumn">
35 - <el-table-column header-align="center" align="center" width="auto" label="操作"> 35 + <el-table-column header-align="center" align="left" min-width="210px" label="操作">
36 <template slot-scope="scope"> 36 <template slot-scope="scope">
37 <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button> 37 <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
38 <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']">修改 38 <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']">修改
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{ 44 v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{
45 scope.row.isValid == 1 ? "停用" : "启用" 45 scope.row.isValid == 1 ? "停用" : "启用"
46 }}</el-button> 46 }}</el-button>
47 - <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户 47 + <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']" style="margin-top: 5px;margin-left: 0;">删除用户
48 </el-button> 48 </el-button>
49 </template> 49 </template>
50 </el-table-column> 50 </el-table-column>
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
112 drawerTitle: "", 112 drawerTitle: "",
113 total: 0, 113 total: 0,
114 loading: false, 114 loading: false,
115 - tableHeight: null 115 + tableHeight: 300
116 }; 116 };
117 }, 117 },
118 created() { 118 created() {
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
121 } 121 }
122 }, 122 },
123 mounted() { 123 mounted() {
124 - this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250 124 + // this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
125 }, 125 },
126 activated() { 126 activated() {
127 this.selectUser(); 127 this.selectUser();
......
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
55 }, 55 },
56 data: [], 56 data: [],
57 tableHeader: this.tableHeaders['archiveData'], 57 tableHeader: this.tableHeaders['archiveData'],
58 - tableHeight: null, 58 + tableHeight: 300,
59 total: 0, 59 total: 0,
60 loading: false, 60 loading: false,
61 } 61 }
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
64 this.selectLog() 64 this.selectLog()
65 }, 65 },
66 mounted() { 66 mounted() {
67 - this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200 67 + // this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200
68 }, 68 },
69 methods: { 69 methods: {
70 selectLog(val) { 70 selectLog(val) {
......
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
115 selectDate: null, 115 selectDate: null,
116 createTimes: [], 116 createTimes: [],
117 total: 0, 117 total: 0,
118 - tableHeight: null, 118 + tableHeight: 300,
119 loading: false, 119 loading: false,
120 valueFormat: "yyyy-MM-dd", 120 valueFormat: "yyyy-MM-dd",
121 }; 121 };
...@@ -130,8 +130,7 @@ export default { ...@@ -130,8 +130,7 @@ export default {
130 this.data = []; 130 this.data = [];
131 }, 131 },
132 mounted() { 132 mounted() {
133 - this.tableHeight = 133 + // this.tableHeight = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
134 - window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
135 }, 134 },
136 methods: { 135 methods: {
137 //数据查询 136 //数据查询
......
...@@ -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: null, 99 + tableHeight: 300,
100 total: 0, 100 total: 0,
101 loading: false 101 loading: false
102 } 102 }
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
109 this.selectLog(); 109 this.selectLog();
110 }, 110 },
111 mounted() { 111 mounted() {
112 - this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240 112 + // this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240
113 }, 113 },
114 methods: { 114 methods: {
115 getModule() { 115 getModule() {
......