From 078804d0f9fb80771545b8d3ac3840c4440a2b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=A4?= Date: Wed, 20 Sep 2023 11:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8D=B3=E5=88=B7=E6=96=B0=EF=BC=9B=E5=A1=AB=E6=8A=A5?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BC=96=E8=BE=91=E4=B8=BA=E7=A9=BA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BA?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/airport/airport-runData/list.vue | 9 ++++++++- pages/airport/airport-runStatus/list.vue | 9 ++++++++- pages/highWay/runData/form.vue | 8 ++++++-- pages/highWay/runData/list.vue | 9 ++++++++- pages/highWay/runStatusData/form.vue | 6 +++++- pages/highWay/runStatusData/list.vue | 9 ++++++++- pages/metro/subwayPage/form.vue | 2 +- pages/metro/subwayPage/list.vue | 9 ++++++++- pages/portShipping/waterInternational/form.vue | 2 +- pages/portShipping/waterInternational/list.vue | 9 ++++++++- pages/railway/railwayRunData/list.vue | 10 +++++++++- pages/railway/runStatus/list.vue | 9 ++++++++- pages/water/transportation/form.vue | 6 +++++- pages/water/transportation/list.vue | 9 ++++++++- pages/water/waterWay/form.vue | 2 +- pages/water/waterWay/list.vue | 9 ++++++++- 16 files changed, 100 insertions(+), 17 deletions(-) diff --git a/pages/airport/airport-runData/list.vue b/pages/airport/airport-runData/list.vue index daac5be..26dbf5e 100644 --- a/pages/airport/airport-runData/list.vue +++ b/pages/airport/airport-runData/list.vue @@ -72,10 +72,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; diff --git a/pages/airport/airport-runStatus/list.vue b/pages/airport/airport-runStatus/list.vue index 7cd0fb9..0283f76 100644 --- a/pages/airport/airport-runStatus/list.vue +++ b/pages/airport/airport-runStatus/list.vue @@ -72,10 +72,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue index 3415b7e..55dd2da 100644 --- a/pages/highWay/runData/form.vue +++ b/pages/highWay/runData/form.vue @@ -308,8 +308,12 @@ 'GET').then(res => { this.form = res.data; if (checkNotEmpty(this.deptNameList)) { - let idx = this.deptNameList.findIndex(item => item.deptName = this.form.organizationName); - this.form.organizationNameIndex = idx > -1 ? idx : ''; + let idx = this.deptNameList.findIndex(item => item.deptName == this.form.organizationName); + this.form.organizationNameIndex = idx > -1 ? idx : ''; + if(!checkNotEmpty(this.form.affiliatedUnit)) { + this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : ''; + this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : ''; + } } this.queryTime(); this.queryStation(); diff --git a/pages/highWay/runData/list.vue b/pages/highWay/runData/list.vue index e265a71..5dbf440 100644 --- a/pages/highWay/runData/list.vue +++ b/pages/highWay/runData/list.vue @@ -75,10 +75,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue index 9ef1822..d3ac27e 100644 --- a/pages/highWay/runStatusData/form.vue +++ b/pages/highWay/runStatusData/form.vue @@ -433,8 +433,12 @@ this.form.highwayCongestionDetailDTOS = this.form.highwayCongestionDetailVOS; this.form.highwayAccidentDetailDTOS = this.form.highwayAccidentDetailVOS; if (checkNotEmpty(this.deptNameList)) { - let idx = this.deptNameList.findIndex(item => item.deptName = this.form.organizationName); + let idx = this.deptNameList.findIndex(item => item.deptName == this.form.organizationName); this.form.organizationNameIndex = idx > -1 ? idx : ''; + if(!checkNotEmpty(this.form.affiliatedUnit)) { + this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : ''; + this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : ''; + } } this.queryAccidentLevel(); //事故等级 this.queryHighway(); //高速公路列表 diff --git a/pages/highWay/runStatusData/list.vue b/pages/highWay/runStatusData/list.vue index 57475f0..bc99353 100644 --- a/pages/highWay/runStatusData/list.vue +++ b/pages/highWay/runStatusData/list.vue @@ -74,10 +74,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; diff --git a/pages/metro/subwayPage/form.vue b/pages/metro/subwayPage/form.vue index d799d2b..9f32aa3 100644 --- a/pages/metro/subwayPage/form.vue +++ b/pages/metro/subwayPage/form.vue @@ -167,7 +167,7 @@ .then(res => { this.form = res.data; if (checkNotEmpty(this.deptNameList)) { - let idx = this.deptNameList.findIndex(item => item.deptName = this.form.organizationName); + let idx = this.deptNameList.findIndex(item => item.deptName == this.form.organizationName); this.form.organizationNameIndex = idx > -1 ? idx : ''; } this.queryTime(); //统计时段 diff --git a/pages/metro/subwayPage/list.vue b/pages/metro/subwayPage/list.vue index 5d44840..ec7a10d 100644 --- a/pages/metro/subwayPage/list.vue +++ b/pages/metro/subwayPage/list.vue @@ -72,10 +72,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; diff --git a/pages/portShipping/waterInternational/form.vue b/pages/portShipping/waterInternational/form.vue index 3593dd1..f4b9fb9 100644 --- a/pages/portShipping/waterInternational/form.vue +++ b/pages/portShipping/waterInternational/form.vue @@ -242,7 +242,7 @@ this.form.passengerShipDTOList = this.form.passengerShipVOList; this.form.internationalCruiseDTOList = this.form.internationalCruiseVOList; if (checkNotEmpty(this.deptNameList)) { - let idx = this.deptNameList.findIndex(item => item.deptName = this.form.organizationName); + let idx = this.deptNameList.findIndex(item => item.deptName == this.form.organizationName); this.form.organizationNameIndex = idx > -1 ? idx : ''; } this.queryTime(); //统计时段 diff --git a/pages/portShipping/waterInternational/list.vue b/pages/portShipping/waterInternational/list.vue index 2128b58..b09a2e5 100644 --- a/pages/portShipping/waterInternational/list.vue +++ b/pages/portShipping/waterInternational/list.vue @@ -72,10 +72,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; diff --git a/pages/railway/railwayRunData/list.vue b/pages/railway/railwayRunData/list.vue index a751ebe..42a1943 100644 --- a/pages/railway/railwayRunData/list.vue +++ b/pages/railway/railwayRunData/list.vue @@ -76,10 +76,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; @@ -228,6 +235,7 @@ font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; text-align: right; + margin-top: 10rpx; } .report_time { diff --git a/pages/railway/runStatus/list.vue b/pages/railway/runStatus/list.vue index d707bf8..ca02408 100644 --- a/pages/railway/runStatus/list.vue +++ b/pages/railway/runStatus/list.vue @@ -75,10 +75,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; diff --git a/pages/water/transportation/form.vue b/pages/water/transportation/form.vue index d3e1da3..2e0780a 100644 --- a/pages/water/transportation/form.vue +++ b/pages/water/transportation/form.vue @@ -216,8 +216,12 @@ 'GET').then(res => { this.form = res.data; if (checkNotEmpty(this.deptNameList)) { - let idx = this.deptNameList.findIndex(item => item.deptName = this.form.affiliatedUnit); + let idx = this.deptNameList.findIndex(item => item.deptName == this.form.affiliatedUnit); this.form.affiliatedUnitIndex = idx > -1 ? idx : ''; + if(!checkNotEmpty(this.form.affiliatedUnit)) { + this.form.affiliatedUnit = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : ''; + this.form.affiliatedUnitIndex = this.deptNameList.length > 0 ? 0 : ''; + } } this.queryTime(); //统计时段 }) diff --git a/pages/water/transportation/list.vue b/pages/water/transportation/list.vue index 4b51abf..02662d7 100644 --- a/pages/water/transportation/list.vue +++ b/pages/water/transportation/list.vue @@ -72,10 +72,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = []; diff --git a/pages/water/waterWay/form.vue b/pages/water/waterWay/form.vue index 6f84b70..e2a7ae2 100644 --- a/pages/water/waterWay/form.vue +++ b/pages/water/waterWay/form.vue @@ -366,7 +366,7 @@ if (this.pageType == 'add') { let now = new Date(); //11:00-13:30 默认选择0-12 - let dateStr = getDateStr(now, 0); + let dateStr = getDateStr(now, 0).replaceAll('-', '/'); if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) { diff --git a/pages/water/waterWay/list.vue b/pages/water/waterWay/list.vue index dfd74f8..a2a7ffd 100644 --- a/pages/water/waterWay/list.vue +++ b/pages/water/waterWay/list.vue @@ -72,10 +72,17 @@ index: '', //时段选择 } }, - onLoad() { + onShow() { + this.data = []; + this.current = 0; + this.hasMore = true; this.queryTime(); this.loadMore(); }, + onLoad() { + // this.queryTime(); + // this.loadMore(); + }, onUnload() { this.hasMore = true; this.data = [];