From 6baac57c4ae378a8a8c166e19dc2d186670cd01a Mon Sep 17 00:00:00 2001 From: jinna Date: Tue, 17 Oct 2023 11:09:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/highWay/runData/list.vue | 2 +- pages/highWay/runStatusData/list.vue | 2 +- pages/portShipping/waterInternational/list.vue | 2 +- pages/railway/railwayRunData/list.vue | 2 +- pages/railway/runStatus/list.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pages/highWay/runData/list.vue b/pages/highWay/runData/list.vue index ce96f42..12bb03b 100644 --- a/pages/highWay/runData/list.vue +++ b/pages/highWay/runData/list.vue @@ -238,7 +238,7 @@ color: #333333; font-size: 30rpx; font-family: PingFang SC-Bold, PingFang SC; - font-weight: bold; + font-weight: 400; line-height: 48rpx; margin-left: 20rpx; word-break: break-all; diff --git a/pages/highWay/runStatusData/list.vue b/pages/highWay/runStatusData/list.vue index 701a79e..823130b 100644 --- a/pages/highWay/runStatusData/list.vue +++ b/pages/highWay/runStatusData/list.vue @@ -225,7 +225,7 @@ color: #333333; font-size: 30rpx; font-family: PingFang SC-Bold, PingFang SC; - font-weight: bold; + font-weight: 400; line-height: 48rpx; margin-left: 20rpx; word-break: break-all; diff --git a/pages/portShipping/waterInternational/list.vue b/pages/portShipping/waterInternational/list.vue index f92b127..0c0da77 100644 --- a/pages/portShipping/waterInternational/list.vue +++ b/pages/portShipping/waterInternational/list.vue @@ -222,7 +222,7 @@ color: #333333; font-size: 30rpx; font-family: PingFang SC-Bold, PingFang SC; - font-weight: bold; + font-weight: 400; line-height: 48rpx; margin-left: 20rpx; word-break: break-all; diff --git a/pages/railway/railwayRunData/list.vue b/pages/railway/railwayRunData/list.vue index 699dbe4..6b8c859 100644 --- a/pages/railway/railwayRunData/list.vue +++ b/pages/railway/railwayRunData/list.vue @@ -231,7 +231,7 @@ color: #333333; font-size: 30rpx; font-family: PingFang SC-Bold, PingFang SC; - font-weight: bold; + font-weight: 400; line-height: 48rpx; margin-left: 20rpx; word-break: break-all; diff --git a/pages/railway/runStatus/list.vue b/pages/railway/runStatus/list.vue index 34ef029..fc97c2d 100644 --- a/pages/railway/runStatus/list.vue +++ b/pages/railway/runStatus/list.vue @@ -251,7 +251,7 @@ color: #333333; font-size: 30rpx; font-family: PingFang SC-Bold, PingFang SC; - font-weight: bold; + font-weight: 400; line-height: 48rpx; margin-left: 20rpx; word-break: break-all; From 2eb29f928809d1642081a05b953c325999fc5b44 Mon Sep 17 00:00:00 2001 From: zhangqun <179111901@qq.com> Date: Tue, 17 Oct 2023 17:52:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E8=A1=8C=E4=B8=9A?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/metro/subwayPage/form.vue | 2 +- pages/metro/subwayPage/list.vue | 2 +- pages/portShipping/pilotStation/form.vue | 2 +- pages/portShipping/pilotStation/list.vue | 2 +- pages/portShipping/waterInternational/form.vue | 2 +- pages/portShipping/waterInternational/list.vue | 2 +- pages/roadTransport/dataSubmission/form.vue | 2 +- pages/roadTransport/dataSubmission/list.vue | 2 +- pages/roadTransport/transportData/form.vue | 2 +- pages/roadTransport/transportData/list.vue | 2 +- pages/water/transportation/form.vue | 2 +- pages/water/transportation/list.vue | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pages/metro/subwayPage/form.vue b/pages/metro/subwayPage/form.vue index 2f50cae..a10b1da 100644 --- a/pages/metro/subwayPage/form.vue +++ b/pages/metro/subwayPage/form.vue @@ -234,7 +234,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=subway_time' + '&_t=' + Date .parse( new Date()), {}, 'GET').then(res => { this.array = res.data; diff --git a/pages/metro/subwayPage/list.vue b/pages/metro/subwayPage/list.vue index 6d477a4..072fb6d 100644 --- a/pages/metro/subwayPage/list.vue +++ b/pages/metro/subwayPage/list.vue @@ -139,7 +139,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=subway_time' + '&_t=' + Date.parse( new Date()), {}, 'GET').then(res => { this.array = res.data; }) diff --git a/pages/portShipping/pilotStation/form.vue b/pages/portShipping/pilotStation/form.vue index cc2f6ec..e367256 100644 --- a/pages/portShipping/pilotStation/form.vue +++ b/pages/portShipping/pilotStation/form.vue @@ -224,7 +224,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr } from '../../../common/uti }, // 获取时段 getRoadTime(){ - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{ + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=port_time&_t=1693372307694',"GET").then(res =>{ this.roadTime = res.data; if(this.pageType == 'edit'){ this.roadTime.map((item,index) =>{ diff --git a/pages/portShipping/pilotStation/list.vue b/pages/portShipping/pilotStation/list.vue index 4adf9c4..68d44d2 100644 --- a/pages/portShipping/pilotStation/list.vue +++ b/pages/portShipping/pilotStation/list.vue @@ -156,7 +156,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=port_time' + '&_t=' + Date.parse( new Date()), {}, 'GET').then(res => { this.timeArray = res.data; }) diff --git a/pages/portShipping/waterInternational/form.vue b/pages/portShipping/waterInternational/form.vue index 0e1bb1a..12683b8 100644 --- a/pages/portShipping/waterInternational/form.vue +++ b/pages/portShipping/waterInternational/form.vue @@ -707,7 +707,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=port_time' + '&_t=' + Date .parse( new Date()), {}, 'GET').then(res => { this.array = res.data; diff --git a/pages/portShipping/waterInternational/list.vue b/pages/portShipping/waterInternational/list.vue index 0c0da77..39539ab 100644 --- a/pages/portShipping/waterInternational/list.vue +++ b/pages/portShipping/waterInternational/list.vue @@ -139,7 +139,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=port_time' + '&_t=' + Date.parse( new Date()), {}, 'GET').then(res => { this.array = res.data; }) diff --git a/pages/roadTransport/dataSubmission/form.vue b/pages/roadTransport/dataSubmission/form.vue index bc74f00..afa033c 100644 --- a/pages/roadTransport/dataSubmission/form.vue +++ b/pages/roadTransport/dataSubmission/form.vue @@ -155,7 +155,7 @@ }, // 获取时段 getRoadTime(){ - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{ + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=roadtransport_time&_t=1693372307694',"GET").then(res =>{ this.roadTime = res.data; if(this.pageType == 'edit'){ this.index = this.roadTime.findIndex(item => item.dictValue == this.synthData.reportPhase) diff --git a/pages/roadTransport/dataSubmission/list.vue b/pages/roadTransport/dataSubmission/list.vue index beecc5e..8c625f9 100644 --- a/pages/roadTransport/dataSubmission/list.vue +++ b/pages/roadTransport/dataSubmission/list.vue @@ -152,7 +152,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=roadtransport_time' + '&_t=' + Date.parse( new Date()), {}, 'GET').then(res => { this.timeArray = res.data; }) diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue index cdc0e59..4a310c3 100644 --- a/pages/roadTransport/transportData/form.vue +++ b/pages/roadTransport/transportData/form.vue @@ -757,7 +757,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. }, // 获取时段 getRoadTime(){ - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{ + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=roadtransport_time&_t=1693372307694',"GET").then(res =>{ this.roadTime = res.data; if(this.pageType == 'edit'){ this.roadTime.map((item,index) =>{ diff --git a/pages/roadTransport/transportData/list.vue b/pages/roadTransport/transportData/list.vue index eb86bdb..eb21fe5 100644 --- a/pages/roadTransport/transportData/list.vue +++ b/pages/roadTransport/transportData/list.vue @@ -129,7 +129,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=roadtransport_time' + '&_t=' + Date.parse( new Date()), {}, 'GET').then(res => { this.timeArray = res.data; }) diff --git a/pages/water/transportation/form.vue b/pages/water/transportation/form.vue index c3b3f64..5d79226 100644 --- a/pages/water/transportation/form.vue +++ b/pages/water/transportation/form.vue @@ -247,7 +247,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=waterage_time' + '&_t=' + Date .parse( new Date()), {}, 'GET').then(res => { this.array = res.data; diff --git a/pages/water/transportation/list.vue b/pages/water/transportation/list.vue index 9074679..87dcdf8 100644 --- a/pages/water/transportation/list.vue +++ b/pages/water/transportation/list.vue @@ -139,7 +139,7 @@ }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=waterage_time' + '&_t=' + Date.parse( new Date()), {}, 'GET').then(res => { this.array = res.data; })