From e8b6bdaee1bb1b945af986fff8e9040cc316e725 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 13 Sep 2023 17:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E6=94=B9=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bus/busDataInfo/form.vue              |  54 +++++++--
 pages/portShipping/pilotStation/form.vue    |  62 +++++++---
 pages/roadTransport/dataSubmission/form.vue |  34 ++++--
 pages/roadTransport/quantitySent/form.vue   |  26 ++--
 pages/roadTransport/transportData/form.vue  | 124 +++++++++++++-------
 5 files changed, 219 insertions(+), 81 deletions(-)

diff --git a/pages/bus/busDataInfo/form.vue b/pages/bus/busDataInfo/form.vue
index bbaaa01..3b4dfaf 100644
--- a/pages/bus/busDataInfo/form.vue
+++ b/pages/bus/busDataInfo/form.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="form_warp">
-		<!-- <view class="form_intro">
+		<view class="form_intro">
 			<view>如有填报问题，请咨询公共服务中心</view>
-			<view>中心值班电话：<text class="tel">66007587</text></view>
-		</view> -->
+			<view>中心值班电话：<text @click="call(mobile)" class="tel">{{mobile}}</text></view>
+		</view>
 		<view class="form_item_box">
 			<view class="form_item_title">基本信息</view>
 			<!-- <view class="form_item">
@@ -171,6 +171,13 @@
 						</view>
 					</view>
 				</view>
+				<view class="remark_item">
+					<p class="left">备注</p>
+					<view class="right">
+						<!-- <uni-easyinput v-model="roadData.remarks" placeholder="请输入备注" placeholderStyle="color:#d4d4d4;"></uni-easyinput> -->
+						<uni-easyinput type="textarea" maxlength="200" autoHeight v-model="roadData.remarks" placeholder="请备注信息"></uni-easyinput>
+					</view>
+				</view>
 				<!-- <view class="line"></view> -->
 			</view>
 			<!-- <view class="add_btn" @click="addRow()">增行</view> -->
@@ -205,7 +212,8 @@
 				landNameIndex: 0,
 				showLand: false,
 				pageType: '',
-				btnText: '保存'
+				btnText: '保存',
+				mobile: getApp().globalData.mobile
 			}
 		},
 		onLoad(options) {
@@ -231,6 +239,11 @@
 			// }
 		},
 		methods: {
+			call(tel) {
+				uni.makePhoneCall({
+					phoneNumber: tel
+				});
+			},
 			formatDigit(data) {
 				return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data;
 			},
@@ -238,7 +251,7 @@
 				this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getById/' + id,{},"GET").then(res =>{
 					console.log('查询详情===>',res)
 					this.form = res.data;
-					this.form.bizBusDataDetailVOList = this.form.bizBusDataBodySaveOrUpdateDTOList;
+					// this.form.bizBusDataDetailVOList = this.form.bizBusDataBodySaveOrUpdateDTOList;
 					this.queryTime(); //统计时段
 					this.getPermiss();
 				})
@@ -292,10 +305,15 @@
 							})
 						})
 					} else {
+						// this.landList = [
+						// 	{stationId: "即墨交通局"},
+						// 	{stationId: "胶州交通局"},
+						// 	{stationId: "青岛公交"},
+						// ]
 						let arr = JSON.parse(JSON.stringify(this.form.bizBusDataDetailVOList));
 						this.form.bizBusDataDetailVOList = [];
 						this.landList.map(item => {
-							let idx = arr.findIndex(item2 => item2.landName == item.stationId);
+							let idx = arr.findIndex(item2 => item2.busUnit == item.stationId);
 							console.log(idx)
 							if (idx > -1) {
 								item.isFinish = checkNotEmpty(arr[idx].passengerCount) && checkNotEmpty(arr[idx].vehicleInput) ? true :
@@ -304,7 +322,7 @@
 							} else {
 								item.isFinish = false;
 								this.form.bizBusDataDetailVOList.push({
-									"landName": item.stationId,
+									"busUnit": item.stationId,
 									"lastYearpassengerCount": '',
 									"lastYearvehicleInput": '',
 									"passengerCount": '',
@@ -388,13 +406,14 @@
 						// 	.vehicleInput) === 0 ? 0 : lastYearData.vehicleInput === 0 && parseInt(obj.vehicleInput) > 0 ? 100 : (parseInt(obj
 						// 	.vehicleInput) - lastYearData.vehicleInput) / lastYearData.vehicleInput * 100;
 							
-						this.form.bizBusDataDetailVOList[landNameIndex].passengerCountMom = calcMom(obj.passengerCount,yesterdayData.passengerCount)
+						this.form.bizBusDataDetailVOList[landNameIndex].passengerCountMom = calcMom(checkNotEmpty(obj.passengerCount) ? obj.passengerCount * 10000 : obj.passengerCount,checkNotEmpty(yesterdayData.passengerCount) ? yesterdayData.passengerCount * 10000 : yesterdayData.passengerCount)
 						// !checkNotEmpty(obj
 						// 		.passengerCount) ? '' : !checkNotEmpty(yesterdayData.passengerCount) ? '' : yesterdayData
 						// 	.passengerCount === 0 && parseInt(obj.passengerCount) === 0 ? 0 : yesterdayData.passengerCount === 0 &&
 						// 	parseInt(obj.passengerCount) > 0 ? 100 : (parseInt(obj.passengerCount) - yesterdayData.passengerCount) /
 						// 	yesterdayData.passengerCount * 100;
-						this.form.bizBusDataDetailVOList[landNameIndex].passengerCountYoy = calcYoy(obj.passengerCount,res.data.lastYearData.passengerCount)
+						console.log('check ==>',yesterdayData.passengerCount,checkNotEmpty(yesterdayData.passengerCount))
+						this.form.bizBusDataDetailVOList[landNameIndex].passengerCountYoy = calcYoy(checkNotEmpty(obj.passengerCount) ? obj.passengerCount * 10000 : obj.passengerCount, checkNotEmpty(res.data.lastYearData.passengerCount) ? res.data.lastYearData.passengerCount * 10000 : res.data.lastYearData.passengerCount)
 						// !checkNotEmpty(obj
 						// 		.passengerCount) ? '' : !checkNotEmpty(lastYearData.passengerCount) ? '' : lastYearData
 						// 	.passengerCount === 0 && parseInt(obj.passengerCount) === 0 ? 0 : lastYearData.passengerCount === 0 &&
@@ -578,6 +597,23 @@
 			padding: 30rpx 20rpx 30rpx 30rpx;
 			background-color: #fff;
 			border-radius: 30rpx;
+			.remark_item{
+				color: #333;
+				font-size: 30rpx;
+				font-weight: bold;
+				
+				.left{
+					margin-top: 20rpx;
+					margin-bottom: 30rpx;
+				}
+				
+				.right{
+					/deep/ .is-input-border{
+						border: 1rpx solid #c1c1c1 !important;
+						border-radius: 30rpx !important;
+					}
+				}
+			}
 
 			//环比同比
 			.form_item_rate {
diff --git a/pages/portShipping/pilotStation/form.vue b/pages/portShipping/pilotStation/form.vue
index c9f7ad1..066531b 100644
--- a/pages/portShipping/pilotStation/form.vue
+++ b/pages/portShipping/pilotStation/form.vue
@@ -2,9 +2,9 @@
 	<!-- 引航站报送 -->
 	<view class="edit_box">
 		<view class="top_box">
-			<view class="top_title" v-if="isShowTitle">
+			<view class="top_title">
 				<view class="top_txt">如有填报问题，请咨询公共服务中心</view>
-				<view class="bot_txt">中心值班电话：<span style="color: #2D8CF0;">66007587</span></view>
+				<view class="bot_txt">中心值班电话：<text @click="call(mobile)" class="tel">{{mobile}}</text></view>
 			</view>
 			<view class="content_box">
 				<view class="basic_box">
@@ -82,46 +82,52 @@
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">套泊热接:</p>
+						<p class="left">套泊热接组次:</p>
 						<view class="right">
-							<uni-easyinput v-model="form.capacityShuttle" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput @blur="overCount" v-model="form.berthingHeatConnectionCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+						</view>
+					</view>
+					<view class="edit_item input">
+						<p class="left">套泊热接艘次:</p>
+						<view class="right">
+							<uni-easyinput v-model="form.berthingHeatConnectionShipsCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
 						<p class="left">推近一海里(艘次):</p>
 						<view class="right">
-							<uni-easyinput type="digit" v-model="form.capacityShuttle" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput type="digit" v-model="form.seaMilesPerPropulsion" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
 						<p class="left">深水航槽直靠(艘次):</p>
 						<view class="right">
-							<uni-easyinput type="digit" v-model="form.capacityShuttle" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput type="digit" v-model="form.deepWaterChannelDirectBerthingCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
 						<p class="left">15万吨级油轮全潮时靠泊(艘次):</p>
 						<view class="right">
-							<uni-easyinput type="digit" v-model="form.capacityShuttle" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput type="digit" v-model="form.berthingCountDuringHighTideFor150kTonTanker" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
 						<p class="left">20万吨级矿船满载主航道夜航(艘次):</p>
 						<view class="right">
-							<uni-easyinput type="digit" v-model="form.capacityShuttle" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput type="digit" v-model="form.nightNavigationCountFor200kTonLoadedBulkCarrier" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
 						<p class="left">低能见度情况下完成船舶雾航(艘次):</p>
 						<view class="right">
-							<uni-easyinput type="digit" v-model="form.capacityShuttle" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput type="digit" v-model="form.shipFogNavigationCountUnderLowVisibility" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="remark_item">
 						<p class="left">备注</p>
 						<view class="right">
 							<!-- <uni-easyinput v-model="roadData.remarks" placeholder="请输入备注" placeholderStyle="color:#d4d4d4;"></uni-easyinput> -->
-							<uni-easyinput type="textarea" autoHeight v-model="roadData.remarks" placeholder="请备注信息"></uni-easyinput>
+							<uni-easyinput type="textarea" maxlength="200" autoHeight v-model="form.remarks" placeholder="请备注信息"></uni-easyinput>
 						</view>
 					</view>
 				</view>
@@ -161,11 +167,21 @@ import { calcMom, checkNotEmpty, getDateStr } from '../../../common/util'
 					qdPortPilotYoy:'', //青岛港区引航量同比
 					lyQdPilot:'', //去年同期青岛港区引航量
 					yestQdPilot:'', //昨日青岛港区引航量
+					
+					berthingHeatConnectionCount:'',
+					berthingHeatConnectionShipsCount:'',
+					seaMilesPerPropulsion:'',
+					deepWaterChannelDirectBerthingCount:'',
+					berthingCountDuringHighTideFor150kTonTanker:'',
+					nightNavigationCountFor200kTonLoadedBulkCarrier:'',
+					shipFogNavigationCountUnderLowVisibility:'',
+					remarks:''
 				},
 				roadTime:[],
 				timeName:'',
 				index:'',
 				pageType:'',
+				mobile: getApp().globalData.mobile
 			}
 		},
 		onLoad(options) {
@@ -186,6 +202,17 @@ import { calcMom, checkNotEmpty, getDateStr } from '../../../common/util'
 			formatDigit(data) {
 				return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data;
 			},
+			call(tel) {
+				uni.makePhoneCall({
+					phoneNumber: tel
+				});
+			},
+			// 根据套泊热接组次计算艘次
+			overCount(){
+				console.log(this.form.berthingHeatConnectionCount)
+				this.form.berthingHeatConnectionShipsCount = this.form.berthingHeatConnectionCount * 2
+				console.log(this.form)
+			},
 			getDetail(id){
 				this.$request(getApp().globalData.baseUrl + '/api/biz/bizPilotData/getById/' + id,{},"GET").then(res =>{
 					console.log(res)
@@ -340,6 +367,13 @@ import { calcMom, checkNotEmpty, getDateStr } from '../../../common/util'
 				font-size: 26rpx;
 				line-height: 40rpx;
 				margin-bottom: 20rpx;
+				
+				.bot_txt{
+					.tel {
+						color: #2D8CF0;
+						font-weight: bold;
+					}
+				}
 			}
 			
 			.content_box{
@@ -386,12 +420,12 @@ import { calcMom, checkNotEmpty, getDateStr } from '../../../common/util'
 						width: 100%;
 						display: flex;
 						justify-content: space-between;
-						margin-top: 32rpx;
+						margin-top: 30rpx;
 						align-items: center;
 						
-						&.input{
-							margin-top: 5rpx;
-						}
+						// &.input{
+						// 	margin-top: 5rpx;
+						// }
 						
 						.left{
 							// margin-left: 30rpx;
diff --git a/pages/roadTransport/dataSubmission/form.vue b/pages/roadTransport/dataSubmission/form.vue
index dc3efda..4f8894e 100644
--- a/pages/roadTransport/dataSubmission/form.vue
+++ b/pages/roadTransport/dataSubmission/form.vue
@@ -2,9 +2,9 @@
 	<!-- 编辑综合运输 -->
 	<view class="edit_box">
 		<view class="top_box">
-			<view class="top_title" v-if="isShowTitle">
+			<view class="top_title">
 				<view class="top_txt">如有填报问题，请咨询公共服务中心</view>
-				<view class="bot_txt">中心值班电话：<span style="color: #2D8CF0;">66007587</span></view>
+				<view class="bot_txt">中心值班电话：<text @click="call(mobile)" class="tel">{{mobile}}</text></view>
 			</view>
 			<view class="content_box">
 				<view class="basic_box">
@@ -113,7 +113,8 @@
 				isShowTitle:false,
 				timeName:'',
 				pageType:'',
-				index:''
+				index:'',
+				mobile: getApp().globalData.mobile
 			}
 		},
 		onLoad(options) {
@@ -132,6 +133,11 @@
 			
 		},
 		methods: {
+			call(tel) {
+				uni.makePhoneCall({
+					phoneNumber: tel
+				});
+			},
 			getDetail(id){
 				this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/operation/find/' + id,{},"GET").then(res=>{
 					// console.log('综合运输详情===>',res)
@@ -247,6 +253,12 @@
 				font-size: 26rpx;
 				line-height: 40rpx;
 				margin-bottom: 20rpx;
+				.bot_txt{
+					.tel {
+						color: #2D8CF0;
+						font-weight: bold;
+					}
+				}
 			}
 			
 			.content_box{
@@ -267,16 +279,16 @@
 					.con_tit{
 						width: 100%;
 						margin-top: 10rpx;
-						font-size: 40rpx;
+						font-size: 30rpx;
 						color: #333;
 						font-weight: bold;
 						margin-bottom: 9rpx;
 					}
 					
 					.remark_item{
-						color: #333;
-						font-size: 30rpx;
-						font-weight: bold;
+						color: #666;
+						font-size: 26rpx;
+						// font-weight: bold;
 						
 						.left{
 							margin-top: 20rpx;
@@ -294,12 +306,12 @@
 						width: 100%;
 						display: flex;
 						justify-content: space-between;
-						margin-top: 32rpx;
+						margin-top: 30rpx;
 						align-items: center;
 						
-						&.input{
-							margin-top: 5rpx;
-						}
+						// &.input{
+						// 	margin-top: 5rpx;
+						// }
 						
 						.left{
 							// margin-left: 30rpx;
diff --git a/pages/roadTransport/quantitySent/form.vue b/pages/roadTransport/quantitySent/form.vue
index 2ee890d..07d76ec 100644
--- a/pages/roadTransport/quantitySent/form.vue
+++ b/pages/roadTransport/quantitySent/form.vue
@@ -2,9 +2,9 @@
 	<!-- 编辑综合运输 -->
 	<view class="edit_synth">
 		<view class="top_box">
-			<view class="top_title" v-if="isShowTitle">
+			<view class="top_title">
 				<view class="top_txt">如有填报问题，请咨询公共服务中心</view>
-				<view class="bot_txt">中心值班电话：<span style="color: #2D8CF0;">66007587</span></view>
+				<view class="bot_txt">中心值班电话：<text @click="call(mobile)" class="tel">{{mobile}}</text></view>
 			</view>
 			<view class="content_box">
 				<view class="basic_box">
@@ -83,6 +83,7 @@
 				},
 				pageType:'',
 				yoymom:{},
+				mobile: getApp().globalData.mobile
 			}
 		},
 		onLoad(options) {
@@ -103,6 +104,11 @@
 			
 		},
 		methods: {
+			call(tel) {
+				uni.makePhoneCall({
+					phoneNumber: tel
+				});
+			},
 			//选择统计日期
 			bindDateChange(e) {
 				this.synthData.reportDate = e.detail.value;
@@ -230,6 +236,12 @@
 				font-size: 26rpx;
 				line-height: 40rpx;
 				margin-bottom: 20rpx;
+				.bot_txt{
+					.tel {
+						color: #2D8CF0;
+						font-weight: bold;
+					}
+				}
 			}
 			
 			.content_box{
@@ -249,7 +261,7 @@
 					.con_tit{
 						width: 100%;
 						margin-top: 10rpx;
-						font-size: 40rpx;
+						font-size: 30rpx;
 						color: #333;
 						font-weight: bold;
 						margin-bottom: 9rpx;
@@ -276,12 +288,12 @@
 						width: 100%;
 						display: flex;
 						justify-content: space-between;
-						margin-top: 32rpx;
+						margin-top: 30rpx;
 						align-items: center;
 						
-						&.input{
-							margin-top: 5rpx;
-						}
+						// &.input{
+						// 	margin-top: 5rpx;
+						// }
 						
 						.left{
 							// margin-left: 30rpx;
diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue
index 5d97987..0a24364 100644
--- a/pages/roadTransport/transportData/form.vue
+++ b/pages/roadTransport/transportData/form.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="edit_box">
 		<view class="top_box">
-			<view class="top_title" v-if="isShowTitle">
+			<view class="top_title">
 				<view class="top_txt">如有填报问题，请咨询公共服务中心</view>
-				<view class="bot_txt">中心值班电话：<span style="color: #2D8CF0;">66007587</span></view>
+				<view class="bot_txt">中心值班电话：<text @click="call(mobile)" class="tel">{{mobile}}</text></view>
 			</view>
 			<view class="content_box">
 				<view class="basic_box">
@@ -11,14 +11,18 @@
 					<view class="edit_item">
 						<p class="left unit">填报单位</p>
 						<view class="right">
-							<!-- <p v-if="pageType == 'add'">{{roadData.reportingUnitId ? roadData.reportingUnitId : ''}}</p> -->
-							<picker v-if="pageType == 'add' && deptNameList.length > 1" :value="roadData.reportingUnitIdIndex" :range="deptNameList"
+							<!-- <picker v-if="pageType == 'add' && deptNameList.length > 1" :value="roadData.reportingUnitIdIndex" :range="deptNameList"
 								range-key="deptName" @change="bindDeptChange">
 								<text class="picker_select"
 									:style="roadData.reportingUnitId?'color:#333;':''">{{roadData.reportingUnitId?roadData.reportingUnitId:'请选择'}}</text>
 								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
-							</picker>
-							<text v-else @click="showPop">{{roadData.reportingUnitId}}</text>
+							</picker> -->
+							<!--  -->
+							<view class="pick_pop"   @click="showPop" v-if="pageType == 'add' && deptNameList.length > 1">
+								<text>{{roadData.reportingUnitId}}</text>
+								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+							</view>
+							<text v-else>{{roadData.reportingUnitId}}</text>
 						</view>
 					</view>
 					<view class="edit_item">
@@ -292,7 +296,7 @@
 						<p class="left">备注</p>
 						<view class="right">
 							<!-- <uni-easyinput v-model="roadData.remarks" placeholder="请输入备注" placeholderStyle="color:#d4d4d4;"></uni-easyinput> -->
-							<uni-easyinput type="textarea" autoHeight v-model="roadData.remarks" placeholder="请备注信息"></uni-easyinput>
+							<uni-easyinput type="textarea" maxlength="200" autoHeight v-model="roadData.remarks" placeholder="请备注信息"></uni-easyinput>
 						</view>
 					</view>
 				</view>
@@ -373,7 +377,7 @@
 																	<uni-icons @click="expandItem(item3)" v-if="item3.children.length != 0 && item3.isExpand" type="bottom" size="15"></uni-icons>
 																</view>
 																<view class="right_item" @click="clickItem(item3)">
-																	{{item3.deptName}}
+																	{{item3.deptName}} 123
 																</view>
 															</view>
 														</view>
@@ -533,35 +537,36 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 				treeIndex:'',
 				selectId:'',
 				selectName:'',
-				selectId1:''
+				selectId1:'',
+				mobile: getApp().globalData.mobile
 			}
 		},
 		onLoad(options){
 			this.getUnitData()
 			this.getPersonData();
-			this.getDept()
 			let arr = uni.getStorageSync('deptName');
 			this.deptNameList = checkNotEmpty(arr) ? arr : [];
-			this.unitId = this.deptNameList.length > 0 ? this.deptNameList[0].deptId : '';
 			 if(options.type == 'edit'){
 				 const item = JSON.parse(options.item);
 				 this.pageType = 'edit'
 				 this.getDetail(item.id);
 			 }else if(options.type == 'add'){
 				 this.pageType = 'add';
-				 this.roadData.reportingUnitId = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : '';
-				 this.roadData.reportingUnitIdIndex = this.deptNameList.length > 0 ? 0 : '';
+				 this.getDept()
 				 this.getRoadTime()
-				 this.getPeople()
 				 let now =  new Date();
 				 this.roadData.statisticalDate = getDateStr(now, -1);//默认前一天
 			 }
 			
 		},
 		methods: {
+			call(tel) {
+				uni.makePhoneCall({
+					phoneNumber: tel
+				});
+			},
 			showPop(){
 				this.selectId = this.selectId1;
-				
 				this.$refs.unitPopup.open('bottom')
 				this.newArr = []
 				this.traversalTree(this.treeData,this.newArr);
@@ -608,8 +613,8 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 						console.log('deptNameList ===>',this.peopleList)
 						let tmp = this.peopleList.find(item => item.id == this.roadData.responsiblePersonId)
 						this.peopleIndex = this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId)
-						this.peopleName = tmp.people
-						console.log(tmp)
+						this.peopleName = tmp ? tmp.people : '' + this.roadData.contactNumber
+						
 					}
 				})
 				
@@ -617,14 +622,21 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 			getDept(){
 				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.roadData.reportingUnitId = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : '';
+						this.roadData.reportingUnitIdIndex = this.deptNameList.length > 0 ? 0 : '';
+						this.selectId1 = this.unitId
+					}
 				})
 			},
 			getDetail(id){
 				this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/find/' + id,{},"GET").then(res =>{
 					this.roadData = res.data;
-					
 					this.getRoadTime();
-					this.getPeople()
+					this.getDept()
 					// console.log('last==>',lastYearDate(this.roadData.statisticalDate))
 				})
 			},
@@ -634,15 +646,15 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 					reportPhase:this.roadData.reportPhase
 				}
 				this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/findByStatisticalDate',params,"GET").then(res =>{
-					// this.lastData = res.data;
+					this.lastData = res.data;
 					// this.calcRatio()
-					let yesterdayData = res.data.yesterdayData;
-					let lastYearData = res.data.lastYearData;
-					this.roadData.passengerVolumeYesterday = yesterdayData.totalPassengerVolume
-					this.roadData.passengerVolumeLastYear = lastYearData.totalPassengerVolume
+					// let yesterdayData = res.data.yesterdayData;
+					// let lastYearData = res.data.lastYearData;
+					// this.roadData.passengerVolumeYesterday = yesterdayData.totalPassengerVolume
+					// this.roadData.passengerVolumeLastYear = lastYearData.totalPassengerVolume
 					
-					this.roadData.totalBusYesterday = yesterdayData.capacityTotalBus
-					this.roadData.totalBusLastYear = yesterdayData.capacityTotalBus
+					// this.roadData.totalBusYesterday = yesterdayData.capacityTotalBus
+					// this.roadData.totalBusLastYear = yesterdayData.capacityTotalBus
 					
 					// 客运量与去年同期比率(%)
 					// 同比逻辑：
@@ -650,17 +662,21 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 					// 2、今日数据有值且不为0，去年数据无值为-，去年数据为0时为100；
 					// 3、今日数据无值，去年数据无论有值或为0，同比为-
 					// 4、今日、去年今日都有值且都不为0时，按照公式计算(今日-去年今日)/去年今日 * 100；
-					this.roadData.passengerVolumeRatio = 
-					(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.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)
+					
+					// (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 = 
-					 (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) ?  
-					 	(this.roadData.capacityTotalBus - this.lastData.capacityTotalBus) / this.lastData.capacityTotalBus * 100 :
-					 	(this.roadData.capacityTotalBus == 0 && this.lastData.capacityTotalBus == 0) ? 0 : ''
+					this.roadData.totalBusIncreaseRatio = calcMom(this.roadData.capacityTotalBus,this.lastData.totalBusYesterday)
+					this.roadData.totalBusIncreaseRatio = calcMom(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) ?  
+					 // 	(this.roadData.capacityTotalBus - this.lastData.capacityTotalBus) / this.lastData.capacityTotalBus * 100 :
+					 // 	(this.roadData.capacityTotalBus == 0 && this.lastData.capacityTotalBus == 0) ? 0 : ''
 				})
 			},
 			//选择统计日期
@@ -828,6 +844,13 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 				font-size: 26rpx;
 				line-height: 40rpx;
 				margin-bottom: 20rpx;
+				
+				.bot_txt{
+					.tel {
+						color: #2D8CF0;
+						font-weight: bold;
+					}
+				}
 			}
 			
 			.content_box{
@@ -847,7 +870,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 					.con_tit{
 						width: 100%;
 						margin-top: 10rpx;
-						font-size: 40rpx;
+						font-size: 30rpx;
 						color: #333;
 						font-weight: bold;
 						margin-bottom: 9rpx;
@@ -874,13 +897,17 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 						width: 100%;
 						display: flex;
 						justify-content: space-between;
-						margin-top: 32rpx;
+						margin-top: 30rpx;
 						align-items: center;
 						
-						&.input{
-							margin-top: 5rpx;
+						.pick_pop{
+							display: flex;
 						}
 						
+						// &.input{
+						// 	margin-top: 5rpx;
+						// }
+						
 						.left{
 							// margin-left: 30rpx;
 							min-width: 320rpx;
@@ -909,6 +936,17 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 								
 							}
 							
+							
+							
+								.picker_select {
+									flex: 1;
+									color: #D4D4D4;
+									font-size: 28rpx;
+									font-family: PingFang SC-Regular, PingFang SC;
+									font-weight: 400;
+									text-align: right;
+								}
+							
 							/deep/ .uni-date-editor{
 								display: flex;
 								align-items: center;
@@ -1105,10 +1143,16 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 									}
 									
 									.four_item{
+										width: 100%;
 										.four_item_item{
+											width: 100%;
 											display: flex;
 											padding: 10rpx 0 10rpx 120rpx;
 											
+											&.check{
+												background: rgba(45, 140, 240,0.2);
+											}
+											
 											.left_item{
 												width: 40rpx;
 												height: 40rpx;