From dae4dd37d7d716aea8020c6f83a435453b9b9a15 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 8 Sep 2023 18:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=81=93=E8=B7=AF=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E4=B8=8E=E5=85=AC=E4=BA=A4=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.json                                  |  17 +-
 pages/bus/busDataInfo/form-copy.vue         | 617 +++++++++++++
 pages/bus/busDataInfo/form.vue              | 954 ++++++++++++--------
 pages/home/index.vue                        |   4 +-
 pages/portShipping/pilotStation/form.vue    |  22 +
 pages/portShipping/pilotStation/list.vue    |  23 +
 pages/roadTransport/dataSubmission/form.vue |  94 +-
 pages/roadTransport/transportData/form.vue  | 241 ++---
 8 files changed, 1462 insertions(+), 510 deletions(-)
 create mode 100644 pages/bus/busDataInfo/form-copy.vue
 create mode 100644 pages/portShipping/pilotStation/form.vue
 create mode 100644 pages/portShipping/pilotStation/list.vue

diff --git a/pages.json b/pages.json
index dc0d926..ca75977 100644
--- a/pages.json
+++ b/pages.json
@@ -156,7 +156,8 @@
 		{
 			"path": "pages/roadTransport/transportData/list",
 			"style": {
-				"navigationBarTitleText": "道路运输"
+				"navigationBarTitleText": "道路运输",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -206,6 +207,20 @@
             "style": {
             	"navigationBarTitleText": "公交投入数据报送"
             }
+        },
+        {
+			"path": "pages/portShipping/pilotStation/list",
+			"style": {
+				"navigationBarTitleText": "引航站"
+			}
+		}
+        ,{
+            "path" : "pages/bus/busDataInfo/form-copy",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
             
         }
     ],
diff --git a/pages/bus/busDataInfo/form-copy.vue b/pages/bus/busDataInfo/form-copy.vue
new file mode 100644
index 0000000..2e95c02
--- /dev/null
+++ b/pages/bus/busDataInfo/form-copy.vue
@@ -0,0 +1,617 @@
+<template>
+	<!-- 公交投入数据表单 -->
+	<view class="form_warp">
+		<view class="form_item_box">
+			<view class="form_item_title">基本信息</view>
+			<view class="form_item">
+				<view class="form_item_label">统计日期：</view>
+				<view class="form_item_input picker">
+					<picker mode="date" :value="form.reportDate" @change="bindDateChange">
+						<text class="picker_select"
+							:style="form.reportDate?'color:#333;':''">{{form.reportDate?form.reportDate:'请选择统计日期'}}</text>
+						<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+					</picker>
+				</view>
+			</view>
+			<view class="form_item">
+				<view class="form_item_label">统计时段：</view>
+				<view class="form_item_input picker">
+					<picker :value="index" :range="timeArray" range-key="dictLabel" @change="bindtimeChange">
+						<text class="picker_select"
+							:style="index>-1?'color:#333;':''">{{timeName ? timeName :'请选择统计时段'}}</text>
+						<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+					</picker>
+				</view>
+			</view>
+		</view>
+		<view class="form_item_box bottom">
+			<view class="form_item_li" v-for="(item,index) in form.bizBusDataDetailVOList" :key="index">
+				<view class="form_item"
+					style="display:flex; justify-content: space-between; font-size: 30rpx;color:#333;font-weight: bold;margin-top: 30rpx;">
+					运行数据-{{index+1}}
+					<uni-icons type="trash" color="red" @click="delRow(index)" size="18"></uni-icons>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">名称：</view>
+					<view class="form_item_input picker">
+						<picker :value="item.busIndex" :range="busArray" range-key="stationId"
+							@change="e => changeBusway(e, 'bizBusDataDetailVOList', index)">
+							<text class="picker_select"
+								:style="item.busUnit?'color:#333;':''">{{item.busUnit ? item.busUnit : '请选择'}}</text>
+							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+						</picker>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">投入车辆：</view>
+					<view class="form_item_input form_input"><!-- digit -->
+						<uni-easyinput type="digit" v-model="item.vehicleInput" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('vehicleInput','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="form_item_rate" v-if="item.vehicleInputMom || item.vehicleInputYoy" :class="item.vehicleInputMom == 0 ? 'danger' : '' ">
+					<view class="rate_item">
+						<view class="rate_item_label" :style="item.vehicleInputMom == 0 ? 'color: #EB4747' : ''">投入车辆环比(%)</view>
+						<view class="rate_item_input" :style="item.vehicleInputMom == 0 ? 'color: #EB4747' : ''">
+							{{item.vehicleInputMom === 0 ? item.vehicleInputMom : item.vehicleInputMom ? item.vehicleInputMom.toFixed(2) : ''}}
+						</view>
+					</view>
+					<view class="line"></view>
+					<view class="rate_item">
+						<view class="rate_item_label">投入车辆同比(%)</view>
+						<view class="rate_item_input">
+							{{item.vehicleInputYoy === 0 ? item.vehicleInputYoy : item.vehicleInputYoy ? item.vehicleInputYoy.toFixed(2) : ''}}
+						</view>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">运行班次：</view>
+					<view class="form_item_input form_input"><!-- digit -->
+						<uni-easyinput type="number" v-model="item.operatingShifts" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('operatingShifts','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="form_item_rate" v-if="item.operatingShiftsMom || item.operatingShiftsYoy" :class="item.operatingShiftsMom == 0 ? 'danger' : '' ">
+					<view class="rate_item">
+						<view class="rate_item_label" :style="item.operatingShiftsMom == 0 ? 'color: #EB4747' : ''">运行班次环比(%)</view>
+						<view class="rate_item_input" :style="item.operatingShiftsMom == 0 ? 'color: #EB4747' : ''">
+							{{item.operatingShiftsMom === 0 ? item.operatingShiftsMom : item.operatingShiftsMom ? item.operatingShiftsMom.toFixed(2) : ''}}
+						</view>
+					</view>
+					<view class="line"></view>
+					<view class="rate_item">
+						<view class="rate_item_label">运行班次同比(%)</view>
+						<view class="rate_item_input">
+							{{item.operatingShiftsYoy === 0 ? item.operatingShiftsYoy : item.operatingShiftsYoy ? item.operatingShiftsYoy.toFixed(2) : ''}}
+						</view>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">人数(万人)：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput type="digit" v-model="item.passengerCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('passengerCount','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="form_item_rate" v-if="item.passengerCountMom || item.passengerCountYoy" :class="item.passengerCountMom == 0 ? 'danger' : '' ">
+					<view class="rate_item">
+						<view class="rate_item_label" :style="item.passengerCountMom == 0 ? 'color: #EB4747' : ''">人数环比(%)</view>
+						<view class="rate_item_input" :style="item.passengerCountMom == 0 ? 'color: #EB4747' : ''">
+							{{item.passengerCountMom === 0 ? item.passengerCountMom : item.passengerCountMom ? item.passengerCountMom.toFixed(2) : ''}}
+						</view>
+					</view>
+					<view class="line"></view>
+					<view class="rate_item">
+						<view class="rate_item_label">人数同比(%)</view>
+						<view class="rate_item_input">
+							{{item.passengerCountYoy === 0 ? item.passengerCountYoy : item.passengerCountYoy ? item.passengerCountYoy.toFixed(2) : ''}}
+						</view>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">昨日投入车辆：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput type="digit" v-model="item.yestVehicleInput" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('yestVehicleInput','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">昨日运行班次：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput type="digit" v-model="item.yestOperatingShifts" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('yestOperatingShifts','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">昨日人数：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput type="digit" v-model="item.yestPassengerCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('yestPassengerCount','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">去年投入车辆：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput type="digit" v-model="item.lyVehicleInput" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('lyVehicleInput','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">去年运行班次：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput type="digit" v-model="item.lyOperatingShifts" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('lyOperatingShifts','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">去年人数：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput type="digit" v-model="item.lyPassengerCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+							placeholder="请输入" @blur="checkNumber('lyPassengerCount','bizBusDataDetailVOList',index)"></uni-easyinput>
+					</view>
+				</view>
+				<view class="line"></view>
+			</view>
+			<view class="add_btn" @click="addRow()">增行</view>
+		</view>
+		<view class="foot_btn">
+			<view class="act_btn" @click="doCancel">取消</view>
+			<view class="act_btn blue" @click="doSubmit">确认</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { getDateStr } from '../../../common/util'
+	export default {
+		data() {
+			return {
+				timeArray:[],
+				pageType:'',
+				form:{
+					reportDate:'',
+					bizBusDataDetailVOList:[
+						{
+							busUnit:'',
+							busIndex:'',
+							vehicleInput:'',
+							vehicleInputMom:0,
+							vehicleInputYoy:0,
+							operatingShiftsMom:0,
+							operatingShiftsYoy:0,
+							passengerCount:'',
+							passengerCountMom:0,
+							passengerCountYoy:0,
+							yestVehicleInput:'',
+							yestOperatingShifts:'',
+							yestPassengerCount:'',
+							lyVehicleInput:'',
+							lyOperatingShifts:'',
+							lyPassengerCount:''
+						}
+					],
+					bizBusDataBodySaveOrUpdateDTOList:[]
+				},
+				index:'',
+				timeName:'',
+				busArray:[],
+				yoyMom:{},
+			}
+		},
+		onLoad(options) {
+			console.log(options)
+			this.getRoadTime();
+			// this.getBusData();
+			this.getPermiss()
+			if(options.type == 'add'){
+				this.pageType = 'add';
+				let now =  new Date();
+				this.form.reportDate = getDateStr(now,0)
+			}else if(options.type == 'edit'){
+				this.pageType == 'edit';
+				this.form = JSON.parse(options.item) 
+			}
+		},
+		methods: {
+			// 获取权限
+			getPermiss(){
+				this.$request(getApp().globalData.baseUrl + '/api/biz/bizBusAuthority/findList',{},"GET").then(res =>{
+					console.log('数据权限==>',res)
+					this.busArray = res.data
+				})
+			},
+			// 获取时段
+			getRoadTime(){
+				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=' + Date.parse(new Date()),"GET").then(res =>{
+					this.timeArray = res.data;
+					if(this.pageType == 'edit'){
+						this.index = this.timeArray.findIndex(item => item.dictValue == this.form.statPeriod)
+						this.timeName = this.timeArray.find(item => item.dictValue == this.form.statPeriod).dictLabel
+					}else if(this.pageType == 'add'){
+						let now = new Date();
+						let dateStr = getDateStr(now,0);
+						if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
+							this.form.statPeriod = "0012";
+							this.index = this.timeArray.findIndex(item => item.dictValue == "0012")
+							this.timeName = this.timeArray.find(item => item.dictValue == "0012").dictLabel
+						}else{
+							this.form.statPeriod = "03";
+							this.index = this.timeArray.findIndex(item => item.dictValue == "03")
+							this.timeName = this.timeArray.find(item => item.dictValue == "03").dictLabel
+						}
+					}
+					
+				})
+			},
+			 // 获取同比环比
+			getYoyMom(item,index){
+				let params = {
+					busUnit:item.busUnit,
+					statDate:this.form.reportDate
+				}
+				// console.log(params)
+				this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getYoyMom', params,"GET").then(res =>{
+					console.log('同比环比数据===>',res)
+					this.yoyMom = res.data;
+					this.checkYoyMom(index)
+				})
+			},
+			// 点击确定按钮
+			doSubmit(){
+				this.form.bizBusDataBodySaveOrUpdateDTOList = this.form.bizBusDataDetailVOList
+				console.log(this.form)
+				let params = this.form;
+				if(!this.form.reportDate){
+					uni.showToast({
+						title:"请选择统计日期",
+						icon:"none"
+					})
+				}else if(!this.form.statPeriod){
+					uni.showToast({
+						title:"请选择统计时段",
+						icon:"none"
+					})
+				}else{
+					uni.showModal({
+						title:'提示',
+						content:"确认保存当前报送数据吗?",
+						success: (res) => {
+							if(res.confirm){
+								uni.showLoading({
+									title: '提交中...',
+									mask: true
+								})
+								this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/saveOrUpdate',params,"POST").then(res =>{
+									console.log(res)
+									if(res.code == 200){
+										uni.hideLoading();
+										uni.showToast({
+											title: '报送提交成功',
+											icon: 'none',
+											success: () => {
+												if(!this.form.id) {
+													uni.redirectTo({
+														url:"/pages/bus/busDataInfo/list"
+													})
+												}
+												else {
+													uni.navigateBack();
+												}
+											}
+										})
+									}
+								})
+							}
+						}
+					})
+					
+				}
+			},
+			// 计算同比环比
+			checkYoyMom(index){
+				// 环比
+				if(this.yoyMom.yesterdayData){
+					// this.form.bizBusDataDetailVOList[index].operatingShiftsMom = this.form.bizBusDataDetailVOList[index].operatingShifts && this.yoyMom.yesterdayData.operatingShifts ? 
+					// (this.form.bizBusDataDetailVOList[index].operatingShifts - this.yoyMom.yesterdayData.operatingShifts) / this.yoyMom.yesterdayData.operatingShifts * 100 : '';
+					
+					this.form.bizBusDataDetailVOList[index].operatingShiftsMom = !checkNotEmpty(this.yoyMom.yesterdayData.operatingShifts) || this.yoyMom.yesterdayData.operatingShifts === 0 ? 100 : this.form.bizBusDataDetailVOList[index].operatingShifts ? (parseInt(this
+							.form.bizBusDataDetailVOList[index].operatingShifts) - this.yoyMom.yesterdayData.operatingShifts) / this.yoyMom.yesterdayData.operatingShifts *
+						100 : '';
+					
+					// this.form.bizBusDataDetailVOList[index].passengerCountMom = this.form.bizBusDataDetailVOList[index].passengerCount && this.yoyMom.yesterdayData.passengerCount ?
+					// (this.form.bizBusDataDetailVOList[index].passengerCount - this.yoyMom.yesterdayData.passengerCount) / this.yoyMom.yesterdayData.passengerCount * 100 : '';
+					
+					this.form.bizBusDataDetailVOList[index].passengerCountMom = !checkNotEmpty(this.yoyMom.yesterdayData.passengerCount) || this.yoyMom.yesterdayData.passengerCount === 0 ? 100 : this.form.bizBusDataDetailVOList[index].passengerCount ? (parseInt(this
+							.form.bizBusDataDetailVOList[index].passengerCount) - this.yoyMom.yesterdayData.passengerCount) / this.yoyMom.yesterdayData.passengerCount *
+						100 : '';
+						
+					// this.form.bizBusDataDetailVOList[index].vehicleInputMom = this.form.bizBusDataDetailVOList[index].vehicleInput && this.yoyMom.yesterdayData.vehicleInput ?
+					// (this.form.bizBusDataDetailVOList[index].vehicleInput - this.yoyMom.yesterdayData.vehicleInput) / this.yoyMom.yesterdayData.vehicleInput * 100 : '';
+				
+					this.form.bizBusDataDetailVOList[index].vehicleInputMom = !checkNotEmpty(this.yoyMom.yesterdayData.vehicleInput) || this.yoyMom.yesterdayData.vehicleInput === 0 ? 100 : this.form.bizBusDataDetailVOList[index].vehicleInput ? (parseInt(this
+							.form.bizBusDataDetailVOList[index].vehicleInput) - this.yoyMom.yesterdayData.vehicleInput) / this.yoyMom.yesterdayData.vehicleInput *
+						100 : '';
+				}
+				// 同比
+				if(this.yoyMom.lastYearData){
+					// this.form.bizBusDataDetailVOList[index].operatingShiftsYoy = this.form.bizBusDataDetailVOList[index].operatingShifts && this.yoyMom.lastYearData.operatingShifts ? 
+					// (this.form.bizBusDataDetailVOList[index].operatingShifts - this.yoyMom.lastYearData.operatingShifts) / this.yoyMom.lastYearData.operatingShifts * 100 : '';
+					
+					this.form.bizBusDataDetailVOList[index].operatingShiftsYoy = !checkNotEmpty(this.yoyMom.lastYearData.operatingShifts) || this.yoyMom.lastYearData.operatingShifts === 0 ? 100 : this.form.bizBusDataDetailVOList[index].operatingShifts ? (parseInt(this
+							.form.bizBusDataDetailVOList[index].operatingShifts) - this.yoyMom.lastYearData.operatingShifts) / this.yoyMom.lastYearData.operatingShifts *
+						100 : '';
+					
+					// this.form.bizBusDataDetailVOList[index].passengerCountYoy = this.form.bizBusDataDetailVOList[index].passengerCount && this.yoyMom.lastYearData.passengerCount ?
+					// (this.form.bizBusDataDetailVOList[index].passengerCount - this.yoyMom.lastYearData.passengerCount) / this.yoyMom.lastYearData.passengerCount * 100 : '';
+					
+					this.form.bizBusDataDetailVOList[index].passengerCountYoy = !checkNotEmpty(this.yoyMom.lastYearData.passengerCount) || this.yoyMom.lastYearData.passengerCount === 0 ? 100 : this.form.bizBusDataDetailVOList[index].passengerCount ? (parseInt(this
+							.form.bizBusDataDetailVOList[index].passengerCount) - this.yoyMom.lastYearData.passengerCount) / this.yoyMom.lastYearData.passengerCount *
+						100 : '';
+					
+					// this.form.bizBusDataDetailVOList[index].vehicleInputYoy = this.form.bizBusDataDetailVOList[index].vehicleInput && this.yoyMom.lastYearData.vehicleInput ?
+					// (this.form.bizBusDataDetailVOList[index].vehicleInput - this.yoyMom.lastYearData.vehicleInput) / this.yoyMom.lastYearData.vehicleInput * 100 : '';
+					
+					this.form.bizBusDataDetailVOList[index].vehicleInputYoy = !checkNotEmpty(this.yoyMom.lastYearData.vehicleInput) || this.yoyMom.lastYearData.vehicleInput === 0 ? 100 : this.form.bizBusDataDetailVOList[index].vehicleInput ? (parseInt(this
+							.form.bizBusDataDetailVOList[index].vehicleInput) - this.yoyMom.lastYearData.vehicleInput) / this.yoyMom.lastYearData.vehicleInput *
+						100 : '';
+				}
+			},
+			// 获取公交车
+			// getBusData(){
+			// 	this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=bus_unit&_t=' + Date.parse(new Date()),{},"GET").then(res =>{
+			// 		this.busArray = res.data
+			// 	})
+			// },
+			//选择统计日期
+			bindDateChange(e) {
+				this.form.reportDate = e.detail.value;
+			},
+			//选择时段
+			bindtimeChange(e){
+				let index = e.target.value;
+				var selected = this.timeArray[index];
+				this.form.statPeriod = selected.dictValue;
+				this.timeName = selected.dictLabel
+			},
+			// 切换公交车
+			changeBusway(e,key,index){
+				this.form[key][index].busIndex = e.detail.value;
+				this.form[key][index].busUnit = this.busArray[e.detail.value].stationId;
+				this.getYoyMom(this.form[key][index],index)
+			},
+			// 验证格式为数字且最多只有一个小数点
+			checkNumber(val,key,index){ // 值允许输入一个小数点和数字 
+				if(this.form[key][index][val]){
+					if(val == 'operatingShifts' || val == 'passengerCount' || val == 'vehicleInput'){
+						console.log(this.form[key][index])
+						this.getYoyMom(this.form[key][index])
+					}
+					this.form[key][index][val] = this.form[key][index][val].replace(/[^\d.]/g,""); //先把非数字的都替换掉，除了数字和. 
+					this.form[key][index][val] = this.form[key][index][val].replace(/^\./g,""); //必须保证第一个为数字而不是. 
+					this.form[key][index][val] = this.form[key][index][val].replace(/\.{2,}/g,"."); //保证只有出现一个.而没有多个. 
+					this.form[key][index][val] = this.form[key][index][val].replace(".","$#$").replace(/\./g,"").replace("$#$","."); //保证.只出现一次，而不能出现两次以上 
+				}
+			},
+			// 点击增行按钮
+			addRow(){
+				this.form.bizBusDataDetailVOList.push(
+					{
+						busUnit:'',
+						busIndex:'',
+						vehicleInput:'',
+						vehicleInputMom:0,
+						vehicleInputYoy:0,
+						operatingShiftsMom:0,
+						operatingShiftsYoy:0,
+						passengerCount:'',
+						passengerCountMom:0,
+						passengerCountYoy:0,
+						yestVehicleInput:'',
+						yestOperatingShifts:'',
+						yestPassengerCount:'',
+						lyVehicleInput:'',
+						lyOperatingShifts:'',
+						lyPassengerCount:''
+					}
+				)
+					
+			},
+			// 点击删行按钮
+			delRow(index){
+				this.form.bizBusDataDetailVOList.splice(index, 1);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form_warp {
+		padding: 30rpx 30rpx 195rpx;
+		
+		.form_intro {
+			color: #666;
+			font-size: 26rpx;
+			font-family: PingFang SC-Bold, PingFang SC;
+			line-height: 48rpx;
+			text-align: center;
+			margin-bottom: 20rpx;
+		
+			.tel {
+				color: #2D8CF0;
+				font-weight: bold;
+			}
+		}
+		
+		.form_item_box {
+			padding: 30rpx 20rpx 30rpx 30rpx;
+			background-color: #fff;
+			border-radius: 30rpx;
+			
+			&.bottom{
+				margin-top: 30rpx;
+			}
+			
+			//环比同比
+			.form_item_rate{
+				background: #F6F6F6;
+				border: 1px solid #F6F6F6;
+				padding: 30rpx;
+				margin-bottom: 30rpx;
+				border-radius: 30rpx;
+				.line{
+					height: 1px;
+					background-color: #dfdfdf;
+					margin: 30rpx 0;
+				}
+				.rate_item{
+					display: flex;
+					justify-content: space-between;
+					font-size: 24rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					.rate_item_label{
+						color: #666;
+						font-size: 24rpx;
+					}
+					.rate_item_input{
+						color: #333;
+						font-size: 28rpx;
+					}
+				}
+				&.danger{
+					background-color: #FEF6F3;
+					border-color: #F0622D;
+				}
+			}
+		
+			.form_item_title {
+				color: #333;
+				line-height: 42rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				margin-bottom: 30rpx;
+			}
+			.form_item_remark{
+				margin-bottom: 30rpx;
+				.form_item_label{
+					color: #333333;
+					line-height: 42rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC-Bold, PingFang SC;
+					font-weight: bold;
+					margin-bottom: 30rpx;
+				}
+			}
+			.form_item {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				line-height: 37rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				margin-bottom: 30rpx;
+		
+				.form_item_label {
+					width: 300rpx;
+					color: #666666;
+					font-size: 26rpx;
+					word-break: break-all;
+				}
+		
+				.form_item_input {
+					color: #333;
+					text-align: right;
+					word-break: break-all;
+		
+					&.picker {
+						flex: 1;
+						display: flex;
+						justify-content: space-between;
+						
+						/deep/ picker {
+							flex: 1;
+						}
+		
+						.picker_select {
+							color: #D4D4D4;
+							font-size: 28rpx;
+							font-family: PingFang SC-Regular, PingFang SC;
+							font-weight: 400;
+							text-align: right;
+						}
+					}
+					
+					//纯展示
+					&.text{
+						color: #333333;
+						line-height: 40rpx;
+						font-size: 28rpx;
+						font-family: PingFang SC-Regular, PingFang SC;
+						font-weight: 400;
+					}
+					//输入框
+					&.form_input{
+						/deep/ .is-input-border{
+							border: 0 !important;
+							.uni-easyinput__content-input{
+								text-align: right;
+							}
+						}
+					}
+				}
+			}
+			
+		}
+	}
+	//增行
+	.line {
+		height: 1px;
+		background-color: #E1E1E1;
+	}
+	
+	.add_btn {
+		height: 90rpx;
+		line-height: 90rpx;
+		color: #2D8CF0;
+		font-size: 28rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		text-align: center;
+		background: #ECF5FF;
+		border-radius: 30rpx;
+		border: 2rpx solid #2D8CF0;
+		margin-top: 30rpx;
+	}
+	.foot_btn {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		padding: 40rpx 30rpx;
+		background-color: #f5f5f5;
+		z-index: 11;
+	
+		.act_btn {
+			width: 329rpx;
+			height: 90rpx;
+			color: #666666;
+			font-size: 28rpx;
+			line-height: 90rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			text-align: center;
+			background: #F6F6F6;
+			border-radius: 100rpx;
+			border: 1rpx solid #C1C1C1;
+	
+			&.blue {
+				color: #fff;
+				background: #2D8CF0;
+				border-color: #2D8CF0;
+			}
+		}
+	}
+</style>
diff --git a/pages/bus/busDataInfo/form.vue b/pages/bus/busDataInfo/form.vue
index 2e95c02..dea9e39 100644
--- a/pages/bus/busDataInfo/form.vue
+++ b/pages/bus/busDataInfo/form.vue
@@ -1,14 +1,29 @@
 <template>
-	<!-- 公交投入数据表单 -->
 	<view class="form_warp">
+		<!-- <view class="form_intro">
+			<view>如有填报问题，请咨询公共服务中心</view>
+			<view>中心值班电话：<text class="tel">66007587</text></view>
+		</view> -->
 		<view class="form_item_box">
 			<view class="form_item_title">基本信息</view>
+			<!-- <view class="form_item">
+				<view class="form_item_label">管理单位名称：</view>
+				<view class="form_item_input select">
+					{{form.affiliatedUnit}}
+				</view>
+			</view> -->
+			<view class="form_item" v-if="form.bizBusDataDetailVOList.length == 1">
+				<view class="form_item_label">名称：</view>
+				<view class="form_item_input select">
+					{{form.bizBusDataDetailVOList.length > 0 ? form.bizBusDataDetailVOList[busIndex].busUnit : ''}}
+				</view>
+			</view>
 			<view class="form_item">
 				<view class="form_item_label">统计日期：</view>
 				<view class="form_item_input picker">
 					<picker mode="date" :value="form.reportDate" @change="bindDateChange">
 						<text class="picker_select"
-							:style="form.reportDate?'color:#333;':''">{{form.reportDate?form.reportDate:'请选择统计日期'}}</text>
+							:style="form.reportDate?'color:#333;':''">{{form.reportDate?form.reportDate:'请选择时段'}}</text>
 						<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 					</picker>
 				</view>
@@ -16,409 +31,501 @@
 			<view class="form_item">
 				<view class="form_item_label">统计时段：</view>
 				<view class="form_item_input picker">
-					<picker :value="index" :range="timeArray" range-key="dictLabel" @change="bindtimeChange">
+					<picker :value="index" :range="array" range-key="dictLabel" @change="changeStatPeriod">
 						<text class="picker_select"
-							:style="index>-1?'color:#333;':''">{{timeName ? timeName :'请选择统计时段'}}</text>
+							:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text>
 						<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 					</picker>
 				</view>
 			</view>
 		</view>
-		<view class="form_item_box bottom">
-			<view class="form_item_li" v-for="(item,index) in form.bizBusDataDetailVOList" :key="index">
-				<view class="form_item"
-					style="display:flex; justify-content: space-between; font-size: 30rpx;color:#333;font-weight: bold;margin-top: 30rpx;">
-					运行数据-{{index+1}}
-					<uni-icons type="trash" color="red" @click="delRow(index)" size="18"></uni-icons>
+		<!-- 陆岛权限 -->
+		<view class="station_box">
+			<view v-if="index < 9" :style="(index+1)%3 == 0 ? 'margin-right:0;':''" @click="changeLandNameIndex(index)"
+				class="station_item" :class="[item.isFinish ? 'active' : '',index == landNameIndex ? 'choosed' : '']"
+				v-for="(item, index) in landList" :key="item.id">
+				<view v-if='item.isFinish' class="tag">
+					<uni-icons type="checkmarkempty" color="#fff" size="12"></uni-icons>
 				</view>
-				<view class="form_item">
+				{{item.stationId || ''}}
+			</view>
+			<view v-if="index >= 9 && showLand" :style="(index+1)%3 == 0 ? 'margin-right:0;':''"
+				@click="changeLandNameIndex(index)" class="station_item"
+				:class="[item.isFinish ? 'active' : '',index == landNameIndex ? 'choosed' : '']"
+				v-for="(item, index) in landList" :key="item.id">
+				<view v-if='item.isFinish' class="tag">
+					<uni-icons type="checkmarkempty" color="#fff" size="12"></uni-icons>
+				</view>
+				{{item.stationId || ''}}
+			</view>
+		</view>
+		<view class="form_item_box"
+			:style="form.bizBusDataDetailVOList.length == 0 ?  'margin-top: 30rpx;' : ''">
+			<!-- 陆岛 -->
+			<view class="form_item_li">
+				<view class="form_item" v-if="form.bizBusDataDetailVOList.length > 1">
 					<view class="form_item_label">名称：</view>
 					<view class="form_item_input picker">
-						<picker :value="item.busIndex" :range="busArray" range-key="stationId"
-							@change="e => changeBusway(e, 'bizBusDataDetailVOList', index)">
+						<!-- <picker :value="item.landNameIndex" :range="landList" @change="e => changeLandName(e, index)">
 							<text class="picker_select"
-								:style="item.busUnit?'color:#333;':''">{{item.busUnit ? item.busUnit : '请选择'}}</text>
+								:style="item.landName?'color:#333;':''">{{item.landName ? item.landName : '请选择'}}</text>
 							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
-						</picker>
+						</picker> -->
+						{{form.bizBusDataDetailVOList.length >= 0 ? form.bizBusDataDetailVOList[landNameIndex].busUnit : ''}}
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">投入车辆：</view>
-					<view class="form_item_input form_input"><!-- digit -->
-						<uni-easyinput type="digit" v-model="item.vehicleInput" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('vehicleInput','bizBusDataDetailVOList',index)"></uni-easyinput>
+					<view class="form_item_input form_input">
+						<uni-easyinput @blur="calcYoyMom(landNameIndex)" type="number"
+							v-model="form.bizBusDataDetailVOList[landNameIndex].vehicleInput"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
 					</view>
 				</view>
-				<view class="form_item_rate" v-if="item.vehicleInputMom || item.vehicleInputYoy" :class="item.vehicleInputMom == 0 ? 'danger' : '' ">
+				<!-- 同比环比 -->
+				<view class="form_item_rate"
+					:class="form.bizBusDataDetailVOList[landNameIndex].vehicleInput && form.bizBusDataDetailVOList[landNameIndex].vehicleInput == form.bizBusDataDetailVOList[landNameIndex].yestVehicleInput ? 'danger' : '' ">
 					<view class="rate_item">
-						<view class="rate_item_label" :style="item.vehicleInputMom == 0 ? 'color: #EB4747' : ''">投入车辆环比(%)</view>
-						<view class="rate_item_input" :style="item.vehicleInputMom == 0 ? 'color: #EB4747' : ''">
-							{{item.vehicleInputMom === 0 ? item.vehicleInputMom : item.vehicleInputMom ? item.vehicleInputMom.toFixed(2) : ''}}
+						<view class="rate_item_label"
+							:style="form.bizBusDataDetailVOList[landNameIndex].vehicleInput && form.bizBusDataDetailVOList[landNameIndex].vehicleInput == form.bizBusDataDetailVOList[landNameIndex].yestVehicleInput ? 'color: #EB4747' : ''">
+							投入车辆环比
+						</view>
+						<view class="rate_item_input"
+							:style="form.bizBusDataDetailVOList[landNameIndex].vehicleInput && item.vehicleInput == form.bizBusDataDetailVOList[landNameIndex].yestVehicleInput ? 'color: #EB4747' : ''">
+							{{form.bizBusDataDetailVOList.length == 0 ? '' : form.bizBusDataDetailVOList[landNameIndex].vehicleInputMom === 0 ? form.bizBusDataDetailVOList[landNameIndex].vehicleInputMom : form.bizBusDataDetailVOList[landNameIndex].vehicleInputMom ? formatDigit(form.bizBusDataDetailVOList[landNameIndex].vehicleInputMom) : '--'}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
-						<view class="rate_item_label">投入车辆同比(%)</view>
+						<view class="rate_item_label">投入车辆同比</view>
 						<view class="rate_item_input">
-							{{item.vehicleInputYoy === 0 ? item.vehicleInputYoy : item.vehicleInputYoy ? item.vehicleInputYoy.toFixed(2) : ''}}
+							{{form.bizBusDataDetailVOList.length == 0 ? '' : form.bizBusDataDetailVOList[landNameIndex].vehicleInputYoy === 0 ? form.bizBusDataDetailVOList[landNameIndex].vehicleInputYoy : form.bizBusDataDetailVOList[landNameIndex].vehicleInputYoy ? formatDigit(form.bizBusDataDetailVOList[landNameIndex].vehicleInputYoy) : '--'}}%
 						</view>
 					</view>
 				</view>
 				<view class="form_item">
-					<view class="form_item_label">运行班次：</view>
-					<view class="form_item_input form_input"><!-- digit -->
-						<uni-easyinput type="number" v-model="item.operatingShifts" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('operatingShifts','bizBusDataDetailVOList',index)"></uni-easyinput>
+					<view class="form_item_label">人数(万人)：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput @blur="calcYoyMom(landNameIndex)" type="number"
+							v-model="form.bizBusDataDetailVOList[landNameIndex].passengerCount"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
 					</view>
 				</view>
-				<view class="form_item_rate" v-if="item.operatingShiftsMom || item.operatingShiftsYoy" :class="item.operatingShiftsMom == 0 ? 'danger' : '' ">
+				<!-- 同比环比 -->
+				<view class="form_item_rate"
+					:class="form.bizBusDataDetailVOList[landNameIndex].passengerCount && form.bizBusDataDetailVOList[landNameIndex].passengerCount == form.bizBusDataDetailVOList[landNameIndex].yestPassengerCount ? 'danger' : '' ">
 					<view class="rate_item">
-						<view class="rate_item_label" :style="item.operatingShiftsMom == 0 ? 'color: #EB4747' : ''">运行班次环比(%)</view>
-						<view class="rate_item_input" :style="item.operatingShiftsMom == 0 ? 'color: #EB4747' : ''">
-							{{item.operatingShiftsMom === 0 ? item.operatingShiftsMom : item.operatingShiftsMom ? item.operatingShiftsMom.toFixed(2) : ''}}
+						<view class="rate_item_label"
+							:style="form.bizBusDataDetailVOList[landNameIndex].passengerCount && form.bizBusDataDetailVOList[landNameIndex].passengerCount == form.bizBusDataDetailVOList[landNameIndex].yestPassengerCount ? 'color: #EB4747' : ''">
+							人数环比
+						</view>
+						<view class="rate_item_input"
+							:style="form.bizBusDataDetailVOList[landNameIndex].passengerCount && form.bizBusDataDetailVOList[landNameIndex].passengerCount == form.bizBusDataDetailVOList[landNameIndex].yestPassengerCount ? 'color: #EB4747' : ''">
+							{{form.bizBusDataDetailVOList.length == 0 ? '' : form.bizBusDataDetailVOList[landNameIndex].passengerCountMom === 0 ? form.bizBusDataDetailVOList[landNameIndex].passengerCountMom : form.bizBusDataDetailVOList[landNameIndex].passengerCountMom ? formatDigit(form.bizBusDataDetailVOList[landNameIndex].passengerCountMom) : '--'}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
-						<view class="rate_item_label">运行班次同比(%)</view>
+						<view class="rate_item_label">人数同比</view>
 						<view class="rate_item_input">
-							{{item.operatingShiftsYoy === 0 ? item.operatingShiftsYoy : item.operatingShiftsYoy ? item.operatingShiftsYoy.toFixed(2) : ''}}
+							{{form.bizBusDataDetailVOList.length == 0 ? '' : form.bizBusDataDetailVOList[landNameIndex].passengerCountYoy === 0 ? form.bizBusDataDetailVOList[landNameIndex].passengerCountYoy : form.bizBusDataDetailVOList[landNameIndex].passengerCountYoy ? formatDigit(form.bizBusDataDetailVOList[landNameIndex].passengerCountYoy) : '--'}}%
 						</view>
 					</view>
 				</view>
 				<view class="form_item">
-					<view class="form_item_label">人数(万人)：</view>
+					<view class="form_item_label">班次：</view>
 					<view class="form_item_input form_input">
-						<uni-easyinput type="digit" v-model="item.passengerCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('passengerCount','bizBusDataDetailVOList',index)"></uni-easyinput>
+						<uni-easyinput @blur="calcYoyMom(landNameIndex)" type="number"
+							v-model="form.bizBusDataDetailVOList[landNameIndex].operatingShifts"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
 					</view>
 				</view>
-				<view class="form_item_rate" v-if="item.passengerCountMom || item.passengerCountYoy" :class="item.passengerCountMom == 0 ? 'danger' : '' ">
+				<!-- 同比环比 -->
+				<view class="form_item_rate"
+					:class="form.bizBusDataDetailVOList[landNameIndex].operatingShifts && form.bizBusDataDetailVOList[landNameIndex].operatingShifts == form.bizBusDataDetailVOList[landNameIndex].yestOperatingShifts ? 'danger' : '' ">
 					<view class="rate_item">
-						<view class="rate_item_label" :style="item.passengerCountMom == 0 ? 'color: #EB4747' : ''">人数环比(%)</view>
-						<view class="rate_item_input" :style="item.passengerCountMom == 0 ? 'color: #EB4747' : ''">
-							{{item.passengerCountMom === 0 ? item.passengerCountMom : item.passengerCountMom ? item.passengerCountMom.toFixed(2) : ''}}
+						<view class="rate_item_label"
+							:style="form.bizBusDataDetailVOList[landNameIndex].operatingShifts && form.bizBusDataDetailVOList[landNameIndex].operatingShifts == form.bizBusDataDetailVOList[landNameIndex].yestOperatingShifts ? 'color: #EB4747' : ''">
+							班次环比
+						</view>
+						<view class="rate_item_input"
+							:style="form.bizBusDataDetailVOList[landNameIndex].operatingShifts && form.bizBusDataDetailVOList[landNameIndex].operatingShifts == form.bizBusDataDetailVOList[landNameIndex].yestOperatingShifts ? 'color: #EB4747' : ''">
+							{{form.bizBusDataDetailVOList.length == 0 ? '' : form.bizBusDataDetailVOList[landNameIndex].operatingShiftsMom === 0 ? form.bizBusDataDetailVOList[landNameIndex].operatingShiftsMom : form.bizBusDataDetailVOList[landNameIndex].operatingShiftsMom ? formatDigit(form.bizBusDataDetailVOList[landNameIndex].operatingShiftsMom) : '--'}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
-						<view class="rate_item_label">人数同比(%)</view>
+						<view class="rate_item_label">班次同比</view>
 						<view class="rate_item_input">
-							{{item.passengerCountYoy === 0 ? item.passengerCountYoy : item.passengerCountYoy ? item.passengerCountYoy.toFixed(2) : ''}}
+							{{form.bizBusDataDetailVOList.length == 0 ? '' : form.bizBusDataDetailVOList[landNameIndex].passengerCountYoy === 0 ? form.bizBusDataDetailVOList[landNameIndex].operatingShiftsYoy : form.bizBusDataDetailVOList[landNameIndex].operatingShiftsYoy ? formatDigit(form.bizBusDataDetailVOList[landNameIndex].operatingShiftsYoy) : '--'}}%
 						</view>
 					</view>
 				</view>
-				<view class="form_item">
-					<view class="form_item_label">昨日投入车辆：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput type="digit" v-model="item.yestVehicleInput" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('yestVehicleInput','bizBusDataDetailVOList',index)"></uni-easyinput>
-					</view>
-				</view>
-				<view class="form_item">
-					<view class="form_item_label">昨日运行班次：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput type="digit" v-model="item.yestOperatingShifts" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('yestOperatingShifts','bizBusDataDetailVOList',index)"></uni-easyinput>
-					</view>
-				</view>
-				<view class="form_item">
-					<view class="form_item_label">昨日人数：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput type="digit" v-model="item.yestPassengerCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('yestPassengerCount','bizBusDataDetailVOList',index)"></uni-easyinput>
-					</view>
-				</view>
-				<view class="form_item">
-					<view class="form_item_label">去年投入车辆：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput type="digit" v-model="item.lyVehicleInput" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('lyVehicleInput','bizBusDataDetailVOList',index)"></uni-easyinput>
-					</view>
-				</view>
-				<view class="form_item">
-					<view class="form_item_label">去年运行班次：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput type="digit" v-model="item.lyOperatingShifts" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('lyOperatingShifts','bizBusDataDetailVOList',index)"></uni-easyinput>
-					</view>
-				</view>
-				<view class="form_item">
-					<view class="form_item_label">去年人数：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput type="digit" v-model="item.lyPassengerCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入" @blur="checkNumber('lyPassengerCount','bizBusDataDetailVOList',index)"></uni-easyinput>
-					</view>
-				</view>
-				<view class="line"></view>
+				<!-- <view class="line"></view> -->
 			</view>
-			<view class="add_btn" @click="addRow()">增行</view>
+			<!-- <view class="add_btn" @click="addRow()">增行</view> -->
+
 		</view>
+		<!-- 底部按钮 -->
 		<view class="foot_btn">
-			<view class="act_btn" @click="doCancel">取消</view>
-			<view class="act_btn blue" @click="doSubmit">确认</view>
+			<!-- <view class="act_btn" @click="doCancel">取消</view> -->
+			<view class="act_btn blue" @click="doSubmit">{{btnText}}</view>
 		</view>
 	</view>
 </template>
-
 <script>
-import { getDateStr } from '../../../common/util'
+	import {
+		calcMom,
+		calcYoy,
+		checkNotEmpty,
+		getDateStr
+	} from "../../../common/util.js"
 	export default {
 		data() {
 			return {
-				timeArray:[],
-				pageType:'',
-				form:{
-					reportDate:'',
-					bizBusDataDetailVOList:[
-						{
-							busUnit:'',
-							busIndex:'',
-							vehicleInput:'',
-							vehicleInputMom:0,
-							vehicleInputYoy:0,
-							operatingShiftsMom:0,
-							operatingShiftsYoy:0,
-							passengerCount:'',
-							passengerCountMom:0,
-							passengerCountYoy:0,
-							yestVehicleInput:'',
-							yestOperatingShifts:'',
-							yestPassengerCount:'',
-							lyVehicleInput:'',
-							lyOperatingShifts:'',
-							lyPassengerCount:''
-						}
-					],
-					bizBusDataBodySaveOrUpdateDTOList:[]
-				},
-				index:'',
-				timeName:'',
-				busArray:[],
-				yoyMom:{},
+				form: {
+					"bizBusDataDetailVOList": [],
+					"reportDate": "",
+					"statPeriod": ""
+				}, //登录form
+				array: [], //时段选择列表
+				index: 2, //时段选择,默认0-24
+				userInfo: {},
+				landList: ['灵山岛', '斋堂岛', '青黄线', '竹岔', '田横'],
+				landNameIndex: 0,
+				showLand: false,
+				pageType: '',
+				btnText: '保存'
 			}
 		},
 		onLoad(options) {
-			console.log(options)
-			this.getRoadTime();
-			// this.getBusData();
-			this.getPermiss()
-			if(options.type == 'add'){
+			this.userInfo = uni.getStorageSync('userInfo');
+			if (options.type == 'add') {
 				this.pageType = 'add';
-				let now =  new Date();
-				this.form.reportDate = getDateStr(now,0)
-			}else if(options.type == 'edit'){
-				this.pageType == 'edit';
-				this.form = JSON.parse(options.item) 
+				let now = new Date();
+				this.form.reportDate = getDateStr(now, -1); //默认前一天
+				this.queryTime(); //统计时段
+				this.getPermiss(); //陆岛权限列表
+			} else if (options.item) {
+				this.btnText = '修改并保存';
+				this.form = JSON.parse(options.item);
+				this.form.bizBusDataDetailVOList = this.form.bizWaterwayIslandDataVOList;
+				this.getPermiss(); //陆岛权限列表
+				this.queryTime();
+			} else if (options.id) {
+				this.btnText = '修改并保存';
+				this.queryDetailInfo(options.id);
 			}
 		},
 		methods: {
-			// 获取权限
-			getPermiss(){
-				this.$request(getApp().globalData.baseUrl + '/api/biz/bizBusAuthority/findList',{},"GET").then(res =>{
-					console.log('数据权限==>',res)
-					this.busArray = res.data
-				})
+			formatDigit(data) {
+				return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data;
 			},
-			// 获取时段
-			getRoadTime(){
-				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=' + Date.parse(new Date()),"GET").then(res =>{
-					this.timeArray = res.data;
-					if(this.pageType == 'edit'){
-						this.index = this.timeArray.findIndex(item => item.dictValue == this.form.statPeriod)
-						this.timeName = this.timeArray.find(item => item.dictValue == this.form.statPeriod).dictLabel
-					}else if(this.pageType == 'add'){
-						let now = new Date();
-						let dateStr = getDateStr(now,0);
-						if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
-							this.form.statPeriod = "0012";
-							this.index = this.timeArray.findIndex(item => item.dictValue == "0012")
-							this.timeName = this.timeArray.find(item => item.dictValue == "0012").dictLabel
-						}else{
-							this.form.statPeriod = "03";
-							this.index = this.timeArray.findIndex(item => item.dictValue == "03")
-							this.timeName = this.timeArray.find(item => item.dictValue == "03").dictLabel
-						}
-					}
-					
-				})
-			},
-			 // 获取同比环比
-			getYoyMom(item,index){
-				let params = {
-					busUnit:item.busUnit,
-					statDate:this.form.reportDate
+			//切换当前编辑陆岛索引
+			changeLandNameIndex(index) {
+				if (this.form.bizBusDataDetailVOList[this.landNameIndex].vehicleInput != '' && this.form
+					.bizBusDataDetailVOList[this.landNameIndex].passengerCount != '') {
+					this.landList[this.landNameIndex].isFinish = true;
+				} else {
+					this.landList[this.landNameIndex].isFinish = false;
 				}
-				// console.log(params)
-				this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getYoyMom', params,"GET").then(res =>{
-					console.log('同比环比数据===>',res)
-					this.yoyMom = res.data;
-					this.checkYoyMom(index)
-				})
+				this.landNameIndex = index;
+				console.log('landNameIndex', index)
 			},
-			// 点击确定按钮
-			doSubmit(){
-				this.form.bizBusDataBodySaveOrUpdateDTOList = this.form.bizBusDataDetailVOList
-				console.log(this.form)
-				let params = this.form;
-				if(!this.form.reportDate){
-					uni.showToast({
-						title:"请选择统计日期",
-						icon:"none"
-					})
-				}else if(!this.form.statPeriod){
-					uni.showToast({
-						title:"请选择统计时段",
-						icon:"none"
-					})
-				}else{
-					uni.showModal({
-						title:'提示',
-						content:"确认保存当前报送数据吗?",
-						success: (res) => {
-							if(res.confirm){
-								uni.showLoading({
-									title: '提交中...',
-									mask: true
-								})
-								this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/saveOrUpdate',params,"POST").then(res =>{
-									console.log(res)
-									if(res.code == 200){
-										uni.hideLoading();
-										uni.showToast({
-											title: '报送提交成功',
-											icon: 'none',
-											success: () => {
-												if(!this.form.id) {
-													uni.redirectTo({
-														url:"/pages/bus/busDataInfo/list"
-													})
-												}
-												else {
-													uni.navigateBack();
-												}
-											}
-										})
-									}
+			//陆岛列表
+			getPermiss() {
+				this.$request(getApp().globalData.baseUrl + '/api/biz/bizBusAuthority/findList',{},"GET").then(res =>{
+					this.landList = res.data;
+					if (this.pageType == 'add') {
+						this.landList.map(item => {
+							item.isFinish = false;
+							this.form.bizBusDataDetailVOList.push({
+								// "landName": item.stationId,
+								// "lastYearpassengerCount": '',
+								// "lastYearvehicleInput": '',
+								// "passengerCount": '',
+								// "passengerCountMom": '',
+								// "passengerCountYoy": '',
+								// "vehicleInput": '',
+								// "vehicleInputRingRatio": '',
+								// "vehicleInputYearOnYear": '',
+								// "yestPassengerCount": '',
+								// "yesterdayvehicleInput": '',
+								busUnit:item.stationId,
+								// busIndex:'',
+								vehicleInput:'',
+								vehicleInputMom:0,
+								vehicleInputYoy:0,
+								operatingShiftsMom:0,
+								operatingShiftsYoy:0,
+								passengerCount:'',
+								passengerCountMom:0,
+								passengerCountYoy:0,
+								yestVehicleInput:'',
+								yestOperatingShifts:'',
+								yestPassengerCount:'',
+								lyVehicleInput:'',
+								lyOperatingShifts:'',
+								lyOperatingShifts:''
+							})
+						})
+					} else {
+						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);
+							console.log(idx)
+							if (idx > -1) {
+								item.isFinish = checkNotEmpty(arr[idx].passengerCount) && checkNotEmpty(arr[idx].vehicleInput) ? true :
+									false;
+								this.form.bizBusDataDetailVOList.push(arr[idx]);
+							} else {
+								item.isFinish = false;
+								this.form.bizBusDataDetailVOList.push({
+									"landName": item.stationId,
+									"lastYearpassengerCount": '',
+									"lastYearvehicleInput": '',
+									"passengerCount": '',
+									"passengerCountMom": '',
+									"passengerCountYoy": '',
+									"vehicleInput": '',
+									"vehicleInputRingRatio": '',
+									"vehicleInputYearOnYear": '',
+									"yestPassengerCount": '',
+									"yesterdayvehicleInput": '',
+									"yestOperatingShifts":'',
 								})
 							}
-						}
-					})
-					
-				}
+						})
+					}
+				})
 			},
-			// 计算同比环比
-			checkYoyMom(index){
-				// 环比
-				if(this.yoyMom.yesterdayData){
-					// this.form.bizBusDataDetailVOList[index].operatingShiftsMom = this.form.bizBusDataDetailVOList[index].operatingShifts && this.yoyMom.yesterdayData.operatingShifts ? 
-					// (this.form.bizBusDataDetailVOList[index].operatingShifts - this.yoyMom.yesterdayData.operatingShifts) / this.yoyMom.yesterdayData.operatingShifts * 100 : '';
-					
-					this.form.bizBusDataDetailVOList[index].operatingShiftsMom = !checkNotEmpty(this.yoyMom.yesterdayData.operatingShifts) || this.yoyMom.yesterdayData.operatingShifts === 0 ? 100 : this.form.bizBusDataDetailVOList[index].operatingShifts ? (parseInt(this
-							.form.bizBusDataDetailVOList[index].operatingShifts) - this.yoyMom.yesterdayData.operatingShifts) / this.yoyMom.yesterdayData.operatingShifts *
-						100 : '';
-					
-					// this.form.bizBusDataDetailVOList[index].passengerCountMom = this.form.bizBusDataDetailVOList[index].passengerCount && this.yoyMom.yesterdayData.passengerCount ?
-					// (this.form.bizBusDataDetailVOList[index].passengerCount - this.yoyMom.yesterdayData.passengerCount) / this.yoyMom.yesterdayData.passengerCount * 100 : '';
-					
-					this.form.bizBusDataDetailVOList[index].passengerCountMom = !checkNotEmpty(this.yoyMom.yesterdayData.passengerCount) || this.yoyMom.yesterdayData.passengerCount === 0 ? 100 : this.form.bizBusDataDetailVOList[index].passengerCount ? (parseInt(this
-							.form.bizBusDataDetailVOList[index].passengerCount) - this.yoyMom.yesterdayData.passengerCount) / this.yoyMom.yesterdayData.passengerCount *
-						100 : '';
-						
-					// this.form.bizBusDataDetailVOList[index].vehicleInputMom = this.form.bizBusDataDetailVOList[index].vehicleInput && this.yoyMom.yesterdayData.vehicleInput ?
-					// (this.form.bizBusDataDetailVOList[index].vehicleInput - this.yoyMom.yesterdayData.vehicleInput) / this.yoyMom.yesterdayData.vehicleInput * 100 : '';
-				
-					this.form.bizBusDataDetailVOList[index].vehicleInputMom = !checkNotEmpty(this.yoyMom.yesterdayData.vehicleInput) || this.yoyMom.yesterdayData.vehicleInput === 0 ? 100 : this.form.bizBusDataDetailVOList[index].vehicleInput ? (parseInt(this
-							.form.bizBusDataDetailVOList[index].vehicleInput) - this.yoyMom.yesterdayData.vehicleInput) / this.yoyMom.yesterdayData.vehicleInput *
-						100 : '';
+			//陆岛切换
+			changeLandName(e, index) {
+				//判断是否重复选择
+				let idx = this.form.bizBusDataDetailVOList.findIndex(item => item.landNameIndex == e.detail
+					.value);
+				if (idx > -1 && this.form.bizBusDataDetailVOList[index].landNameIndex == '') {
+					uni.showToast({
+						title: '名称不能重复选择',
+						icon: 'none'
+					});
+				} else {
+					this.form.bizBusDataDetailVOList[index].landNameIndex = e.detail.value;
+					this.form.bizBusDataDetailVOList[index].landName = this.landList[e.detail.value];
+					this.calcYoyMom(index);
 				}
-				// 同比
-				if(this.yoyMom.lastYearData){
-					// this.form.bizBusDataDetailVOList[index].operatingShiftsYoy = this.form.bizBusDataDetailVOList[index].operatingShifts && this.yoyMom.lastYearData.operatingShifts ? 
-					// (this.form.bizBusDataDetailVOList[index].operatingShifts - this.yoyMom.lastYearData.operatingShifts) / this.yoyMom.lastYearData.operatingShifts * 100 : '';
-					
-					this.form.bizBusDataDetailVOList[index].operatingShiftsYoy = !checkNotEmpty(this.yoyMom.lastYearData.operatingShifts) || this.yoyMom.lastYearData.operatingShifts === 0 ? 100 : this.form.bizBusDataDetailVOList[index].operatingShifts ? (parseInt(this
-							.form.bizBusDataDetailVOList[index].operatingShifts) - this.yoyMom.lastYearData.operatingShifts) / this.yoyMom.lastYearData.operatingShifts *
-						100 : '';
-					
-					// this.form.bizBusDataDetailVOList[index].passengerCountYoy = this.form.bizBusDataDetailVOList[index].passengerCount && this.yoyMom.lastYearData.passengerCount ?
-					// (this.form.bizBusDataDetailVOList[index].passengerCount - this.yoyMom.lastYearData.passengerCount) / this.yoyMom.lastYearData.passengerCount * 100 : '';
-					
-					this.form.bizBusDataDetailVOList[index].passengerCountYoy = !checkNotEmpty(this.yoyMom.lastYearData.passengerCount) || this.yoyMom.lastYearData.passengerCount === 0 ? 100 : this.form.bizBusDataDetailVOList[index].passengerCount ? (parseInt(this
-							.form.bizBusDataDetailVOList[index].passengerCount) - this.yoyMom.lastYearData.passengerCount) / this.yoyMom.lastYearData.passengerCount *
-						100 : '';
-					
-					// this.form.bizBusDataDetailVOList[index].vehicleInputYoy = this.form.bizBusDataDetailVOList[index].vehicleInput && this.yoyMom.lastYearData.vehicleInput ?
-					// (this.form.bizBusDataDetailVOList[index].vehicleInput - this.yoyMom.lastYearData.vehicleInput) / this.yoyMom.lastYearData.vehicleInput * 100 : '';
-					
-					this.form.bizBusDataDetailVOList[index].vehicleInputYoy = !checkNotEmpty(this.yoyMom.lastYearData.vehicleInput) || this.yoyMom.lastYearData.vehicleInput === 0 ? 100 : this.form.bizBusDataDetailVOList[index].vehicleInput ? (parseInt(this
-							.form.bizBusDataDetailVOList[index].vehicleInput) - this.yoyMom.lastYearData.vehicleInput) / this.yoyMom.lastYearData.vehicleInput *
-						100 : '';
+			},
+			//环比同比计算
+			calcYoyMom(landNameIndex) {
+				if (this.form.reportDate == '' || this.form.statPeriod == '' || this.form
+					.bizBusDataDetailVOList[landNameIndex].landName == '') {
+					return;
 				}
+				this.form.bizBusDataDetailVOList[landNameIndex].isFinish = checkNotEmpty(this.form
+					.bizBusDataDetailVOList[landNameIndex].vehicleInput) && checkNotEmpty(this.form
+					.bizBusDataDetailVOList[landNameIndex].passengerCount) && checkNotEmpty(this.form
+					.bizBusDataDetailVOList[landNameIndex].operatingShifts)  ? true : false;
+				this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getYoyMom?statDate=' + this.form
+						.reportDate + '&statPeriod=' + this.form.statPeriod + '&busUnit=' + this.form
+						.bizBusDataDetailVOList[landNameIndex].busUnit + '&_t=' + Date.parse(new Date()), {},
+						'GET')
+					.then(res => {
+						let yesterdayData = res.data.yesterdayData;
+						let lastYearData = res.data.lastYearData;
+						
+						this.form.bizBusDataDetailVOList[landNameIndex].yestVehicleInput = checkNotEmpty(
+							yesterdayData.vehicleInput) ? yesterdayData.vehicleInput : 0;
+						this.form.bizBusDataDetailVOList[landNameIndex].lyVehicleInput = checkNotEmpty(
+							lastYearData.vehicleInput) ? lastYearData.vehicleInput : 0;
+							
+						this.form.bizBusDataDetailVOList[landNameIndex].yestPassengerCount = checkNotEmpty(
+							yesterdayData.passengerCount) ? yesterdayData.passengerCount : 0;
+						this.form.bizBusDataDetailVOList[landNameIndex].lyPassengerCount = checkNotEmpty(
+							lastYearData.passengerCount) ? lastYearData.passengerCount : 0;
+							
+						this.form.bizBusDataDetailVOList[landNameIndex].yestOperatingShifts = checkNotEmpty(
+							yesterdayData.passengerCount) ? yesterdayData.operatingShifts : 0;
+						this.form.bizBusDataDetailVOList[landNameIndex].lyPassengerCount = checkNotEmpty(
+							lastYearData.passengerCount) ? lastYearData.passengerCount : 0;
+						//环比-同比
+						//环比计算规则 if今天没有值不计算，elseif昨天没有值不计算，elseif昨天===0并且今天===0百分比0，esleif昨天0今天大于0百分比100,else(今天-昨天)/昨天*100
+						let obj = this.form.bizBusDataDetailVOList[landNameIndex];
+						this.form.bizBusDataDetailVOList[landNameIndex].vehicleInputMom = calcMom(obj.vehicleInput,yesterdayData.vehicleInput)
+						// !checkNotEmpty(obj
+						// 	.vehicleInput) ? '' : !checkNotEmpty(yesterdayData.vehicleInput) ? '' : yesterdayData.vehicleInput === 0 && parseInt(obj
+						// 	.vehicleInput) === 0 ? 0 : yesterdayData.vehicleInput === 0 && parseInt(obj.vehicleInput) > 0 ? 100 : (parseInt(obj
+						// 	.vehicleInput) - yesterdayData.vehicleInput) / yesterdayData.vehicleInput * 100;
+						this.form.bizBusDataDetailVOList[landNameIndex].vehicleInputYoy = calcYoy(obj.vehicleInput,lastYearData.vehicleInput)
+						// !checkNotEmpty(obj
+						// 	.vehicleInput) ? '' : !checkNotEmpty(lastYearData.vehicleInput) ? '' : lastYearData.vehicleInput === 0 && parseInt(obj
+						// 	.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)
+						// !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,lastYearData.passengerCount)
+						// !checkNotEmpty(obj
+						// 		.passengerCount) ? '' : !checkNotEmpty(lastYearData.passengerCount) ? '' : lastYearData
+						// 	.passengerCount === 0 && parseInt(obj.passengerCount) === 0 ? 0 : lastYearData.passengerCount === 0 &&
+						// 	parseInt(obj.passengerCount) > 0 ? 100 : (parseInt(obj.passengerCount) - lastYearData.passengerCount) /
+						// 	lastYearData.passengerCount * 100;
+						this.form.bizBusDataDetailVOList[landNameIndex].operatingShiftsMom = calcMom(obj.operatingShifts,yesterdayData.operatingShifts)
+						this.form.bizBusDataDetailVOList[landNameIndex].operatingShiftsYoy = calcMom(obj.operatingShifts,yesterdayData.operatingShifts)
+						console.log('环比同比', this.form.bizBusDataDetailVOList[landNameIndex])
+					})
 			},
-			// 获取公交车
-			// getBusData(){
-			// 	this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=bus_unit&_t=' + Date.parse(new Date()),{},"GET").then(res =>{
-			// 		this.busArray = res.data
+			//id查询详情
+			// queryDetailInfo(id) {
+			// 	this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getById/' + id, {},
+			// 		'GET').then(res => {
+			// 		this.form = res.data;
+			// 		this.form.bizBusDataDetailVOList = this.form.bizWaterwayIslandDataVOList;
+			// 		this.queryTime(); //统计时段
+			// 		this.getPermiss();
 			// 	})
 			// },
+			//统计时段切换选择
+			changeStatPeriod(e) {
+				this.index = e.detail.value;
+				this.form.statPeriod = this.array[e.detail.value].dictValue;
+				console.log('change 时段', this.form)
+				//重新计算同比环比
+				this.form.bizBusDataDetailVOList.map((item, index) => {
+					this.calcYoyMom(index);
+				})
+			},
+			//取消
+			doCancel() {
+				uni.navigateBack();
+			},
 			//选择统计日期
 			bindDateChange(e) {
 				this.form.reportDate = e.detail.value;
+				//重新计算同比环比
+				this.form.bizBusDataDetailVOList.map((item, index) => {
+					this.calcYoyMom(index);
+				})
 			},
-			//选择时段
-			bindtimeChange(e){
-				let index = e.target.value;
-				var selected = this.timeArray[index];
-				this.form.statPeriod = selected.dictValue;
-				this.timeName = selected.dictLabel
+			//时段
+			queryTime() {
+				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date
+					.parse(
+						new Date()), {}, 'GET').then(res => {
+					this.array = res.data;
+					if (this.pageType == 'add') {
+						let now = new Date();
+						//11:00-13:30 默认选择0-12
+						let dateStr = getDateStr(now, 0);
+						if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
+							new Date(dateStr +
+								' 13:30').getTime()) {
+							this.form.statPeriod = '0012';
+							let idx = this.array.findIndex(item => item.dictValue == '0012');
+							this.index = idx > -1 ? idx : '';
+						} else {
+							this.form.statPeriod = '03'; //默认0-24
+							let idx = this.array.findIndex(item => item.dictValue == '03');
+							this.index = idx > -1 ? idx : '';
+						}
+					} else {
+						let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
+						this.index = idx > -1 ? idx : '';
+					}
+				})
 			},
-			// 切换公交车
-			changeBusway(e,key,index){
-				this.form[key][index].busIndex = e.detail.value;
-				this.form[key][index].busUnit = this.busArray[e.detail.value].stationId;
-				this.getYoyMom(this.form[key][index],index)
+			//增行
+			addRow() {
+				this.form.bizBusDataDetailVOList.push({
+					"landNameIndex": "",
+					"landName": "",
+					"lastYearpassengerCount": 0,
+					"lastYearvehicleInput": 0,
+					"passengerCount": 0,
+					"passengerCountMom": 0.0,
+					"passengerCountYoy": 0.0,
+					"vehicleInput": 0,
+					"vehicleInputRingRatio": 0.0,
+					"vehicleInputYearOnYear": 0.0,
+					"yestPassengerCount": 0,
+					"yesterdayvehicleInput": 0
+				});
 			},
-			// 验证格式为数字且最多只有一个小数点
-			checkNumber(val,key,index){ // 值允许输入一个小数点和数字 
-				if(this.form[key][index][val]){
-					if(val == 'operatingShifts' || val == 'passengerCount' || val == 'vehicleInput'){
-						console.log(this.form[key][index])
-						this.getYoyMom(this.form[key][index])
-					}
-					this.form[key][index][val] = this.form[key][index][val].replace(/[^\d.]/g,""); //先把非数字的都替换掉，除了数字和. 
-					this.form[key][index][val] = this.form[key][index][val].replace(/^\./g,""); //必须保证第一个为数字而不是. 
-					this.form[key][index][val] = this.form[key][index][val].replace(/\.{2,}/g,"."); //保证只有出现一个.而没有多个. 
-					this.form[key][index][val] = this.form[key][index][val].replace(".","$#$").replace(/\./g,"").replace("$#$","."); //保证.只出现一次，而不能出现两次以上 
-				}
+			//删行
+			delRow(index) {
+				this.form.bizBusDataDetailVOList.splice(index, 1);
 			},
-			// 点击增行按钮
-			addRow(){
-				this.form.bizBusDataDetailVOList.push(
-					{
-						busUnit:'',
-						busIndex:'',
-						vehicleInput:'',
-						vehicleInputMom:0,
-						vehicleInputYoy:0,
-						operatingShiftsMom:0,
-						operatingShiftsYoy:0,
-						passengerCount:'',
-						passengerCountMom:0,
-						passengerCountYoy:0,
-						yestVehicleInput:'',
-						yestOperatingShifts:'',
-						yestPassengerCount:'',
-						lyVehicleInput:'',
-						lyOperatingShifts:'',
-						lyPassengerCount:''
+			//确认提交
+			doSubmit() {
+				console.log(this.form)
+				if (this.form.reportDate == '' || this.form.statPeriod == '') {
+					uni.showToast({
+						title: '报送日期和时段不能为空',
+						icon: 'none'
+					})
+					return;
+				}
+				let checkAccident = true;
+				if (this.form.bizBusDataDetailVOList.length > 0) {
+					checkAccident = this.form.bizBusDataDetailVOList.every(item => {
+						return checkNotEmpty(item.landName) && checkNotEmpty(item.passengerCount) && checkNotEmpty(
+							item.vehicleInput) && checkNotEmpty(item.operatingShifts)
+					})
+				}
+				if (!checkAccident) {
+					uni.showToast({
+						title: '公交详情不能为空',
+						icon: 'none'
+					})
+					return;
+				}
+				console.log(this.form.id)
+				uni.showModal({
+					title: '提示',
+					content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
+					success: (res) => {
+						if (res.confirm) {
+							this.submitForm();
+						}
 					}
-				)
-					
+				})
 			},
-			// 点击删行按钮
-			delRow(index){
-				this.form.bizBusDataDetailVOList.splice(index, 1);
+			submitForm() {
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				})
+				this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/saveOrUpdate', this
+					.form,
+					'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 200) {
+						uni.showToast({
+							title: '报送提交成功',
+							icon: 'none',
+							success: () => {
+								if (this.form.id == undefined) {
+									setTimeout(() => {
+										uni.redirectTo({
+											url: '/pages/water/waterWay/list'
+										})
+									}, 300)
+								} else {
+									uni.navigateBack();
+								}
+							}
+						})
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				})
 			},
 		}
 	}
@@ -427,7 +534,7 @@ import { getDateStr } from '../../../common/util'
 <style lang="scss" scoped>
 	.form_warp {
 		padding: 30rpx 30rpx 195rpx;
-		
+
 		.form_intro {
 			color: #666;
 			font-size: 26rpx;
@@ -435,55 +542,56 @@ import { getDateStr } from '../../../common/util'
 			line-height: 48rpx;
 			text-align: center;
 			margin-bottom: 20rpx;
-		
+
 			.tel {
 				color: #2D8CF0;
 				font-weight: bold;
 			}
 		}
-		
+
 		.form_item_box {
 			padding: 30rpx 20rpx 30rpx 30rpx;
 			background-color: #fff;
 			border-radius: 30rpx;
-			
-			&.bottom{
-				margin-top: 30rpx;
-			}
-			
+
 			//环比同比
-			.form_item_rate{
+			.form_item_rate {
 				background: #F6F6F6;
 				border: 1px solid #F6F6F6;
 				padding: 30rpx;
 				margin-bottom: 30rpx;
 				border-radius: 30rpx;
-				.line{
+
+				.line {
 					height: 1px;
 					background-color: #dfdfdf;
 					margin: 30rpx 0;
 				}
-				.rate_item{
+
+				.rate_item {
 					display: flex;
 					justify-content: space-between;
 					font-size: 24rpx;
 					font-family: PingFang SC-Regular, PingFang SC;
 					font-weight: 400;
-					.rate_item_label{
+
+					.rate_item_label {
 						color: #666;
 						font-size: 24rpx;
 					}
-					.rate_item_input{
+
+					.rate_item_input {
 						color: #333;
 						font-size: 28rpx;
 					}
 				}
-				&.danger{
+
+				&.danger {
 					background-color: #FEF6F3;
 					border-color: #F0622D;
 				}
 			}
-		
+
 			.form_item_title {
 				color: #333;
 				line-height: 42rpx;
@@ -492,9 +600,11 @@ import { getDateStr } from '../../../common/util'
 				font-weight: bold;
 				margin-bottom: 30rpx;
 			}
-			.form_item_remark{
+
+			.form_item_remark {
 				margin-bottom: 30rpx;
-				.form_item_label{
+
+				.form_item_label {
 					color: #333333;
 					line-height: 42rpx;
 					font-size: 30rpx;
@@ -503,6 +613,7 @@ import { getDateStr } from '../../../common/util'
 					margin-bottom: 30rpx;
 				}
 			}
+
 			.form_item {
 				display: flex;
 				align-items: center;
@@ -511,28 +622,28 @@ import { getDateStr } from '../../../common/util'
 				font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
 				margin-bottom: 30rpx;
-		
+
 				.form_item_label {
-					width: 300rpx;
+					width: 260rpx;
 					color: #666666;
 					font-size: 26rpx;
 					word-break: break-all;
 				}
-		
+
 				.form_item_input {
 					color: #333;
 					text-align: right;
 					word-break: break-all;
-		
+
 					&.picker {
 						flex: 1;
-						display: flex;
-						justify-content: space-between;
-						
-						/deep/ picker {
-							flex: 1;
-						}
-		
+						// display: flex;
+						// justify-content: space-between;
+
+						// /deep/ picker {
+						// 	flex: 1;
+						// }
+
 						.picker_select {
 							color: #D4D4D4;
 							font-size: 28rpx;
@@ -541,48 +652,88 @@ import { getDateStr } from '../../../common/util'
 							text-align: right;
 						}
 					}
-					
+
 					//纯展示
-					&.text{
+					&.text {
 						color: #333333;
 						line-height: 40rpx;
 						font-size: 28rpx;
 						font-family: PingFang SC-Regular, PingFang SC;
 						font-weight: 400;
 					}
+
 					//输入框
-					&.form_input{
-						/deep/ .is-input-border{
+					&.form_input {
+						/deep/ .is-input-border {
+							border: 0 !important;
+
+							.uni-easyinput__content-input {
+								height: 35rpx !important;
+								text-align: right;
+							}
+						}
+
+						/deep/ .uni-date-x--border {
 							border: 0 !important;
-							.uni-easyinput__content-input{
+
+							.uni-date__x-input {
+								// height: 35rpx !important;
 								text-align: right;
 							}
 						}
 					}
 				}
 			}
-			
 		}
 	}
-	//增行
-	.line {
-		height: 1px;
-		background-color: #E1E1E1;
-	}
-	
-	.add_btn {
-		height: 90rpx;
-		line-height: 90rpx;
-		color: #2D8CF0;
-		font-size: 28rpx;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		text-align: center;
-		background: #ECF5FF;
-		border-radius: 30rpx;
-		border: 2rpx solid #2D8CF0;
-		margin-top: 30rpx;
+
+	//收费站
+	.station_box {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 40rpx;
+
+		.station_item {
+			width: 175rpx;
+			height: 60rpx;
+			color: #666666;
+			line-height: 60rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			text-align: center;
+			border-radius: 20rpx;
+			border: 1rpx solid #C1C1C1;
+			padding: 0 20rpx;
+			margin-bottom: 40rpx;
+			margin-right: 20rpx;
+
+			&.active {
+				position: relative;
+				color: #1ECE5F;
+				border-color: #1ECE5F;
+				background: #EBFAF2;
+
+				.tag {
+					position: absolute;
+					top: 0;
+					right: 0;
+					width: 34rpx;
+					height: 23rpx;
+					color: #fff;
+					line-height: 23rpx;
+					background: #1ECE5F;
+					border-radius: 0rpx 20rpx 0rpx 5rpx;
+					text-align: center;
+				}
+			}
+
+			&.choosed {
+				border-color: #2D8CF0 !important;
+			}
+		}
 	}
+
 	.foot_btn {
 		position: fixed;
 		left: 0;
@@ -593,9 +744,9 @@ import { getDateStr } from '../../../common/util'
 		padding: 40rpx 30rpx;
 		background-color: #f5f5f5;
 		z-index: 11;
-	
+
 		.act_btn {
-			width: 329rpx;
+			width: 690rpx;
 			height: 90rpx;
 			color: #666666;
 			font-size: 28rpx;
@@ -606,7 +757,7 @@ import { getDateStr } from '../../../common/util'
 			background: #F6F6F6;
 			border-radius: 100rpx;
 			border: 1rpx solid #C1C1C1;
-	
+
 			&.blue {
 				color: #fff;
 				background: #2D8CF0;
@@ -614,4 +765,61 @@ import { getDateStr } from '../../../common/util'
 			}
 		}
 	}
-</style>
+
+	//增行
+	.line {
+		height: 1px;
+		background-color: #E1E1E1;
+	}
+
+	.add_btn {
+		height: 90rpx;
+		line-height: 90rpx;
+		color: #2D8CF0;
+		font-size: 28rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		text-align: center;
+		background: #ECF5FF;
+		border-radius: 30rpx;
+		border: 2rpx solid #2D8CF0;
+		margin-top: 30rpx;
+	}
+
+	.tab_box {
+		display: flex;
+		justify-content: space-around;
+
+		.tab_nav {
+			color: #999999;
+			line-height: 42rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			padding-bottom: 25rpx;
+
+			&.active {
+				position: relative;
+				color: #2D8CF0;
+				font-weight: bold;
+
+				&::after {
+					position: absolute;
+					content: '';
+					left: 50%;
+					bottom: 0;
+					width: 74rpx;
+					height: 6rpx;
+					background: #2D8CF0;
+					border-radius: 100rpx;
+					margin-left: -37rpx;
+				}
+			}
+		}
+	}
+
+	button {
+		background-color: #007aff;
+		color: #ffffff;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 4ab8fca..e2ccd57 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -45,7 +45,9 @@
 				this.routersData.children.map((item,index) => {
 					item.show = index == 0 ? true : false;
 				})
-				console.log(this.routersData)
+				if(this.routersData.path.indexOf('/') == '-1'){
+					this.routersData.path = '/' + this.routersData.path
+				}
 			}
 		},
 		methods: {
diff --git a/pages/portShipping/pilotStation/form.vue b/pages/portShipping/pilotStation/form.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/portShipping/pilotStation/form.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/portShipping/pilotStation/list.vue b/pages/portShipping/pilotStation/list.vue
new file mode 100644
index 0000000..fddae25
--- /dev/null
+++ b/pages/portShipping/pilotStation/list.vue
@@ -0,0 +1,23 @@
+<template>
+	<!-- 港口-引航站页面 -->
+	<view>
+		123
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/roadTransport/dataSubmission/form.vue b/pages/roadTransport/dataSubmission/form.vue
index 46e62ef..dc3efda 100644
--- a/pages/roadTransport/dataSubmission/form.vue
+++ b/pages/roadTransport/dataSubmission/form.vue
@@ -9,12 +9,12 @@
 			<view class="content_box">
 				<view class="basic_box">
 					<view class="con_tit">基本信息</view>
-					<view class="edit_item">
+					<!-- <view class="edit_item">
 						<p class="left">填报单位</p>
 						<view class="right">
 							<p>{{synthData.departmentName ? synthData.departmentName : ''}}</p>
 						</view>
-					</view>
+					</view> -->
 					<view class="edit_item">
 						<p class="left">统计日期</p>
 						<view class="right">
@@ -43,19 +43,57 @@
 					</view>
 				</view>
 				<view class="basic_box data_box">
-					<view class="con_tit">综合运输数据</view>
+					<view class="con_tit">交通运行情况</view>
 					<view class="remark_item">
 						<p class="left">交通运输情况：</p>
 						<view class="right">
 							<uni-easyinput type="textarea" autoHeight v-model="synthData.trafficOperationDescription" placeholder="请填写交通运输情况"></uni-easyinput>
 						</view>
 					</view>
+					<view class="edit_item input">
+						<p class="left">较大以上安全事故次数</p>
+						<view class="right">
+							<uni-easyinput v-model="synthData.significantAccidents" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+						</view>
+					</view>
+					<view class="edit_item input">
+						<p class="left">当日人员伤者数(人)</p>
+						<view class="right">
+							<uni-easyinput v-model="synthData.dailyInjuredPersons" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+						</view>
+					</view> 
+					<view class="edit_item input">
+						<p class="left">交通运行情况</p>
+						<view class="right">
+							<uni-easyinput v-model="synthData.trafficSituationReport" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+						</view>
+					</view>
+					<view class="edit_item input">
+						<p class="left">当日人员亡者数(人)</p>
+						<view class="right">
+							<uni-easyinput v-model="synthData.dailyFatalities" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+						</view>
+					</view>
+					<view class="edit_item input">
+						<p class="left">应急情况报告</p>
+						<p class="right">{{synthData.emergencySituationReport}}</p>
+						<view class="right">
+							<uni-easyinput v-model="synthData.emergencySituationReport" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+						</view>
+					</view>
+					<!-- <view class="remark_item">
+						<p class="left">备注</p>
+						<view class="right">
+							<uni-easyinput type="textarea" autoHeight v-model="roadData.remarks" placeholder="请备注信息"></uni-easyinput>
+						</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
 		<view class="bottom_box">
-			<p class="btn_item" @click="cancelEdit">取消</p>
-			<p class="btn_item confirm" @click="confirmRoad">确认</p>
+			<!-- <p class="btn_item" @click="cancelEdit">取消</p> -->
+			<p class="btn_item confirm" v-if="pageType == 'add'" @click="confirmRoad">保存</p>
+			<p class="btn_item confirm" v-if="pageType == 'edit'" @click="confirmRoad">修改并保存</p>
 		</view>
 	</view>
 </template>
@@ -137,7 +175,6 @@
 			// 点击确认按钮
 			confirmRoad(){
 				let params = this.synthData;
-				console.log(params)
 				if(params.reportDatetime == ''){
 					uni.showToast({
 						title:'请选择统计日期',
@@ -151,18 +188,28 @@
 				}else{
 					uni.showModal({
 						title:"提示",
-						content:"您确定，提交修改吗？",
+						content:params.id == undefined ? "您确认提交该条报送数据?" : "您确认将该条数据进行修改?",
 						success:(res) =>{
 							if(res.confirm){
 								this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/operation/saveOrUpdate',params,'POST').then(res =>{
 									if(res.code == 200){
 										uni.showToast({
-											title:'填报成功',
-											icon:"none"
-										});
-										setTimeout(() =>{
-											uni.navigateBack()
-										},500)
+											title:"报送提交成功",
+											icon:"none",
+											success: () => {
+												if(params.id == undefined){
+													setTimeout(() =>{
+														uni.redirectTo({
+															url:"/pages/roadTransport/dataSubmission/list"
+														})
+													},300)
+												}else{
+													setTimeout(() =>{
+														uni.navigateBack()
+													},300)
+												}
+											}
+										})
 									}
 								})
 							}else if(res.cancel){}
@@ -181,13 +228,14 @@
 
 <style lang="scss" scoped>
 	.edit_box{
-		width: 100%;
-		height: 100%;
+		// width: 100%;
+		// height: 100%;
+		padding: 30rpx 30rpx 195rpx;
 		
 		.top_box{
-			margin-top: 30rpx;
-			height:88%;
-			overflow-y: auto;
+			// margin-top: 30rpx;
+			// height:88%;
+			// overflow-y: auto;
 			
 			.top_title{
 				width: 690rpx;
@@ -343,18 +391,16 @@
 			right: 0;
 			bottom: 0;
 			display: flex;
-			justify-content: space-around;
-			// background-color: #F8F8F8;
-			padding: 0rpx 0rpx 20px;
+			justify-content: space-between;
+			background-color: #f5f5f5;
+			padding: 40rpx 30rpx;
 			
 			.btn_item{
-				width: 329rpx;
+				width: 690rpx;
 				height: 90rpx;
 				background: #F6F6F6;
 				border: 1rpx solid #C1C1C1;
 				color: #666;
-				width: 329rpx;
-				height: 90rpx;
 				line-height: 88rpx;
 				display: flex;
 				justify-content: center;
diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue
index d5c7b5d..63cb841 100644
--- a/pages/roadTransport/transportData/form.vue
+++ b/pages/roadTransport/transportData/form.vue
@@ -11,7 +11,7 @@
 					<view class="edit_item">
 						<p class="left">填报单位</p>
 						<view class="right">
-							<p>{{roadData.reportingUnitId ? roadData.reportingUnitId : ''}}</p>
+							<p v-if="pageType == 'add'">{{roadData.reportingUnitId ? roadData.reportingUnitId : ''}}</p>
 						</view>
 					</view>
 					<view class="edit_item">
@@ -45,109 +45,119 @@
 				<view class="basic_box data_box">
 					<view class="con_tit">道路运输数据</view>
 					<view class="edit_item input">
-						<p class="left">负责人</p>
+						<p class="left">负责人及联系电话</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.responsiblePersonId" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
-					<view class="edit_item input">
+					<!-- <view class="edit_item input">
 						<p class="left">联系电话</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.contactNumber" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
-					</view>
+					</view> -->
 					<view class="edit_item input">
-						<p class="left">营运收入</p>
+						<p class="left">投放运力-班车数</p>
 						<view class="right">
-							<uni-easyinput type="number" v-model="roadData.operatingRevenue" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.capacityShuttle" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">定线通勤包车辆</p>
+						<p class="left">投放运力-定线通勤包车(辆)</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.regularCommuteCharter" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">运送农民工报车辆</p>
+						<p class="left">运送农民工报车(辆)</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.migrantWorkersCharter" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">除定线、农民工包车辆</p>
+						<p class="left">投放运力-除定线、农民工包车(辆)</p>
 						<view class="right">
-							<uni-easyinput type="number" v-model="roadData.otherCharter" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput type="number" @blur="calcRatio" v-model="roadData.otherCharter" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">投放运力：包车数</p>
+						<p class="left">投放运力-包车数</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.capacityCharter" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">投放运力：班车数</p>
+						<p class="left">投放运力-总客车数</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.capacityShuttle" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput @blur="calcRatio" v-model="roadData.capacityTotalBus" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+						</view>
+					</view>
+					<view class="per_con">
+						<view class="content top">
+							<view class="left">客车总量环比</view>
+							<view class="right">{{roadData.totalBusIncreaseRatio != '' ? roadData.passengerVolumeRatio == 0 ? 0 : roadData.totalBusIncreaseRatio.toFixed(2) + '%' : '--%'}}</view>
+						</view>
+						<view class="content">
+							<view class="left">客车总量同比</view>
+							<view class="right">{{roadData.totalBusIncreaseRatio != '' ? roadData.passengerVolumeRatio == 0 ? 0 : roadData.totalBusIncreaseRatio.toFixed(2) + '%' : '--%'}}</view>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">投放运力：总客车数</p>
+						<p class="left">投放运力-加班数</p>
 						<view class="right">
-							<uni-easyinput @blur="calcRatio" v-model="roadData.capacityTotalBus" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.overtimeTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">定线通勤班次</p>
+						<p class="left">投放运力-班车班次</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.regularCommuteTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.capacityShuttleTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">运送农民工班次</p>
+						<p class="left">投放运力-定线通勤班次</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.migrantWorkersTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.regularCommuteTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">除定线通勤包车、农民工包车班次</p>
+						<p class="left">投放运力-运送农民工班次</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.otherTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.migrantWorkersTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">投放运力：包车班次</p>
+						<p class="left">投放运力-除定线通勤包车、农民工包车班次</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.capacityCharterTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.otherTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">投放运力：班车班次</p>
+						<p class="left">投放运力-包车班次</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.capacityShuttleTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.capacityCharterTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">投放运力：班次</p>
+						<p class="left">投放运力-班次</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.capacityTotalTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">定线通勤包车客运量</p>
+						<p class="left">班车客运量(万)</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.regularCommutePassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput @blur="calcRatio" v-model="roadData.shuttlePassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">运送农民工包车客运量(万)</p>
+						<p class="left">定线通勤包车客运量(万)</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.migrantWorkersPassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.regularCommutePassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">除定线通勤包车、农民工包车以外的客运量</p>
+						<p class="left">除定线通勤包车、农民工包车以外的客运量(万)</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.otherPassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
@@ -158,18 +168,22 @@
 							<uni-easyinput v-model="roadData.charterPassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
-					<view class="edit_item input">
-						<p class="left">班车客运量(万)</p>
-						<view class="right">
-							<uni-easyinput v-model="roadData.shuttlePassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
-						</view>
-					</view>
 					<view class="edit_item input">
 						<p class="left">完成客运量(万)</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.totalPassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
+					<view class="per_con">
+						<view class="content top">
+							<view class="left">客运量环比</view>
+							<view class="right">{{roadData.passengerVolumeRatio != '' ? roadData.passengerVolumeRatio == 0 ? 0 : roadData.passengerVolumeRatio.toFixed(2) + '%' : '--%'}}</view>
+						</view>
+						<view class="content">
+							<view class="left">客运量同比</view>
+							<view class="right">{{roadData.passengerVolumeRatio != '' ? roadData.passengerVolumeRatio == 0 ? 0 : roadData.passengerVolumeRatio.toFixed(2) + '%' : '--%'}}</view>
+						</view>
+					</view>
 					<view class="edit_item input">
 						<p class="left">总客位数(座)</p>
 						<view class="right">
@@ -177,69 +191,65 @@
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">去年同期客运量(万)</p>
+						<p class="left">营运收入(万)</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.passengerVolumeLastYear" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput type="number" v-model="roadData.operatingRevenue" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">去年总客车量(辆)</p>
+						<p class="left">联网售票张数(万张)</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.totalBusLastYear" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
-						</view>
-					</view>
-					<view class="per_con" v-if="pageType == 'edit'">
-						<view class="content top">
-							<view class="left">客运量与去年同期比率(%)</view>
-							<view class="right" :class="roadData.passengerVolumeRatio > 0 ? 'green' : roadData.passengerVolumeRatio < 0 ? 'red' : ''">{{roadData.passengerVolumeRatio ? roadData.passengerVolumeRatio + '%' :  roadData.passengerVolumeRatio == 0 ? 0 : ''}}</view>
-						</view>
-						<view class="content">
-							<view class="left">客车总量同比上升(%)</view>
-							<view class="right" :class="roadData.totalBusIncreaseRatio > 0 ? 'green' : roadData.totalBusIncreaseRatio < 0 ? 'red' : ''">{{roadData.totalBusIncreaseRatio ? roadData.totalBusIncreaseRatio + '%' : roadData.totalBusIncreaseRatio == 0 ? 0 : ''}}</view>
+							<uni-easyinput v-model="roadData.onlineTicketSales" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
-					<!-- <view class="edit_item input" v-if="pageType == 'edit'">
-						<p class="left">客运量与去年同期比率(%)</p>
+					<view class="edit_item input">
+						<p class="left">运送农民工包车客运量(万)</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.passengerVolumeRatio" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.migrantWorkersPassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
-					<view class="edit_item input" v-if="pageType == 'edit'">
-						<p class="left">客车总量同比上升 (%)</p>
-						<view class="right">
-							<uni-easyinput v-model="roadData.totalBusIncreaseRatio" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
-						</view>
-					</view> -->
 					<view class="edit_item input">
 						<p class="left">定制客运量(万人)</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.customizedPassengerVolume" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
-					<view class="edit_item input">
-						<p class="left">投放运力：加班数</p>
+					<!-- <view class="edit_item input">
+						<p class="left">去年同期客运量(万)</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.overtimeTrips" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.passengerVolumeLastYear" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="edit_item input">
-						<p class="left">较大以上安全事故次数</p>
+						<p class="left">去年总客车量(辆)</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.significantAccidents" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.totalBusLastYear" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
-					</view>
-					<view class="edit_item input">
-						<p class="left">联网售票张数(万张)</p>
+					</view> -->
+					<!-- <view class="per_con">
+						<view class="content top">
+							<view class="left">客运量与去年同期比率</view>
+							<view class="right">{{roadData.passengerVolumeRatio != '' ? roadData.passengerVolumeRatio == 0 ? 0 : roadData.passengerVolumeRatio.toFixed(2) + '%' : '-'}}</view>
+						</view>
+						<view class="content">
+							<view class="left">客车总量同比上升</view>
+							<view class="right">{{roadData.totalBusIncreaseRatio != '' ? roadData.passengerVolumeRatio == 0 ? 0 : roadData.totalBusIncreaseRatio.toFixed(2) + '%' : '-'}}</view>
+						</view>
+					</view> -->
+					
+					
+					<!-- <view class="edit_item input">
+						<p class="left">较大以上安全事故次数</p>
 						<view class="right">
-							<uni-easyinput v-model="roadData.onlineTicketSales" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput v-model="roadData.significantAccidents" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
-					</view>
-					<view class="edit_item input">
+					</view> -->
+					<!-- <view class="edit_item input">
 						<p class="left">当日人员伤者数(人)</p>
 						<view class="right">
 							<uni-easyinput v-model="roadData.dailyInjuredPersons" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
-					</view>
+					</view> 
 					<view class="edit_item input">
 						<p class="left">交通运行情况</p>
 						<view class="right">
@@ -258,7 +268,7 @@
 						<view class="right">
 							<uni-easyinput v-model="roadData.emergencySituationReport" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
-					</view>
+					</view> -->
 					<view class="remark_item">
 						<p class="left">备注</p>
 						<view class="right">
@@ -270,8 +280,9 @@
 			</view>
 		</view>
 		<view class="bottom_box">
-			<p class="btn_item" @click="cancelEdit">取消</p>
-			<p class="btn_item confirm" @click="confirmRoad">确认</p>
+			<!-- <p class="btn_item" @click="cancelEdit">取消</p> -->
+			<p class="btn_item confirm" v-if="pageType == 'add'" @click="confirmRoad">保存</p>
+			<p class="btn_item confirm" v-if="pageType == 'edit'" @click="confirmRoad">修改并保存</p>
 		</view>
 	</view>
 </template>
@@ -335,13 +346,11 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 		},
 		onLoad(options){
 			this.getUnitData()
-			this.getRoadTime()
 			this.getPersonData();
 			 if(options.item){
 				 const item = JSON.parse(options.item);
-				 // this.roadData = item;
 				 this.pageType = 'edit'
-				 this.getDetail(item.id)
+				 this.getDetail(item.id);
 				 // uni.setNavigationBarTitle({
 				 // 	title:"道路运输编辑"
 				 // })
@@ -349,11 +358,9 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 				 this.getDetail(options.id)
 			 }else if(options.type == 'add'){
 				 this.pageType = 'add';
-				 // this.roadData.reportingUnitId = '522'
+				 this.getRoadTime()
 				 let now =  new Date();
 				 this.roadData.statisticalDate = getDateStr(now, -1);//默认前一天
-				 this.getRatio()
-				 console.log('lastyear ===>',lastYearDate(this.roadData.statisticalDate))
 			 }
 			
 		},
@@ -361,13 +368,12 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 			getDetail(id){
 				this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/find/' + id,{},"GET").then(res =>{
 					this.roadData = res.data;
-					this.getRatio()
+					this.getRoadTime()
 					// console.log('last==>',lastYearDate(this.roadData.statisticalDate))
 				})
 			},
 			getRatio(){
 				this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/findByStatisticalDate/' + lastYearDate(this.roadData.statisticalDate),{},"GET").then(res =>{
-					console.log('比例数据===>',res)
 					this.lastData = res.data;
 					this.calcRatio()
 				})
@@ -375,10 +381,12 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 			//选择统计日期
 			bindDateChange(e) {
 				this.roadData.statisticalDate = e.detail.value;
+				this.getRatio()
 			},
 			// 确认修改道路运输数据
 			confirmRoad(){
 				let params = this.roadData;
+				// params.reportingUnitId = '青岛华运中远交通服务有限公司'
 				if(params.statisticalDate == ''){
 					uni.showToast({
 						title:'统计日期不可为空',
@@ -392,28 +400,31 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 				}else{
 					uni.showModal({
 						title:"提示",
-						content:"您确定，提交修改吗？",
+						content:params.id == undefined ? "您确认提交该条报送数据?" : "您确认将该条数据进行修改?",
 						success:(res) =>{
 							if(res.confirm){
 								this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/saveOrUpdate',params,'POST').then(res =>{
 									if(res.code == 200){
-										if(params.id){
-											uni.showToast({
-												title:'修改成功',
-												icon:"none"
-											});
-										}else{
-											uni.showToast({
-												title:'新增成功',
-												icon:"none"
-											});
-										}
-										setTimeout(() =>{
-											uni.navigateBack()
-										},500)
+										uni.showToast({
+											title:"报送提交成功",
+											icon:"none",
+											success: () => {
+												if(params.id == undefined){
+													setTimeout(() => {
+														uni.redirectTo({
+															url:"/pages/roadTransport/transportData/list"
+														})
+													}, 300)
+												}else{
+													setTimeout(() =>{
+														uni.navigateBack()
+													},300)
+												}
+											}
+										})
 									}
 								})
-							}else if(res.cancel){}
+							}
 						}
 					})
 				}
@@ -442,6 +453,7 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 								this.timeName = item.dictLabel
 							}
 						})
+						this.getRatio()
 					}else if(this.pageType == 'add'){
 						let now = new Date();
 						let dateStr = getDateStr(now,0);
@@ -454,6 +466,7 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 							this.index = this.roadTime.findIndex(item => item.dictValue == "03")
 							this.timeName = this.roadTime.find(item => item.dictValue == "03").dictLabel
 						}
+						this.getRatio()
 					}
 					
 				})
@@ -461,13 +474,20 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 			// 计算同比环比数据
 			calcRatio(){
 				// 客运量与去年同期比率(%)
-					this.roadData.passengerVolumeRatio = !checkNotEmpty(this.lastData.otherPassengerVolume) || this.lastData.otherPassengerVolume === 0 ? 100 : this.roadData.otherPassengerVolume ? (parseInt(this
-							.roadData.otherPassengerVolume) - this.lastData.otherPassengerVolume) / this.lastData.otherPassengerVolume *
-						100 : '';
-					// 客车总量同比上升
-				this.roadData.totalBusIncreaseRatio = !checkNotEmpty(this.lastData.otherCharter) || this.lastData.otherCharter === 0 ? 100 : this.roadData.otherCharter ? (parseInt(this
-						.roadData.otherCharter) - this.lastData.otherCharter) / this.lastData.otherCharter *
-					100 : '';
+				// 同比逻辑：
+				// 1、今日数据为0，去年今日数据为0，同比为0
+				// 2、今日数据有值且不为0，去年数据无值为-，去年数据为0时为100；
+				// 3、今日数据无值，去年数据无论有值或为0，同比为-
+				// 4、今日、去年今日都有值且都不为0时，按照公式计算(今日-去年今日)/去年今日 * 100；
+				this.roadData.passengerVolumeRatio = (checkNotEmpty(this.roadData.otherPassengerVolume) && this.roadData.otherPassengerVolume != 0 && checkNotEmpty(this.lastData.otherPassengerVolume) && this.lastData.otherPassengerVolume === 0) ? 100 : 
+					(checkNotEmpty(this.roadData.otherPassengerVolume) && checkNotEmpty(this.lastData.otherPassengerVolume) && this.roadData.otherPassengerVolume != 0 && this.lastData.otherPassengerVolume != 0) ?  
+					(this.roadData.otherPassengerVolume - this.lastData.otherPassengerVolume) / this.lastData.otherPassengerVolume * 100 :
+					(this.roadData.otherPassengerVolume == 0 && this.lastData.otherPassengerVolume == 0) ? 0 : ''
+				// 客车总量同比上升
+				this.roadData.totalBusIncreaseRatio = (checkNotEmpty(this.roadData.otherCharter) && this.roadData.otherCharter != 0 && checkNotEmpty(this.lastData.otherCharter) && this.lastData.otherCharter === 0) ? 100 :
+					(checkNotEmpty(this.roadData.otherCharter) && checkNotEmpty(this.lastData.otherCharter) && this.roadData.otherCharter != 0 && this.lastData.otherCharter != 0) ?  
+					(this.roadData.otherCharter - this.lastData.otherCharter) / this.lastData.otherCharter * 100 :
+					(this.roadData.otherCharter == 0 && this.lastData.otherCharter == 0) ? 0 : ''
 			},
 			// 获取负责人
 			getPersonData(){
@@ -563,6 +583,7 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 						
 						.left{
 							// margin-left: 30rpx;
+							min-width: 416rpx;
 							color: #666;
 							font-size: 26rpx;
 						}
@@ -626,10 +647,10 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 							
 							.left{
 								font-size: 24rpx;
-								color: #666;
+								color: #C8C8C8;
 							}
 							.right{
-								color: #333;
+								color: #D4D4D4;
 								font-size: 28rpx;
 								
 								&.green{
@@ -666,13 +687,11 @@ import { checkNotEmpty, getDateStr, lastYearDate } from '../../../common/util'
 			
 			
 			.btn_item{
-				width: 329rpx;
+				width: 690rpx;
 				height: 90rpx;
 				background: #F6F6F6;
 				border: 1rpx solid #C1C1C1;
 				color: #666;
-				width: 329rpx;
-				height: 90rpx;
 				line-height: 88rpx;
 				display: flex;
 				justify-content: center;