diff --git a/pages/roadTransport/dataSubmission/form.vue b/pages/roadTransport/dataSubmission/form.vue
index 0a1c71e..46e62ef 100644
--- a/pages/roadTransport/dataSubmission/form.vue
+++ b/pages/roadTransport/dataSubmission/form.vue
@@ -18,10 +18,15 @@
 					<view class="edit_item">
 						<p class="left">统计日期</p>
 						<view class="right">
-							<uni-datetime-picker type="date" v-model="synthData.reportDatetime">
+							<!-- <uni-datetime-picker type="date" v-model="synthData.reportDatetime">
 								<p class="right_txt">{{synthData.reportDatetime ? synthData.reportDatetime : '请选择日期'}}</p>
 								<uni-icons type="right" size="16"></uni-icons>
-							</uni-datetime-picker>
+							</uni-datetime-picker> -->
+							<picker mode="date" :value="synthData.reportDatetime" @change="bindDateChange">
+								<text class="picker_select"
+									:style="synthData.reportDatetime?'color:#333;':''">{{synthData.reportDatetime?synthData.reportDatetime:'请选择'}}</text>
+								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+							</picker>
 						</view>
 					</view>
 					<view class="edit_item">
@@ -69,36 +74,44 @@
 				},
 				isShowTitle:false,
 				timeName:'',
-				pageType:''
+				pageType:'',
+				index:''
 			}
 		},
 		onLoad(options) {
-			this.getRoadTime()
-			if(options.pageFrom == 'edit'){
+			this.getRoadTime();
+			if(options.type == 'edit'){
 				this.pageType = 'edit'
 				let row = JSON.parse(options.item);
-				console.log(row)
-				this.synthData = row;
-				this.synthData.reportDatetime = this.synthData.reportDatetime ? this.synthData.reportDatetime.substring(0,10) : ''
-			}else if(options.pageFrom == 'add'){
-				this.pageType = 'add'
+				// this.synthData = row;
+				this.getDetail(row.id);
+				// this.synthData.reportDatetime = this.synthData.reportDatetime ? this.synthData.reportDatetime.substring(0,10) : ''
 			}else if(options.type == 'add'){
 				this.pageType = 'add'
+				let now =  new Date();
+				this.synthData.reportDatetime = getDateStr(now, -1);//默认前一天
 			}
 			
 		},
 		methods: {
+			getDetail(id){
+				this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/operation/find/' + id,{},"GET").then(res=>{
+					// console.log('综合运输详情===>',res)
+					this.synthData = res.data;
+					this.synthData.reportDatetime = this.synthData.reportDatetime ? this.synthData.reportDatetime.substring(0,10) : ''
+				})
+			},
+			//选择统计日期
+			bindDateChange(e) {
+				this.synthData.reportDatetime = e.detail.value;
+			},
 			// 获取时段
 			getRoadTime(){
 				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{
 					this.roadTime = res.data;
 					if(this.pageType == 'edit'){
-						this.roadTime.map((item,index) =>{
-							if(item.dictValue == this.synthData.reportPhase){
-								this.index = index;
-								this.timeName = item.dictLabel
-							}
-						})
+						this.index = this.roadTime.findIndex(item => item.dictValue == this.synthData.reportPhase)
+						this.timeName = this.roadTime.find(item => item.dictValue == this.synthData.reportPhase).dictLabel
 					}else if(this.pageType == 'add'){
 						let now = new Date();
 						let dateStr = getDateStr(now,0);
diff --git a/pages/roadTransport/dataSubmission/list.vue b/pages/roadTransport/dataSubmission/list.vue
index b151a7a..e938609 100644
--- a/pages/roadTransport/dataSubmission/list.vue
+++ b/pages/roadTransport/dataSubmission/list.vue
@@ -128,7 +128,7 @@
 			// 点击编辑按钮
 			editItem(row){
 				uni.navigateTo({
-					url:"/pages/roadTransport/dataSubmission/form?pageFrom=edit&item=" + JSON.stringify(row)
+					url:"/pages/roadTransport/dataSubmission/form?type=edit&item=" + JSON.stringify(row)
 				})
 			},
 			// 点击查看详情按钮
diff --git a/pages/roadTransport/quantitySent/form.vue b/pages/roadTransport/quantitySent/form.vue
index 571c68e..c715e14 100644
--- a/pages/roadTransport/quantitySent/form.vue
+++ b/pages/roadTransport/quantitySent/form.vue
@@ -12,10 +12,15 @@
 					<view class="edit_item">
 						<p class="left">填报日期</p>
 						<view class="right">
-							<uni-datetime-picker type="date" v-model="synthData.reportDate">
+							<!-- <uni-datetime-picker type="date" v-model="synthData.reportDate">
 								<p class="right_txt">{{synthData.reportDate ? synthData.reportDate : '请选择日期'}}</p>
 								<uni-icons type="right" size="16"></uni-icons>
-							</uni-datetime-picker>
+							</uni-datetime-picker> -->
+							<picker mode="date" :value="synthData.reportDate" @change="bindDateChange">
+								<text class="picker_select"
+									:style="synthData.reportDate?'color:#333;':''">{{synthData.reportDate?synthData.reportDate:'请选择'}}</text>
+								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+							</picker>
 						</view>
 					</view>
 				</view>
@@ -24,7 +29,7 @@
 					<view class="edit_item input">
 						<p class="left">班次</p>
 						<view class="right">
-							<uni-easyinput v-model="synthData.shifts" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput @blur="calcYoyMom" v-model="synthData.shifts" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="per_con" v-if="pageType == 'edit'">
@@ -40,7 +45,7 @@
 					<view class="edit_item input">
 						<p class="left">人数</p>
 						<view class="right">
-							<uni-easyinput v-model="synthData.people" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
+							<uni-easyinput @blur="calcYoyMom" v-model="synthData.people" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
 						</view>
 					</view>
 					<view class="per_con" v-if="pageType == 'edit'">
@@ -76,31 +81,59 @@
 					reportDate:'', //填报日期
 					people:'' //人数
 				},
-				pageType:''
+				pageType:'',
+				yoymom:{},
 			}
 		},
 		onLoad(options) {
 			// this.getRoadTime()
-			// this.getDetail()
-			if(options.pageFrom == 'edit'){
+			if(options.type == 'edit'){
 				this.pageType = 'edit'
 				let row = JSON.parse(options.item);
 				this.synthData = row;
-				this.synthData.reportDatetime = this.synthData.reportDatetime ? this.synthData.reportDatetime.substring(0,10) : ''
-			}else if(options.pageFrom == 'add'){
-				this.pageType = 'add'
+				this.getYoYMoM();
+				// this.synthData.reportDate = this.synthData.reportDate ? this.synthData.reportDate.substring(0,10) : ''
 			}else if(options.type == 'add'){
 				this.pageType = 'add'
+				let now =  new Date();
+				this.synthData.reportDate = getDateStr(now, -1);//默认前一天
+				this.getYoYMoM();
 			}
 			
 			
 		},
 		methods: {
-			getDetail(){
-				this.$request1(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/find/89D260E420000001F70FB937A7F7088C',{},"GET").then(res =>{
-					console.log(res)
+			//选择统计日期
+			bindDateChange(e) {
+				this.synthData.reportDate = e.detail.value;
+				this.getYoYMoM();
+			},
+			// 获取同比环比
+			getYoYMoM(){
+				this.$request(getApp().globalData.baseUrl + '/api/biz/bizTransportData/getYoyMom?statDate=' + this.synthData.reportDate + '&_t=' + Date.parse(new Date()),"GET").then(res =>{
+					console.log('同比环比===>',res)
+					this.yoymom = res.data;
+					this.calcYoyMom(); //同步更新环比同比
 				})
 			},
+			// 计算同比环比
+			calcYoyMom(){
+				console.log('计算同比环比')
+				// 环比
+				if(this.yoymom.yesterdayData){
+					this.synthData.shiftMom = this.yoymom.yesterdayData.shifts && this.synthData.shifts ? (
+					parseInt(this.synthData.shifts) - this.yoymom.yesterdayData.shifts) / this.yoymom.yesterdayData.shifts * 100 : '';
+					this.synthData.peopleMom = this.yoymom.yesterdayData.people && this.synthData.people ? (
+					this.synthData.people - this.yoymom.yesterdayData.people) / this.yoymom.yesterdayData.people * 100 : ''
+				}
+				// 同比
+				if(this.yoymom.lastYearData){
+					this.synthData.shiftYoy = this.yoymom.lastYearData.shifts && this.synthData.shifts ? (
+					parseInt(this.synthData.shifts) - this.yoymom.lastYearData.shifts) / this.yoymom.lastYearData.shifts * 100 : '';
+					this.synthData.peopleYoy = this.yoymom.lastYearData.people && this.synthData.people ? (
+					this.synthData.people - this.yoymom.lastYearData.people) / this.yoymom.lastYearData.people * 100 : ''
+				}
+			},
 			// 获取时段
 			getRoadTime(){
 				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{
@@ -124,6 +157,7 @@
 			// 点击确认按钮
 			confirmRoad(){
 				let params = this.synthData;
+				console.log(params)
 				if(params.reportDate == ''){
 					uni.showToast({
 						title:"请选择填报日期",
@@ -154,13 +188,6 @@
 			cancelEdit(){
 				uni.navigateBack()
 			},
-			
-			onchange(e){
-				console.log('确定===》',e)
-			},
-			onnodeclick(e){
-				console.log('点击===》',e)
-			}
 		}
 	}
 </script>
diff --git a/pages/roadTransport/quantitySent/list.vue b/pages/roadTransport/quantitySent/list.vue
index ea30aa3..6dfed0e 100644
--- a/pages/roadTransport/quantitySent/list.vue
+++ b/pages/roadTransport/quantitySent/list.vue
@@ -159,7 +159,7 @@
 				console.log(row)
 				uni.navigateTo({
 					// url:'pages/roadTransport/transportData/detail?item=' + JSON.stringify(row)
-					url:"/pages/roadTransport/quantitySent/form?pageFrom=edit&item=" + JSON.stringify(row)
+					url:"/pages/roadTransport/quantitySent/form?type=edit&item=" + JSON.stringify(row)
 				})
 			},
 			// 点击删除按钮
diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue
index c834f07..ad31a20 100644
--- a/pages/roadTransport/transportData/form.vue
+++ b/pages/roadTransport/transportData/form.vue
@@ -17,10 +17,15 @@
 					<view class="edit_item">
 						<p class="left">统计日期</p>
 						<view class="right">
-							<uni-datetime-picker type="date" v-model="roadData.statisticalDate">
+							<!-- <uni-datetime-picker type="date" v-model="roadData.statisticalDate">
 								<p class="right_txt">{{roadData.statisticalDate ? roadData.statisticalDate : '请选择日期'}}</p>
 								<uni-icons type="right" size="16"></uni-icons>
-							</uni-datetime-picker>
+							</uni-datetime-picker> -->
+							<picker mode="date" :value="roadData.statisticalDate" @change="bindDateChange">
+								<text class="picker_select"
+									:style="roadData.statisticalDate?'color:#333;':''">{{roadData.statisticalDate?roadData.statisticalDate:'请选择'}}</text>
+								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+							</picker>
 						</view>
 					</view>
 					<view class="edit_item">
@@ -272,7 +277,7 @@
 </template>
 
 <script>
-import { getDateStr } from '../../../common/util'
+import { getDateStr, lastYearDate } from '../../../common/util'
 	export default {
 		data() {
 			return {
@@ -322,37 +327,47 @@ import { getDateStr } from '../../../common/util'
 					dailyFatalities:"", //当日人员亡者数(人)
 					emergencySituationReport:'', //应急情况报告
 					remarks:'', //	备注
-				}
+				},
+				lastyearDay:'',
+				beforeDay:''
 			}
 		},
 		onLoad(options){
 			this.getUnitData()
 			this.getRoadTime()
-			this.getPersonData()
-			 if(options.pageFrom == 'edit'){
+			this.getPersonData();
+			 if(options.item){
 				 const item = JSON.parse(options.item);
-				 this.roadData = item;
-				 
+				 // this.roadData = item;
 				 this.pageType = 'edit'
-				 console.log(this.index)
+				 this.getDetail(item.id)
 				 // uni.setNavigationBarTitle({
 				 // 	title:"道路运输编辑"
 				 // })
-			 }else if(options.pageFrom == 'add'){
-				 this.pageType = 'add'
-				 this.roadData.reportingUnitId = '522'
-				 // uni.setNavigationBarTitle({
-				 // 	title:"道路运输新增"
-				 // })
+			 }else if(options.id){
+				 this.getDetail(options.id)
 			 }else if(options.type == 'add'){
-				 this.pageType = 'add'
+				 this.pageType = 'add';
+				 // this.roadData.reportingUnitId = '522'
+				 let now =  new Date();
+				 this.roadData.statisticalDate = getDateStr(now, -1);//默认前一天
+				 // console.log('lastyear ===>',lastYearDate(this.roadData.statisticalDate))
 			 }
 			
 		},
 		methods: {
+			getDetail(id){
+				this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/find/' + id,{},"GET").then(res =>{
+					this.roadData = res.data;
+					// console.log('last==>',lastYearDate(this.roadData.statisticalDate))
+				})
+			},
+			//选择统计日期
+			bindDateChange(e) {
+				this.roadData.statisticalDate = e.detail.value;
+			},
 			// 确认修改道路运输数据
 			confirmRoad(){
-				console.log('点击按钮')
 				let params = this.roadData;
 				if(params.statisticalDate == ''){
 					uni.showToast({
@@ -433,6 +448,11 @@ import { getDateStr } from '../../../common/util'
 					
 				})
 			},
+			// 计算同比环比数据
+			calcRatio(){
+				// 环比
+				// this.roadData.
+			},
 			// 获取负责人
 			getPersonData(){
 				this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/staff/list?query=&_t=1693373171858',"GET").then(res =>{
diff --git a/pages/roadTransport/transportData/list.vue b/pages/roadTransport/transportData/list.vue
index f0ddf55..fdb0009 100644
--- a/pages/roadTransport/transportData/list.vue
+++ b/pages/roadTransport/transportData/list.vue
@@ -264,7 +264,7 @@
 				console.log(row)
 				uni.navigateTo({
 					// url:'pages/roadTransport/transportData/detail?item=' + JSON.stringify(row)
-					url:"/pages/roadTransport/transportData/form?item=" + JSON.stringify(row) + '&pageFrom=edit'
+					url:"/pages/roadTransport/transportData/form?item=" + JSON.stringify(row) + '&type=edit'
 				})
 			},
 			// 点击查看详情按钮