From fd56509509ca06e36e51518c3914af6586ea8226 Mon Sep 17 00:00:00 2001 From: jinna Date: Fri, 15 Sep 2023 16:29:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bus/busDataInfo/list.vue | 2 +- pages/portShipping/pilotStation/list.vue | 2 +- pages/roadTransport/dataSubmission/form.vue | 3 +- pages/roadTransport/dataSubmission/list.vue | 2 +- pages/roadTransport/transportData/form.vue | 35 ++++++++++++++------- pages/roadTransport/transportData/list.vue | 2 +- 6 files changed, 29 insertions(+), 17 deletions(-) diff --git a/pages/bus/busDataInfo/list.vue b/pages/bus/busDataInfo/list.vue index 87bf93f..fee2698 100644 --- a/pages/bus/busDataInfo/list.vue +++ b/pages/bus/busDataInfo/list.vue @@ -183,7 +183,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/pilotStation/list.vue b/pages/portShipping/pilotStation/list.vue index 8789674..7379dba 100644 --- a/pages/portShipping/pilotStation/list.vue +++ b/pages/portShipping/pilotStation/list.vue @@ -184,7 +184,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/roadTransport/dataSubmission/form.vue b/pages/roadTransport/dataSubmission/form.vue index 3e05cc9..fd5c1eb 100644 --- a/pages/roadTransport/dataSubmission/form.vue +++ b/pages/roadTransport/dataSubmission/form.vue @@ -76,7 +76,7 @@

应急情况报告

-

{{synthData.emergencySituationReport}}

+ @@ -407,6 +407,7 @@ justify-content: space-between; background-color: #f5f5f5; padding: 40rpx 30rpx; + z-index: 99; .btn_item{ width: 690rpx; diff --git a/pages/roadTransport/dataSubmission/list.vue b/pages/roadTransport/dataSubmission/list.vue index e938609..40c6939 100644 --- a/pages/roadTransport/dataSubmission/list.vue +++ b/pages/roadTransport/dataSubmission/list.vue @@ -237,7 +237,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/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue index 73cc425..8b3c81c 100644 --- a/pages/roadTransport/transportData/form.vue +++ b/pages/roadTransport/transportData/form.vue @@ -115,7 +115,7 @@ 客车总量环比 - {{roadData.totalBusIncreaseRatio === 0 ? roadData.totalBusIncreaseRatio : roadData.totalBusIncreaseRatio ? formatDigit(roadData.totalBusIncreaseRatio) : '--'}}% + {{roadData.totalBusIncreaseYesterdayRatio === 0 ? roadData.totalBusIncreaseYesterdayRatio : roadData.totalBusIncreaseYesterdayRatio ? formatDigit(roadData.totalBusIncreaseYesterdayRatio) : '--'}}% 客车总量同比 @@ -198,7 +198,7 @@ 客运量环比 - {{roadData.passengerVolumeRatio === 0 ? roadData.passengerVolumeRatio : roadData.passengerVolumeRatio ? formatDigit(roadData.passengerVolumeRatio) : '--'}}% + {{roadData.passengerVolumeYesterdayRatio === 0 ? roadData.passengerVolumeYesterdayRatio : roadData.passengerVolumeYesterdayRatio ? formatDigit(roadData.passengerVolumeYesterdayRatio) : '--'}}% @@ -538,7 +538,8 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. selectId:'', selectName:'', selectId1:'', - mobile: getApp().globalData.mobile + mobile: getApp().globalData.mobile, + unitName:'' } }, onLoad(options){ @@ -604,10 +605,12 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. this.$refs.unitPopup.close() }, getPeople(){ - this.$request(getApp().globalData.baseUrl + '/api/user/getByDeptId/' + this.unitId,{},"GET").then(res =>{ + console.log('unitName ==>',this.unitName) + this.$request(getApp().globalData.baseUrl + '/api/user/getByDeptName/' + this.unitName,{},"GET").then(res =>{ + // this.$request(getApp().globalData.baseUrl + '/api/user/getByDeptId/' + this.unitId,{},"GET").then(res =>{ console.log('人员列表 ===>',res) res.data.map(item =>{ - this.peopleList.push({id:item.id,people:item.username + ',' + item.mobile}) + this.peopleList.push({id:item.id,people:item.nickname + ',' + item.mobile}) }) if(this.pageType == 'edit'){ console.log('deptNameList ===>',this.peopleList) @@ -623,12 +626,20 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. this.$request(getApp().globalData.baseUrl + '/api/dept/getCurrentAndSubordinateDept',{},"GET").then(res =>{ console.log('单位===>',res) this.treeData = res.data; - this.unitId = this.deptNameList.length > 0 ? this.deptNameList[0].deptId : res.data[0].deptId; - this.getPeople() if(this.pageType == 'add'){ + this.unitId = this.deptNameList.length > 0 ? this.deptNameList[0].deptId : res.data[0].deptId; + this.unitName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : res.data[0].deptName; this.roadData.reportingUnitId = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : ''; this.roadData.reportingUnitIdIndex = this.deptNameList.length > 0 ? 0 : ''; - this.selectId1 = this.unitId + this.selectId1 = this.unitId; + this.getPeople() + }else if(this.pageType == 'edit'){ + console.log('reportingUnitId===>',this.roadData.reportingUnitId) + console.log('treeData ==>',this.treeData) + this.unitId = this.roadData.responsiblePersonId; + this.unitName = this.roadData.reportingUnitId; + this.selectId1 = this.unitId; + this.getPeople() } }) }, @@ -662,16 +673,16 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. // 2、今日数据有值且不为0，去年数据无值为-，去年数据为0时为100； // 3、今日数据无值，去年数据无论有值或为0，同比为- // 4、今日、去年今日都有值且都不为0时，按照公式计算(今日-去年今日)/去年今日 * 100； - this.roadData.passengerVolumeRatio = calcMom(checkNotEmpty(this.roadData.totalPassengerVolume) ? this.roadData.totalPassengerVolume * 10000 : this.roadData.totalPassengerVolume,checkNotEmpty(this.lastData.passengerVolumeYesterday) ? this.lastData.passengerVolumeYesterday * 10000 : this.lastData.passengerVolumeYesterday) - this.roadData.passengerVolumeRatio = calcMom(checkNotEmpty(this.roadData.totalPassengerVolume) ? this.roadData.totalPassengerVolume * 10000 : this.roadData.totalPassengerVolume,checkNotEmpty(this.lastData.passengerVolumeLastYear) ? this.lastData.passengerVolumeLastYear * 10000 : this.lastData.passengerVolumeLastYear) + this.roadData.passengerVolumeYesterdayRatio = calcMom(checkNotEmpty(this.roadData.totalPassengerVolume) ? this.roadData.totalPassengerVolume * 10000 : this.roadData.totalPassengerVolume,checkNotEmpty(this.lastData.passengerVolumeYesterday) ? this.lastData.passengerVolumeYesterday * 10000 : this.lastData.passengerVolumeYesterday) + this.roadData.passengerVolumeRatio = calcYoy(checkNotEmpty(this.roadData.totalPassengerVolume) ? this.roadData.totalPassengerVolume * 10000 : this.roadData.totalPassengerVolume,checkNotEmpty(this.lastData.passengerVolumeLastYear) ? this.lastData.passengerVolumeLastYear * 10000 : this.lastData.passengerVolumeLastYear) // (checkNotEmpty(this.roadData.totalPassengerVolume) && this.roadData.totalPassengerVolume != 0 && checkNotEmpty(this.lastData.totalPassengerVolume) && this.lastData.totalPassengerVolume === 0) ? 100 : // (checkNotEmpty(this.roadData.totalPassengerVolume) && checkNotEmpty(this.lastData.totalPassengerVolume) && this.roadData.totalPassengerVolume != 0 && this.lastData.totalPassengerVolume != 0) ? // (this.roadData.totalPassengerVolume - this.lastData.totalPassengerVolume) / this.lastData.totalPassengerVolume * 100 : // (this.roadData.totalPassengerVolume == 0 && this.lastData.totalPassengerVolume == 0) ? 0 : '' // // 客车总量同比上升 - this.roadData.totalBusIncreaseRatio = calcMom(this.roadData.capacityTotalBus,this.lastData.totalBusYesterday) - this.roadData.totalBusIncreaseRatio = calcMom(this.roadData.capacityTotalBus,this.lastData.totalBusLastYear) + this.roadData.totalBusIncreaseYesterdayRatio = calcMom(this.roadData.capacityTotalBus,this.lastData.totalBusYesterday) + this.roadData.totalBusIncreaseRatio = calcYoy(this.roadData.capacityTotalBus,this.lastData.totalBusLastYear) // (checkNotEmpty(this.roadData.capacityTotalBus) && this.roadData.capacityTotalBus != 0 && checkNotEmpty(this.lastData.capacityTotalBus) && this.lastData.capacityTotalBus === 0) ? 100 : // (checkNotEmpty(this.roadData.capacityTotalBus) && checkNotEmpty(this.lastData.capacityTotalBus) && this.roadData.capacityTotalBus != 0 && this.lastData.capacityTotalBus != 0) ? diff --git a/pages/roadTransport/transportData/list.vue b/pages/roadTransport/transportData/list.vue index fdb0009..054cd68 100644 --- a/pages/roadTransport/transportData/list.vue +++ b/pages/roadTransport/transportData/list.vue @@ -324,7 +324,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;