diff --git a/pages.json b/pages.json
index ca75977..97dc466 100644
--- a/pages.json
+++ b/pages.json
@@ -153,6 +153,30 @@
 				"navigationBarTitleText": "机场运行情况报送"
 			}
 		},
+		{
+			"path": "pages/portShipping/internationalTransport/form",
+			"style": {
+				"navigationBarTitleText": "水路国际客运报送"
+			}
+		},
+		{
+			"path": "pages/portShipping/internationalTransport/list",
+			"style": {
+				"navigationBarTitleText": "水路国际客运"
+			}
+		},
+		{
+			"path": "pages/metro/runData/form",
+			"style": {
+				"navigationBarTitleText": "地铁客流量报送"
+			}
+		},
+		{
+			"path": "pages/metro/runData/list",
+			"style": {
+				"navigationBarTitleText": "地铁客流量"
+			}
+		},
 		{
 			"path": "pages/roadTransport/transportData/list",
 			"style": {
diff --git a/pages/airport/airport-runData/form.vue b/pages/airport/airport-runData/form.vue
index 8928841..e2b1f2d 100644
--- a/pages/airport/airport-runData/form.vue
+++ b/pages/airport/airport-runData/form.vue
@@ -47,14 +47,14 @@
 						<view class="rate_item_label" :style="form.inFlightsMomDo === 0 ? 'color: #EB4747' : ''">
 							入青航班架次环比</view>
 						<view class="rate_item_input" :style="form.inFlightsMomDo === 0 ? 'color: #EB4747' : ''">
-							{{form.inFlightsMomDo === 0 ? form.inFlightsMomDo : form.inFlightsMomDo ? formatDigit(form.inFlightsMomDo) : '--'}}%
+							{{formatDigit(form.inFlightsMomDo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">入青航班架次同比</view>
 						<view class="rate_item_input">
-							{{form.inFlightsYoyDo === 0 ? form.inFlightsYoyDo : form.inFlightsYoyDo ? formatDigit(form.inFlightsYoyDo) : '--'}}%
+							{{formatDigit(form.inFlightsYoyDo)}}%
 						</view>
 					</view>
 				</view>
@@ -72,14 +72,14 @@
 						<view class="rate_item_label" :style="form.outFlightsMomDo === 0 ? 'color: #EB4747' : ''">
 							出青航班架次环比</view>
 						<view class="rate_item_input" :style="form.outFlightsMomDo === 0 ? 'color: #EB4747' : ''">
-							{{form.outFlightsMomDo === 0 ? form.outFlightsMomDo : form.outFlightsMomDo ? formatDigit(form.outFlightsMomDo) : '--'}}%
+							{{formatDigit(form.outFlightsMomDo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">出青航班架次同比</view>
 						<view class="rate_item_input">
-							{{form.outFlightsYoyDo === 0 ? form.outFlightsYoyDo : form.outFlightsYoyDo ? formatDigit(form.outFlightsYoyDo) : '--'}}%
+							{{formatDigit(form.outFlightsYoyDo)}}%
 						</view>
 					</view>
 				</view>
@@ -97,14 +97,14 @@
 						<view class="rate_item_label" :style="form.inPassengersMomDo === 0 ? 'color: #EB4747' : ''">
 							入青航班旅客环比</view>
 						<view class="rate_item_input" :style="form.inPassengersMomDo === 0 ? 'color: #EB4747' : ''">
-							{{form.inPassengersMomDo === 0 ? form.inPassengersMomDo : form.inPassengersMomDo ? formatDigit(form.inPassengersMomDo) : '--'}}%
+							{{formatDigit(form.inPassengersMomDo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">入青航班旅客同比</view>
 						<view class="rate_item_input">
-							{{form.inPassengersYoyDo === 0 ? form.inPassengersYoyDo : form.inPassengersYoyDo ? formatDigit(form.inPassengersYoyDo) : '--'}}%
+							{{formatDigit(form.inPassengersYoyDo)}}%
 						</view>
 					</view>
 				</view>
@@ -122,14 +122,14 @@
 						<view class="rate_item_label" :style="form.outPassengersMomDo === 0 ? 'color: #EB4747' : ''">
 							出青航班旅客环比</view>
 						<view class="rate_item_input" :style="form.outPassengersMomDo === 0 ? 'color: #EB4747' : ''">
-							{{form.outPassengersMomDo === 0 ? form.outPassengersMomDo : form.outPassengersMomDo ? formatDigit(form.outPassengersMomDo) : '--'}}%
+							{{formatDigit(form.outPassengersMomDo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">出青航班旅客同比</view>
 						<view class="rate_item_input">
-							{{form.outPassengersYoyDo === 0 ? form.outPassengersYoyDo : form.outPassengersYoyDo ? formatDigit(form.outPassengersYoyDo) : '--'}}%
+							{{formatDigit(form.outPassengersYoyDo)}}%
 						</view>
 					</view>
 				</view>
@@ -156,14 +156,14 @@
 						<view class="rate_item_label" :style="form.inFlightsMomIn === 0 ? 'color: #EB4747' : ''">
 							入青航班架次环比</view>
 						<view class="rate_item_input" :style="form.inFlightsMomIn === 0 ? 'color: #EB4747' : ''">
-							{{form.inFlightsMomIn === 0 ? form.inFlightsMomIn : form.inFlightsMomIn ? formatDigit(form.inFlightsMomIn) : '--'}}%
+							{{formatDigit(form.inFlightsMomIn)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">入青航班架次同比</view>
 						<view class="rate_item_input">
-							{{form.inFlightsYoyIn === 0 ? form.inFlightsYoyIn : form.inFlightsYoyIn ? formatDigit(form.inFlightsYoyIn) : '--'}}%
+							{{formatDigit(form.inFlightsYoyIn)}}%
 						</view>
 					</view>
 				</view>
@@ -181,14 +181,14 @@
 						<view class="rate_item_label" :style="form.outFlightsMomIn === 0 ? 'color: #EB4747' : ''">
 							出青航班架次环比</view>
 						<view class="rate_item_input" :style="form.outFlightsMomIn === 0 ? 'color: #EB4747' : ''">
-							{{form.outFlightsMomIn === 0 ? form.outFlightsMomIn : form.outFlightsMomIn ? formatDigit(form.outFlightsMomIn) : '--'}}%
+							{{formatDigit(form.outFlightsMomIn)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">出青航班架次同比</view>
 						<view class="rate_item_input">
-							{{form.outFlightsYoyIn === 0 ? form.outFlightsYoyIn : form.outFlightsYoyIn ? formatDigit(form.outFlightsYoyIn) : '--'}}%
+							{{formatDigit(form.outFlightsYoyIn)}}%
 						</view>
 					</view>
 				</view>
@@ -206,14 +206,14 @@
 						<view class="rate_item_label" :style="form.inPassengersMomIn === 0 ? 'color: #EB4747' : ''">
 							入青航班旅客环比</view>
 						<view class="rate_item_input" :style="form.inPassengersMomIn === 0 ? 'color: #EB4747' : ''">
-							{{form.inPassengersMomIn === 0 ? form.inPassengersMomIn : form.inPassengersMomIn ? formatDigit(form.inPassengersMomIn) : '--'}}%
+							{{formatDigit(form.inPassengersMomIn)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">入青航班旅客同比</view>
 						<view class="rate_item_input">
-							{{form.inPassengersYoyIn === 0 ? form.inPassengersYoyIn : form.inPassengersYoyIn ? formatDigit(form.inPassengersYoyIn) : '--'}}%
+							{{formatDigit(form.inPassengersYoyIn)}}%
 						</view>
 					</view>
 				</view>
@@ -231,14 +231,14 @@
 						<view class="rate_item_label" :style="form.outPassengersMomIn === 0 ? 'color: #EB4747' : ''">
 							出青航班旅客环比</view>
 						<view class="rate_item_input" :style="form.outPassengersMomIn === 0 ? 'color: #EB4747' : ''">
-							{{form.outPassengersMomIn === 0 ? form.outPassengersMomIn : form.outPassengersMomIn ? formatDigit(form.outPassengersMomIn) : '--'}}%
+							{{formatDigit(form.outPassengersMomIn)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">出青航班旅客同比</view>
 						<view class="rate_item_input">
-							{{form.outPassengersYoyIn === 0 ? form.outPassengersYoyIn : form.outPassengersYoyIn ? formatDigit(form.outPassengersYoyIn) : '--'}}%
+							{{formatDigit(form.outPassengersYoyIn)}}%
 						</view>
 					</view>
 				</view>
@@ -262,14 +262,14 @@
 						<view class="rate_item_label" :style="form.inFlightsMomTo === 0 ? 'color: #EB4747' : ''">
 							入青航班架次环比</view>
 						<view class="rate_item_input" :style="form.inFlightsMomTo === 0 ? 'color: #EB4747' : ''">
-							{{form.inFlightsMomTo === 0 ? form.inFlightsMomTo : form.inFlightsMomTo ? formatDigit(form.inFlightsMomTo) : '--'}}%
+							{{formatDigit(form.inFlightsMomTo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">入青航班架次同比</view>
 						<view class="rate_item_input">
-							{{form.inFlightsYoyTo === 0 ? form.inFlightsYoyTo : form.inFlightsYoyTo ? formatDigit(form.inFlightsYoyTo) : '--'}}%
+							{{formatDigit(form.inFlightsYoyTo)}}%
 						</view>
 					</view>
 				</view>
@@ -285,14 +285,14 @@
 						<view class="rate_item_label" :style="form.outFlightsMomTo === 0 ? 'color: #EB4747' : ''">
 							出青航班架次环比</view>
 						<view class="rate_item_input" :style="form.outFlightsMomTo === 0 ? 'color: #EB4747' : ''">
-							{{form.outFlightsMomTo === 0 ? form.outFlightsMomTo : form.outFlightsMomTo ? formatDigit(form.outFlightsMomTo) : '--'}}%
+							{{formatDigit(form.outFlightsMomTo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">出青航班架次同比</view>
 						<view class="rate_item_input">
-							{{form.outFlightsYoyTo === 0 ? form.outFlightsYoyTo : form.outFlightsYoyTo ? formatDigit(form.outFlightsYoyTo) : '--'}}%
+							{{formatDigit(form.outFlightsYoyTo)}}%
 						</view>
 					</view>
 				</view>
@@ -308,14 +308,14 @@
 						<view class="rate_item_label" :style="form.inPassengersMomTo === 0 ? 'color: #EB4747' : ''">
 							入青航班旅客环比</view>
 						<view class="rate_item_input" :style="form.inPassengersMomTo === 0 ? 'color: #EB4747' : ''">
-							{{form.inPassengersMomTo === 0 ? form.inPassengersMomTo : form.inPassengersMomTo ? formatDigit(form.inPassengersMomTo) : '--'}}%
+							{{formatDigit(form.inPassengersMomTo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">入青航班旅客同比</view>
 						<view class="rate_item_input">
-							{{form.inPassengersYoyTo === 0 ? form.inPassengersYoyTo : form.inPassengersYoyTo ? formatDigit(form.inPassengersYoyTo) : '--'}}%
+							{{formatDigit(form.inPassengersYoyTo)}}%
 						</view>
 					</view>
 				</view>
@@ -331,14 +331,14 @@
 						<view class="rate_item_label" :style="form.outPassengersMomTo === 0 ? 'color: #EB4747' : ''">
 							出青航班旅客环比</view>
 						<view class="rate_item_input" :style="form.outPassengersMomTo === 0 ? 'color: #EB4747' : ''">
-							{{form.outPassengersMomTo === 0 ? form.outPassengersMomTo : form.outPassengersMomTo ? formatDigit(form.outPassengersMomTo) : '--'}}%
+							{{formatDigit(form.outPassengersMomTo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">出青航班旅客同比</view>
 						<view class="rate_item_input">
-							{{form.outPassengersYoyTo === 0 ? form.outPassengersYoyTo : form.outPassengersYoyTo ? formatDigit(form.outPassengersYoyTo) : '--'}}%
+							{{formatDigit(form.outPassengersYoyTo)}}%
 						</view>
 					</view>
 				</view>
@@ -443,7 +443,7 @@
 		},
 		methods: {
 			formatDigit(data) {
-				return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data;
+				return !checkNotEmpty(data) ? '--' : (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data;
 			},
 			//环比同比
 			queryYoyMom() {
@@ -484,15 +484,15 @@
 				this.form.outPassengersMomIn = this.$calcMom(this.form.outboundPassengersIn,yesterdayData.outboundPassengersIn);
 				this.form.outPassengersYoyIn =this.$calcYoy(this.form.outboundPassengersIn,lastYearData.outboundPassengersIn);
 				//汇总-入
-				this.form.inboundFlightsTo = (checkNotEmpty(this.form.inboundFlightsDo) ? parseInt(this.form.inboundFlightsDo) : 0) + (checkNotEmpty(this.form.inboundFlightsIn) ? parseInt(this.form.inboundFlightsIn) : 0);//入青-航班
-				this.form.inboundPassengersTo = (checkNotEmpty(this.form.inboundPassengersDo) ? parseInt(this.form.inboundPassengersDo) : 0) + (checkNotEmpty(this.form.inboundPassengersIn) ? parseInt(this.form.inboundPassengersIn) : 0);//入青-旅客
+				this.form.inboundFlightsTo = !checkNotEmpty(this.form.inboundFlightsDo) && !checkNotEmpty(this.form.inboundFlightsIn) ? '' : (checkNotEmpty(this.form.inboundFlightsDo) ? parseInt(this.form.inboundFlightsDo) : 0) + (checkNotEmpty(this.form.inboundFlightsIn) ? parseInt(this.form.inboundFlightsIn) : 0);//入青-航班
+				this.form.inboundPassengersTo = !checkNotEmpty(this.form.inboundPassengersDo) && !checkNotEmpty(this.form.inboundPassengersIn) ? '' : (checkNotEmpty(this.form.inboundPassengersDo) ? parseInt(this.form.inboundPassengersDo) : 0) + (checkNotEmpty(this.form.inboundPassengersIn) ? parseInt(this.form.inboundPassengersIn) : 0);//入青-旅客
 				this.form.inFlightsMomTo = this.$calcMom(this.form.inboundFlightsTo,yesterdayData.inboundFlightsTo);
 				this.form.inFlightsYoyTo =this.$calcYoy(this.form.inboundFlightsTo,lastYearData.inboundFlightsTo);
 				this.form.inPassengersMomTo = this.$calcMom(this.form.inboundPassengersTo,yesterdayData.inboundPassengersTo);
 				this.form.inPassengersYoyTo =this.$calcYoy(this.form.inboundPassengersTo,lastYearData.inboundPassengersTo);
 				//汇总-出
-				this.form.outboundFlightsTo = (checkNotEmpty(this.form.outboundFlightsDo) ? parseInt(this.form.outboundFlightsDo) : 0) + (checkNotEmpty(this.form.outboundFlightsIn) ? parseInt(this.form.outboundFlightsIn) : 0);//出青-航班
-				this.form.outboundPassengersTo = (checkNotEmpty(this.form.outboundPassengersDo) ? parseInt(this.form.outboundPassengersDo) : 0) + (checkNotEmpty(this.form.outboundPassengersIn) ? parseInt(this.form.outboundPassengersIn) : 0);//出青-旅客
+				this.form.outboundFlightsTo = !checkNotEmpty(this.form.outboundFlightsDo) && !checkNotEmpty(this.form.outboundFlightsIn) ? '' : (checkNotEmpty(this.form.outboundFlightsDo) ? parseInt(this.form.outboundFlightsDo) : 0) + (checkNotEmpty(this.form.outboundFlightsIn) ? parseInt(this.form.outboundFlightsIn) : 0);//出青-航班
+				this.form.outboundPassengersTo = !checkNotEmpty(this.form.outboundPassengersDo) && !checkNotEmpty(this.form.outboundPassengersIn) ? '' : (checkNotEmpty(this.form.outboundPassengersDo) ? parseInt(this.form.outboundPassengersDo) : 0) + (checkNotEmpty(this.form.outboundPassengersIn) ? parseInt(this.form.outboundPassengersIn) : 0);//出青-旅客
 				this.form.outFlightsMomTo = this.$calcMom(this.form.outboundFlightsTo,yesterdayData.outboundFlightsTo);
 				this.form.outFlightsYoyTo =this.$calcYoy(this.form.outboundFlightsTo,lastYearData.outboundFlightsTo);
 				this.form.outPassengersMomTo = this.$calcMom(this.form.outboundPassengersTo,yesterdayData.outboundPassengersTo);
diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue
index e19967b..ab5f6db 100644
--- a/pages/highWay/runData/form.vue
+++ b/pages/highWay/runData/form.vue
@@ -9,7 +9,7 @@
 			<view class="form_item">
 				<view class="form_item_label">管理单位名称：</view>
 				<view class="form_item_input picker">
-					<picker v-if="pageType == 'add'" :value="form.organizationNameIndex" :range="deptNameList"
+					<picker v-if="pageType == 'add' && deptNameList.length > 1" :value="form.organizationNameIndex" :range="deptNameList"
 						range-key="deptName" @change="bindDeptChange">
 						<text class="picker_select"
 							:style="form.organizationName?'color:#333;':''">{{form.organizationName?form.organizationName:'请选择'}}</text>
@@ -53,14 +53,14 @@
 						驶入车辆数统计环比</view>
 					<view class="rate_item_input"
 						:style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ?'color: #EB4747':''">
-						{{form.entranceVehicleCountMom === 0 ? form.entranceVehicleCountMom : checkNotEmpty(form.entranceVehicleCountMom) ? formatDigit(form.entranceVehicleCountMom) : '--'}}%
+						{{formatDigit(form.entranceVehicleCountMom)}}%
 					</view>
 				</view>
 				<view class="line"></view>
 				<view class="rate_item">
 					<view class="rate_item_label">驶入车辆数统计同比</view>
 					<view class="rate_item_input">
-						{{form.entranceVehicleCountYoy === 0 ? form.entranceVehicleCountYoy : checkNotEmpty(form.entranceVehicleCountYoy) ? formatDigit(form.entranceVehicleCountYoy) : '--'}}%
+						{{formatDigit(form.entranceVehicleCountYoy)}}%
 					</view>
 				</view>
 			</view>
@@ -79,14 +79,14 @@
 						驶出车辆数统计环比</view>
 					<view class="rate_item_input"
 						:style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ?'color: #EB4747':''">
-						{{form.exitVehicleCountMom === 0 ? form.exitVehicleCountMom : checkNotEmpty(form.exitVehicleCountMom) ? formatDigit(form.exitVehicleCountMom) : '--'}}%
+						{{formatDigit(form.exitVehicleCountMom)}}%
 					</view>
 				</view>
 				<view class="line"></view>
 				<view class="rate_item">
 					<view class="rate_item_label">驶出车辆数统计同比</view>
 					<view class="rate_item_input">
-						{{form.exitVehicleCountYoy === 0 ? form.exitVehicleCountYoy : checkNotEmpty(form.exitVehicleCountYoy) ? formatDigit(form.exitVehicleCountYoy) : '--'}}%
+						{{formatDigit(form.exitVehicleCountYoy)}}%
 					</view>
 				</view>
 			</view>
@@ -144,14 +144,14 @@
 						驶入车辆数环比</view>
 					<view class="rate_item_input"
 						:style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].entranceVehicleCount) && (form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''">
-						{{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 ? form.highwaySubDataList[stationIndex].entranceVehicleCountMom : form.highwaySubDataList[stationIndex].entranceVehicleCountMom ? formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountMom) : '--'}}%
+						{{formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountMom)}}%
 					</view>
 				</view>
 				<view class="line"></view>
 				<view class="rate_item">
 					<view class="rate_item_label">驶入车辆数同比</view>
 					<view class="rate_item_input">
-						{{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].entranceVehicleCountYoy === 0 ? form.highwaySubDataList[stationIndex].entranceVehicleCountYoy : form.highwaySubDataList[stationIndex].entranceVehicleCountYoy ? formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountYoy) : '--'}}%
+						{{formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountYoy)}}%
 					</view>
 				</view>
 			</view>
@@ -173,14 +173,14 @@
 						驶出车辆数环比</view>
 					<view class="rate_item_input"
 						:style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].exitVehicleCount) && (form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''">
-						{{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom) : form.highwaySubDataList[stationIndex].exitVehicleCountMom ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom) : '--'}}%
+						{{formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom)}}%
 					</view>
 				</view>
 				<view class="line"></view>
 				<view class="rate_item">
 					<view class="rate_item_label">驶出车辆数同比</view>
 					<view class="rate_item_input">
-						{{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].exitVehicleCountYoy === 0 ? form.highwaySubDataList[stationIndex].exitVehicleCountYoy : form.highwaySubDataList[stationIndex].exitVehicleCountYoy ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountYoy) : '--'}}%
+						{{formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountYoy)}}%
 					</view>
 				</view>
 			</view>
@@ -245,7 +245,9 @@
 					exitVehicleCount: '',
 					exitVehicleCountMom: '',
 					exitVehicleCountYoy: '',
-					highwaySubDataList: [],
+					highwaySubDataList: [
+						{}
+					],
 				}, //登录form
 				highwaySubDataList: [], //收费站列表
 				stationIndex: 0, //收费站选中索引
@@ -285,7 +287,7 @@
 			},
 			//只保留两位小数
 			formatDigit(data) {
-				return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data;
+				return !checkNotEmpty(data) ? '--' : (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data;
 			},
 			//id查询详情
 			queryDetailInfo(id) {
@@ -316,17 +318,31 @@
 							}
 						})
 				}
+			},
+			//切换管理单位
+			bindDeptChange(e) {
+				this.form.organizationNameIndex = e.detail.value;
+				this.form.organizationName = this.deptNameList[e.detail.value].deptName;
 			},
 			//报送人
-			queryPerson() {
-				this.$request(getApp().globalData.baseUrl + '/api/biz/personnelContactInfoController/all?query=&_t=' + Date
-					.parse(new Date()), {}, "GET").then(res => {
-					let arr = [];
-					res.data.list.map(item => {
-						arr.push(item.name);
-					})
-					this.submitPerson = arr;
-				})
+			// queryPerson() {
+			// 	this.$request(getApp().globalData.baseUrl + '/api/biz/personnelContactInfoController/all?query=&_t=' + Date
+			// 		.parse(new Date()), {}, "GET").then(res => {
+			// 		let arr = [];
+			// 		res.data.list.map(item => {
+			// 			arr.push(item.name);
+			// 		})
+			// 		this.submitPerson = arr;
+			// 	})
+			// },
+			queryPerson() {
+				this.$request(getApp().globalData.baseUrl + '/api/user/getByDeptId/' + this.deptNameList[this.form.organizationNameIndex].deptId, {}, "GET").then(res => {
+					let arr = [];
+					res.data.map(item => {
+						arr.push(item.username+(item.mobile?','+item.mobile:''));
+					})
+					this.submitPerson = arr;
+				})
 			},
 			changeSubmitPerson(e, index) {
 				this.form.highwaySubDataList[index].submitPersonnelContact = this.submitPerson[e.detail.value];
@@ -400,7 +416,7 @@
 				if (idx > -1) {
 					//环比
 					let obj = this.yoyMom.minusDaysList[idx];
-					console.log(obj)
+					// console.log(obj)
 					this.form.highwaySubDataList[index].entranceVehicleCountMom = !checkNotEmpty(this.form
 							.highwaySubDataList[index].entranceVehicleCount) ? '' : !checkNotEmpty(obj
 							.entranceVehicleCount) ? '' : obj.entranceVehicleCount === 0 ? 100 : (parseInt(this.form
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 270e74c..e52e093 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -25,7 +25,7 @@
 					username: '',
 					password: '',
 					verCode: '',
-					vercodeType: 5
+					vercodeType: 1
 				}, //登录form
 				codeImg: '', //图形验证码
 			}
@@ -36,7 +36,7 @@
 		methods: {
 			//获取图形验证码
 			getVerCode() {
-				this.$request1(getApp().globalData.baseUrl + '/api/common/captchaBase64?type=5&_t=' + Date.parse(new Date()), {}, 'GET').then(res => {
+				this.$request1(getApp().globalData.baseUrl + '/api/common/captchaBase64?type=1&_t=' + Date.parse(new Date()), {}, 'GET').then(res => {
 					if(res.code == 200) {
 						this.codeImg = res.data.img;
 					}
diff --git a/pages/metro/runData/form.vue b/pages/metro/runData/form.vue
new file mode 100644
index 0000000..ba49d2d
--- /dev/null
+++ b/pages/metro/runData/form.vue
@@ -0,0 +1,535 @@
+<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">
+				<view class="form_item_label">统计日期：</view>
+				<view class="form_item_input picker">
+					<picker mode="date" :value="form.statDate" @change="bindDateChange">
+						<text class="picker_select"
+							:style="form.statDate?'color:#333;':''">{{form.statDate?form.statDate:'请选择'}}</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="array" range-key="dictLabel" @change="changeStatPeriod">
+						<text class="picker_select"
+							: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" style="margin-top: 30rpx;">
+			<view class="form_item"
+				style="display:flex; justify-content: space-between;font-size: 30rpx;color:#333;font-weight: bold;margin-top: 30rpx;">
+				运输数据
+			</view>
+			<view class="form_item">
+				<view class="form_item_label">车次：</view>
+				<view class="form_item_input form_input">
+					<uni-easyinput v-model="form.dataDetails" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+						placeholder="请输入" maxlength="30">
+					</uni-easyinput>
+				</view>
+			</view>
+
+			<!-- 同比环比 -->
+			<view class="form_item_rate" :class="form.inboundRailwayDo === 0 ? 'danger' : '' ">
+				<view class="rate_item">
+					<view class="rate_item_label" :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+						总车次环比</view>
+					<view class="rate_item_input" :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+						{{formatDigit(form.inRailwayYomDo)}}%
+					</view>
+				</view>
+				<view class="line"></view>
+				<view class="rate_item">
+					<view class="rate_item_label">总车次同比</view>
+					<view class="rate_item_input">
+						{{formatDigit(form.inRailwayMomDo)}}%
+					</view>
+				</view>
+			</view>
+			<view class="form_item">
+				<view class="form_item_label">总客流量(人)：</view>
+				<view class="form_item_input form_input">
+					<uni-easyinput v-model="form.dataDetails" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+						placeholder="请输入" maxlength="30">
+					</uni-easyinput>
+				</view>
+			</view>
+
+			<!-- 同比环比 -->
+			<view class="form_item_rate" :class="form.inboundRailwayDo === 0 ? 'danger' : '' ">
+				<view class="rate_item">
+					<view class="rate_item_label" :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+						总客流量人数环比</view>
+					<view class="rate_item_input" :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+						{{formatDigit(form.inRailwayYomDo)}}%
+					</view>
+				</view>
+				<view class="line"></view>
+				<view class="rate_item">
+					<view class="rate_item_label">总客流量人数</view>
+					<view class="rate_item_input">
+						{{formatDigit(form.inRailwayMomDo)}}%
+					</view>
+				</view>
+			</view>
+			<view class="form_item_remark">
+				<view class="form_item_label">备注：</view>
+				<view class="form_item_input form_input">
+					<uni-easyinput type="textarea" v-model="form.dataDetails"
+						placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+						placeholder="请输入备注信息" maxlength="200">
+					</uni-easyinput>
+				</view>
+			</view>
+
+		</view>
+		<!-- 底部按钮 -->
+		<view class="foot_btn">
+			<view class="act_btn blue" @click="doSubmit">{{btnText}}</view>
+		</view>
+	</view>
+</template>
+<script>
+	import {
+		getDateStr,
+		checkNotEmpty
+	} from "../../../common/util.js"
+	export default {
+		data() {
+			return {
+				form: {
+					"children": [{
+						"dataDetails": ""
+					}],
+					"carName": "",
+					"statDate": "",
+					"statPeriod": ""
+				}, //登录form
+				array: [], //时段选择列表
+				index: 2, //时段选择,默认0-24
+				userInfo: {},
+				pageType: '',
+				btnText: '保存'
+			}
+		},
+		onLoad(options) {
+			this.userInfo = uni.getStorageSync('userInfo');
+			if (options.type == 'add') {
+				this.pageType = 'add';
+				let now = new Date();
+				this.form.statDate = getDateStr(now, -1); //默认前一天
+				this.queryTime(); //统计时段
+			}
+			if (options.item) {
+				this.btnText = '修改并保存';
+				this.form = JSON.parse(options.item);
+				this.queryTime(); //统计时段
+			}
+			if (options.id) {
+				this.btnText = '修改并保存';
+				this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunSituation/find//' + options.id, {}, "GET")
+					.then(res => {
+						this.form = res.data;
+						this.queryTime(); //统计时段
+					});
+			}
+		},
+		methods: {
+			//统计时段切换选择
+			changeStatPeriod(e) {
+				this.index = e.detail.value;
+				this.form.statPeriod = this.array[e.detail.value].dictValue;
+				console.log('change 时段', this.form);
+			},
+			//取消
+			doCancel() {
+				uni.navigateBack();
+			},
+			//选择统计日期
+			bindDateChange(e) {
+				this.form.statDate = e.detail.value;
+			},
+			//时段
+			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 : idx;
+						} else {
+							this.form.statPeriod = '03'; //默认0-24
+							let idx = this.array.findIndex(item => item.dictValue == '03');
+							this.index = idx > -1 ? idx : idx;
+						}
+					} else {
+						let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
+						this.index = idx > -1 ? idx : idx;
+					}
+				})
+			},
+			//确认提交
+			doSubmit() {
+				if (!checkNotEmpty(this.form.statDate) || !checkNotEmpty(this.form.statPeriod)) {
+					uni.showToast({
+						title: '报送日期和时段不能为空',
+						icon: 'none'
+					})
+					return;
+				}
+				uni.showModal({
+					title: '提示',
+					content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
+					success: (res) => {
+						if (res.confirm) {
+							this.submitForm();
+						}
+					}
+				})
+			},
+			submitForm() {
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				})
+				this.$request(getApp().globalData.baseUrl + '/api/biz/airportRunSituation/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/airport/airport-runStatus/list'
+										})
+									}, 300)
+								} else {
+									uni.navigateBack();
+								}
+							}
+						})
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				})
+			},
+		}
+	}
+</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;
+
+			//环比同比
+			.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: #666;
+					line-height: 35rpx;
+					font-size: 26rpx;
+					font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+					margin-bottom: 30rpx;
+				}
+
+				/deep/ .is-input-border {
+					border-radius: 20rpx !important;
+					border: 1px solid #c1c1c1 !important;
+				}
+			}
+
+			.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: 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;
+						// }
+
+						.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 {
+								height: 35rpx !important;
+								text-align: right;
+							}
+						}
+
+						/deep/ .uni-date-x--border {
+							border: 0 !important;
+
+							.uni-date__x-input {
+								// height: 35rpx !important;
+								text-align: right;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//收费站
+	.station_box {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 40rpx;
+
+		.station_item {
+			height: 60rpx;
+			color: #666666;
+			line-height: 60rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			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;
+					background: #1ECE5F;
+					border-radius: 0rpx 20rpx 0rpx 5rpx;
+					text-align: center;
+				}
+			}
+		}
+	}
+
+	.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: 690rpx;
+			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;
+			}
+		}
+	}
+
+	//增行
+	.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: 1px dashed #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>
diff --git a/pages/metro/runData/list.vue b/pages/metro/runData/list.vue
new file mode 100644
index 0000000..9660072
--- /dev/null
+++ b/pages/metro/runData/list.vue
@@ -0,0 +1,445 @@
+<template>
+	<view class="page">
+		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/metro/runData/form', item)">
+			<view class="list_top">
+				<view class="unit_tags">报送时间</view>
+				<view>{{item.statDate || ''}}<text
+					style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view>
+			</view>
+		</view>
+		<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
+			:contentText="contentText"></uni-load-more>
+		<!-- 筛选 -->
+		<view class="foot_btn_box">
+			<view @click="showSearch" class="act_btn btn1"><uni-icons type="search" size="18" color="#2D8CF0"
+					style="margin-right: 9rpx;"></uni-icons>查询
+			</view>
+		</view>
+		<!-- 筛选 -->
+		<uni-popup ref="popup" style="width: 100%;" background-color="none">
+			<view class="pop_box">
+				<view class="pop_title">
+					查询条件
+					<uni-icons type="closeempty" size="18" color="#666" class="pop_close"></uni-icons>
+				</view>
+				<view class="popup-content">
+					<view class="cont_tit">
+						统计起止时间
+					</view>
+					<view class="time_box">
+						<uni-datetime-picker v-model="timeRange" type="daterange" />
+					</view>
+					<view class="cont_tit picker">
+						<view>统计时段</view>
+						<view class="picker_select">
+							<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
+								<text class="unselect_txt"
+									:style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
+								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+							</picker>
+						</view>
+					</view>
+				</view>
+				<view class="btn_box">
+					<p class="btn" @click="searchReset">重置</p>
+					<p class="btn" @click="searchList">确认</p>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				data: [],
+				current: 0,
+				size: 10,
+				hasMore: true,
+				status: '',
+				query: {
+					statDateStart: '',
+					statDateEnd: '',
+					statPeriod: ''
+				},
+				contentText: {
+					contentdown: "点击查看更多",
+					contentrefresh: "正在加载...",
+					contentnomore: "没有更多数据了",
+				},
+				timeRange: [], //查询起止日期
+				array: [], //时段选择列表
+				index: '', //时段选择
+			}
+		},
+		onLoad() {
+			this.queryTime();
+			this.loadMore();
+		},
+		onUnload() {
+			this.hasMore = true;
+			this.data = [];
+		},
+		onPullDownRefresh() {
+			console.log('onPullDownRefresh');
+			this.data = [];
+			this.current = 0;
+			this.hasMore = true;
+			this.loadMore();
+		},
+		methods: {
+			//折叠
+			showDetail(index1, index2, flag) {
+				this.data[index1].highwaySubDataList[index2].show = flag;
+			},
+			//搜索时段选择
+			bindPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.index = e.detail.value
+			},
+			//确认查询
+			searchList() {
+				this.query = {
+					statDateStart: this.timeRange.length > 0 ? this.timeRange[0] : '',
+					statDateEnd: this.timeRange.length > 0 ? this.timeRange[1] : '',
+					statPeriod: this.index != '' && this.index > -1 ? this.array[this.index].dictValue : ''
+				};
+				this.data = [];
+				this.current = 0;
+				this.hasMore = true;
+				this.$refs.popup.close();
+				this.loadMore();
+			},
+			//重置搜索
+			searchReset() {
+				this.timeRange = [];
+				this.query = {
+					statDateStart: '',
+					statDateEnd: '',
+					statPeriod: ''
+				};
+				this.index = '';
+			},
+			//查询
+			showSearch() {
+				this.$refs.popup.open('bottom');
+			},
+			//时段
+			queryTime() {
+				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse(
+					new Date()), {}, 'GET').then(res => {
+					this.array = res.data;
+				})
+			},
+			loadMore() {
+				if (this.hasMore) {
+					this.current = this.current + 1;
+					this.status = 'loading';
+					let params = '';
+					Object.keys(this.query).map(key => {
+						params = params + '&' + key + '=' + this.query[key]
+					})
+					this.$request(getApp().globalData.baseUrl + '/api/biz/airportRunSituation/list?page=' + this.current +
+						'&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => {
+						if (res.code == 200) {
+							this.data = this.data.concat(res.data.list);
+							if (res.data.list.length == 0 || res.data.totalCount < this.size) {
+								this.hasMore = false;
+								this.status = 'nomore';
+							} else {
+								this.status = 'more';
+							}
+							uni.stopPullDownRefresh();
+						} else {
+							this.status = 'more';
+							uni.stopPullDownRefresh();
+						}
+					}).catch(() => {
+						this.status = 'more';
+						uni.stopPullDownRefresh();
+					})
+				}
+			},
+			//页面跳转
+			goPage(url, param) {
+				if (param) {
+					uni.navigateTo({
+						url: url + '?item=' + JSON.stringify(param)
+					})
+				} else {
+					uni.navigateTo({
+						url: url
+					})
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		padding: 30rpx 30rpx 195rpx;
+	}
+
+	.list_box {
+		background-color: #fff;
+		border-radius: 30rpx;
+		margin-bottom: 30rpx;
+		padding: 30rpx;
+
+		.list_top {
+			display: flex;
+
+			.unit_tags {
+				height: 37rpx;
+				line-height: 37rpx;
+				color: #E37616;
+				font-size: 20rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				background: #FFF7E4;
+				border-radius: 10rpx;
+				border: 1rpx solid #EF9A4F;
+				padding: 0 11rpx;
+				margin-right: 16rpx;
+			}
+
+			.unit_name {
+				color: #333333;
+				font-size: 30rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				line-height: 48rpx;
+				margin-left: 20rpx;
+				word-break: break-all;
+			}
+		}
+
+		.report_time {
+			color: #999999;
+			font-size: 24rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			line-height: 48rpx;
+			text-align: center;
+			margin-bottom: 30rpx;
+		}
+
+		.list_item_box {
+			padding: 30rpx 30rpx 0;
+			background: #F8F8F8;
+			border-radius: 30rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.list_item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 0 30rpx;
+
+			.list_item_label {
+				width: 320rpx;
+				color: #666666;
+				font-size: 26rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				line-height: 48rpx;
+			}
+
+			.list_item_cnt {
+				flex: 1;
+				color: #333333;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				line-height: 48rpx;
+				text-align: right;
+				margin-left: 20rpx;
+				word-break: break-all;
+			}
+		}
+
+		.list_item_shouqi {
+			color: #2D8CF0;
+			font-size: 24rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			text-align: center;
+			line-height: 33rpx;
+			padding-bottom: 30rpx;
+
+			.txt {
+				margin-left: 12rpx;
+			}
+		}
+
+		.act_btn_box {
+			display: flex;
+			flex-direction: row-reverse;
+			margin: 10rpx 0;
+
+			.act_btn {
+				width: 180rpx;
+				color: #666666;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				line-height: 70rpx;
+				background: #FFFFFF;
+				border-radius: 100rpx;
+				border: 1rpx solid #C1C1C1;
+				text-align: center;
+
+				&.blue {
+					color: #fff;
+					background: #2D8CF0;
+					border-color: #2D8CF0;
+				}
+			}
+		}
+	}
+
+	.foot_btn_box {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		display: flex;
+		// justify-content: space-around;
+		background-color: #F8F8F8;
+		padding: 20rpx 30rpx;
+
+		.act_btn {
+			width: 690rpx;
+			height: 90rpx;
+			line-height: 88rpx;
+			display: flex;
+			justify-content: center;
+			color: #FFFFFF;
+			font-size: 28rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			background: #2D8CF0;
+			border-radius: 100rpx;
+			border: 1rpx solid #2D8CF0;
+
+			.txt {
+				margin-left: 9rpx;
+			}
+
+			&.btn1 {
+				color: #2D8CF0;
+				background: #F6F6F6;
+			}
+		}
+	}
+
+	.pop_box {
+		border-radius: 30rpx 30rpx 0 0;
+		background-color: #fff;
+		padding: 30rpx;
+
+		.pop_title {
+			color: #333333;
+			font-size: 32rpx;
+			font-family: PingFang SC-Bold, PingFang SC;
+			font-weight: bold;
+			line-height: 45rpx;
+			text-align: center;
+			margin: 20rpx 0;
+
+			.pop_close {
+				float: right;
+			}
+		}
+
+		.popup-content {
+			// display: flex;
+			// flex-direction: column;
+
+			.cont_tit {
+				width: 100%;
+				color: #333333;
+				font-size: 26rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				line-height: 37rpx;
+				display: flex;
+				margin-bottom: 40rpx;
+
+				&.picker {
+					display: flex;
+					justify-content: space-between;
+					margin: 60rpx 0;
+
+					.picker_select {
+						color: #D4D4D4;
+						font-size: 28rpx;
+						font-family: PingFang SC-Regular, PingFang SC;
+						font-weight: 400;
+						text-align: right;
+					}
+				}
+			}
+
+			.time_box {
+				width: 690rpx;
+				margin: 0 auto;
+
+				/deep/ .uni-date-x--border {
+					border-radius: 30rpx;
+
+					.uni-date-x {
+						background: transparent;
+
+						.icon-calendar {
+							padding-left: 20rpx;
+						}
+					}
+				}
+
+				/deep/ .uni-date-editor--x .uni-date__icon-clear {
+					padding-right: 20rpx;
+				}
+			}
+
+			.picker_box {
+				width: 690rpx;
+				margin: 0 auto;
+
+				/deep/.input-value-border {
+					border-radius: 30rpx;
+				}
+			}
+		}
+
+		.btn_box {
+			width: 100%;
+			height: 120rpx;
+			display: flex;
+			margin-top: 20px;
+			align-items: center;
+			justify-content: space-between;
+
+			.btn {
+				width: 290rpx;
+				height: 90rpx;
+				background: #FFFFFF;
+				border-radius: 100rpx;
+				border: 1rpx solid #C1C1C1;
+				color: #666;
+				font-size: 28rpx;
+				line-height: 88rpx;
+				text-align: center;
+
+				&:last-child {
+					background: #2D8CF0;
+					color: #FFFFFF;
+					border-color: #2D8CF0;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/portShipping/internationalTransport/form.vue b/pages/portShipping/internationalTransport/form.vue
new file mode 100644
index 0000000..3214664
--- /dev/null
+++ b/pages/portShipping/internationalTransport/form.vue
@@ -0,0 +1,792 @@
+<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 picker">
+					<picker :value="railwayNameIndex" :range="stationList" @change="changeRailway">
+						<text class="picker_select"
+							:style="form.railwayName?'color:#333;':''">{{form.railwayName?form.railwayName:'请选择'}}</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 mode="date" :value="form.statDate" @change="bindDateChange">
+						<text class="picker_select"
+							:style="form.statDate?'color:#333;':''">{{form.statDate?form.statDate:'请选择'}}</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="array" range-key="dictLabel" @change="changeStatPeriod">
+						<text class="picker_select"
+							: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" style="margin-top: 30rpx;">
+			<!-- tab 切换 -->
+			<view class="tab_box">
+				<view class="tab_nav" :class="tabType == 1 ? 'active' : ''" @click="tabType = 1">客班轮</view>
+				<view class="tab_nav" :class="tabType == 2 ? 'active' : ''" @click="tabType = 2">国际邮轮</view>
+			</view>
+			<!-- 客班轮 -->
+			<view class="form_item_li" v-show="tabType == 1">
+				<view class="form_item"
+					style="display:flex; justify-content: space-between; font-size: 30rpx;color:#333;font-weight: bold;margin-top: 30rpx;">
+					运输数据
+					<uni-icons type="trash" color="red" @click="delRow(0)" size="18"></uni-icons>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">航线：</view>
+					<view class="form_item_input picker">
+						<picker :value="railwayNameIndex" :range="stationList" @change="changeRailway">
+							<text class="picker_select"
+								:style="form.railwayName?'color:#333;':''">{{form.railwayName?form.railwayName:'请选择'}}</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="railwayNameIndex" :range="stationList" @change="changeRailway">
+							<text class="picker_select"
+								:style="form.railwayName?'color:#333;':''">{{form.railwayName?form.railwayName:'请选择'}}</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">
+						<uni-easyinput @blur="calcYoyMom" @clear="calcYoyMom" v-model="form.inboundPassengersDo" type="number"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
+					</view>
+				</view>
+				<!-- 同比环比 -->
+				<view class="form_item_rate"
+					:class="form.inboundRailwayDo === 0 ? 'danger' : '' ">
+					<view class="rate_item">
+						<view class="rate_item_label"
+							:style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+							入青旅客人数环比</view>
+						<view class="rate_item_input"
+							:style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+							{{formatDigit(form.inRailwayYomDo)}}%
+						</view>
+					</view>
+					<view class="line"></view>
+					<view class="rate_item">
+						<view class="rate_item_label">入青旅客人数同比</view>
+						<view class="rate_item_input">
+							{{formatDigit(form.inRailwayMomDo)}}%
+						</view>
+					</view>
+				</view>
+				<view class="form_item_remark">
+					<view class="form_item_label">备注：</view>
+					<view class="form_item_input">
+						<uni-easyinput v-model="form.inMark"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入备注信息" type="textarea" maxlength="200"
+							autoHeight></uni-easyinput>
+					</view>
+				</view>
+				<view class="line"></view>
+			</view>
+
+			<!-- 国际邮轮 -->
+			<view class="form_item_li" v-show="tabType == 2">
+				<view class="form_item"
+					style="display:flex; justify-content: space-between; font-size: 30rpx;color:#333;font-weight: bold;margin-top: 30rpx;">
+					运输数据
+					<uni-icons type="trash" color="red" @click="delRow(0)" size="18"></uni-icons>
+				</view>
+				<view class="form_item">
+					<view class="form_item_label">航线：</view>
+					<view class="form_item_input picker">
+						<picker :value="railwayNameIndex" :range="stationList" @change="changeRailway">
+							<text class="picker_select"
+								:style="form.railwayName?'color:#333;':''">{{form.railwayName?form.railwayName:'请选择'}}</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="railwayNameIndex" :range="stationList" @change="changeRailway">
+							<text class="picker_select"
+								:style="form.railwayName?'color:#333;':''">{{form.railwayName?form.railwayName:'请选择'}}</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">
+						<uni-easyinput @blur="calcYoyMom" @clear="calcYoyMom" v-model="form.inboundPassengersDo" type="number"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
+					</view>
+				</view>
+				<!-- 同比环比 -->
+				<view class="form_item_rate"
+					:class="form.inboundRailwayDo === 0 ? 'danger' : '' ">
+					<view class="rate_item">
+						<view class="rate_item_label"
+							:style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+							入青旅客人数环比</view>
+						<view class="rate_item_input"
+							:style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+							{{formatDigit(form.inRailwayYomDo)}}%
+						</view>
+					</view>
+					<view class="line"></view>
+					<view class="rate_item">
+						<view class="rate_item_label">入青旅客人数同比</view>
+						<view class="rate_item_input">
+							{{formatDigit(form.inRailwayMomDo)}}%
+						</view>
+					</view>
+				</view>
+				<view class="form_item_remark">
+					<view class="form_item_label">备注：</view>
+					<view class="form_item_input">
+						<uni-easyinput v-model="form.outMark"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入备注信息" type="textarea" maxlength="200"
+							autoHeight></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">{{btnText}}</view>
+		</view>
+	</view>
+</template>
+<script>
+	import {
+		getDateStr,
+		checkNotEmpty
+	} from "../../../common/util.js"
+	export default {
+		data() {
+			return {
+				form: {
+					"inMark": "",
+					"inPepole": '',
+					"inPepoleMomDo": '',
+					"inPepoleYoyDo": '',
+					"inRailwayMomDo": '',
+					"inRailwayYomDo": '',
+					"inboundPassengersDo": '',
+					"inboundRailwayDo": '',
+					"isHoliday": "",
+					"outMark": "",
+					"outPepole": '',
+					"outPepoleMomDo": '',
+					"outPepoleYoyDo": '',
+					"outRailwayMomDo": '',
+					"outRailwayYomDo": '',
+					"outboundPassengersDo": '',
+					"outboundRailwayDo": '',
+					"railwayName": "",
+					"statDate": "",
+					"statPeriod": ""
+				}, //登录form
+				stationList: [], //车站列表
+				railwayNameIndex: '',
+				submitPerson: [], //报送人
+				submitPersonIndex: -1, //报送人选择索引
+				array: [], //时段选择列表
+				index: 2, //时段选择,默认0-24
+				userInfo: {},
+				pageType: '',
+				btnText: '保存',
+				tabType: 1
+			}
+		},
+		onLoad(options) {
+			this.userInfo = uni.getStorageSync('userInfo');
+			this.queryStation(); //车展名称列表
+			if (options.type == 'add') {
+				this.pageType = 'add';
+				let now = new Date();
+				this.form.statDate = getDateStr(now, -1); //默认前一天
+				this.queryTime(); //统计时段
+			} else if (options.id) {
+				this.btnText = '修改并保存';
+				this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/find/' + options.id, {}, "GET").then(
+					res => {
+						this.form = res.data;
+						this.queryTime(); //统计时段
+					});
+			}
+		},
+		methods: {
+			//增行
+			addRow() {},
+			//删除
+			deleteRow(index) {},
+			//只保留两位小数
+			formatDigit(data) {
+				return !checkNotEmpty(data) ? '--' : (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data;
+			},
+			//环比同比
+			queryYoyMom() {
+				if (this.form.statDate == '' || this.form.statPeriod == '') {
+					return;
+				}
+				// let _date = getDateStr(new Date(this.form.statDate), -1);
+				this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getYoYMoM?statDate=' + this.form
+						.statDate + '&statPeriod=' + this.form.statPeriod + '&_t=' + Date.parse(new Date()), {}, 'GET')
+					.then(res => {
+						this.yoyMom = res.data;
+						this.calcYoyMom(); //同步更新环比同比
+					})
+			},
+			//环比同比计算
+			calcYoyMom() {
+				console.log('同比环比计算')
+				this.form.inRailwayYomDo = this.$calcMom(this.form.inRailwayYomDo,this.yoyMom.yesterdayData.inboundRailwayDo);
+				this.form.inPepoleYoyDo = this.$calcMom(this.form.inPepole,this.yoyMom.yesterdayData.inPepole);
+				this.form.outRailwayYomDo = this.$calcMom(this.form.outboundRailwayDo,this.yoyMom.yesterdayData.outboundRailwayDo);
+				this.form.outPepoleYoyDo = this.$calcMom(this.form.outPepole,this.yoyMom.yesterdayData.outPepole);
+				this.form.inRailwayMomDo = this.$calcYoy(this.form.inboundRailwayDo,this.yoyMom.lastYearData.inboundRailwayDo);
+				this.form.inPepoleMomDo = this.$calcYoy(this.form.inPepole,this.yoyMom.lastYearData.inPepole);
+				this.form.outRailwayMomDo = this.$calcYoy(this.form.outboundRailwayDo,this.yoyMom.lastYearData.outboundRailwayDo);
+				this.form.outPepoleMomDo = this.$calcYoy(this.form.outPepole,this.yoyMom.lastYearData.outPepole);
+				return;
+				if (this.yoyMom.yesterdayData) {
+					//环比
+					if (checkNotEmpty(this.form.inboundRailwayDo)) {
+						this.form.inRailwayYomDo = !checkNotEmpty(this.yoyMom.yesterdayData.inboundRailwayDo) || this
+							.yoyMom.yesterdayData.inboundRailwayDo === 0 ? 100 : (
+								parseInt(this.form.inboundRailwayDo) - this.yoyMom.yesterdayData.inboundRailwayDo) / this
+							.yoyMom.yesterdayData.inboundRailwayDo * 100;
+					}else{
+						this.form.inRailwayYomDo = '';
+					}
+					if (this.form.inPepole) {
+						this.form.inPepoleYoyDo = !checkNotEmpty(this.yoyMom.yesterdayData.inPepole) || this.yoyMom
+							.yesterdayData.inPepole === 0 ? 100 : (parseInt(this
+								.form.inPepole) - this.yoyMom.yesterdayData.inPepole) / this.yoyMom.yesterdayData
+							.inPepole *
+							100;
+					}else{
+						this.form.inPepoleYoyDo = '';
+					}
+					if (checkNotEmpty(this.form.outboundRailwayDo)) {
+						this.form.outRailwayYomDo = !checkNotEmpty(this.yoyMom.yesterdayData.outboundRailwayDo) || this
+							.yoyMom.yesterdayData.outboundRailwayDo === 0 ? 100 : (parseInt(this.form.outboundRailwayDo) -
+								this.yoyMom.yesterdayData
+								.outboundRailwayDo) / this.yoyMom.yesterdayData.outboundRailwayDo * 100;
+					}else{
+						this.form.outRailwayYomDo = '';
+					}
+					if (checkNotEmpty(this.form.outPepole)) {
+						this.form.outPepoleYoyDo = !checkNotEmpty(this.yoyMom.yesterdayData.outPepole) || this.yoyMom
+							.yesterdayData.outPepole === 0 ? 100 : (parseInt(this
+								.form.outPepole) - this.yoyMom.yesterdayData.outPepole) / this.yoyMom.yesterdayData
+							.outPepole *
+							100;
+					}else{
+						this.form.outPepoleYoyDo = '';
+					}
+				}
+				if (this.yoyMom.lastYearData) {
+					//同比
+					if (checkNotEmpty(this.form.inboundRailwayDo)) {
+						this.form.inRailwayMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inboundRailwayDo) || this.yoyMom
+							.lastYearData.inboundRailwayDo === 0 ? 100 : (
+								parseInt(this.form.inboundRailwayDo) - this.yoyMom.lastYearData.inboundRailwayDo) / this
+							.yoyMom
+							.lastYearData.inboundRailwayDo * 100;
+					}else{
+						this.form.inRailwayMomDo = '';
+					}
+
+					if (checkNotEmpty(this.form.inPepole)) {
+						this.form.inPepoleMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inPepole) || this.yoyMom
+							.lastYearData
+							.inPepole === 0 ? 100 : (parseInt(this.form
+								.inPepole) - this.yoyMom.lastYearData.inPepole) / this.yoyMom.lastYearData.inPepole * 100;
+					}else{
+						this.form.inPepoleMomDo = '';
+					}
+
+					if (checkNotEmpty(this.form.outboundRailwayDo)) {
+						this.form.outRailwayMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outboundRailwayDo) || this
+							.yoyMom
+							.lastYearData.outboundRailwayDo === 0 ? 100 :
+							(parseInt(this.form.outboundRailwayDo) - this.yoyMom.lastYearData.outboundRailwayDo) / this
+							.yoyMom
+							.lastYearData.outboundRailwayDo * 100;
+					}else{
+						this.form.outRailwayMomDo = '';
+					}
+
+					if (checkNotEmpty(this.form.outPepole)) {
+						this.form.outPepoleMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outPepole) || this.yoyMom
+							.lastYearData.outPepole === 0 ? 100 : (parseInt(this
+								.form.outPepole) - this.yoyMom.lastYearData.outPepole) / this.yoyMom.lastYearData
+							.outPepole *
+							100;
+					}else{
+						this.form.outPepoleMomDo = '';
+					}
+
+				}
+			},
+			//车站权限列表
+			queryStation() {
+				this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getCurrentSite?_t=' + Date.parse(
+					new Date()), {}, 'GET').then(res => {
+					this.stationList = res.data;
+					if (this.pageType == 'add') {
+						this.form.railwayName = res.data[0];
+						this.railwayNameIndex = 0;
+					}
+				})
+			},
+			//车站选择
+			changeRailway(e) {
+				this.railwayNameIndex = e.detail.value;
+				this.form.railwayName = this.stationList[e.detail.value];
+			},
+			//统计时段切换选择
+			changeStatPeriod(e) {
+				this.index = e.detail.value;
+				this.form.statPeriod = this.array[e.detail.value].dictValue;
+				console.log('change 时段', this.form);
+				this.queryYoyMom();
+			},
+			//取消
+			doCancel() {
+				uni.navigateBack();
+			},
+			//选择统计日期
+			bindDateChange(e) {
+				this.form.statDate = e.detail.value;
+				this.queryYoyMom();
+			},
+			//时段
+			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 : '';
+					}
+					this.queryYoyMom(); //同比环比
+				})
+			},
+			//确认提交
+			doSubmit() {
+				if (!checkNotEmpty(this.form.railwayName)) {
+					uni.showToast({
+						title: '车站名称不能为空',
+						icon: 'none'
+					})
+					return;
+				}
+				if (!checkNotEmpty(this.form.statDate) || !checkNotEmpty(this.form.statPeriod)) {
+					uni.showToast({
+						title: '报送日期和时段不能为空',
+						icon: 'none'
+					})
+					return;
+				}
+				if (!checkNotEmpty(this.form.inboundRailwayDo) || !checkNotEmpty(this.form.inboundPassengersDo) || !
+					checkNotEmpty(this.form.inPepole)) {
+					uni.showToast({
+						title: '入青终到车次、过站车次、人数不能为空',
+						icon: 'none'
+					})
+					return;
+				}
+				if (!checkNotEmpty(this.form.outboundRailwayDo) || !checkNotEmpty(this.form.outboundPassengersDo) || !
+					checkNotEmpty(this.form.outPepole)) {
+					uni.showToast({
+						title: '出青终到车次、过站车次、人数不能为空',
+						icon: 'none'
+					})
+					return;
+				}
+				// if (this.form.inPepole == this.yoyMom.yesterdayData.inPepole && this.form.inMark) {
+				// 	uni.showToast({
+				// 		title: '入青备注不能为空',
+				// 		icon: 'none'
+				// 	})
+				// 	return;
+				// }
+				// if (this.form.outPepole == this.yoyMom.yesterdayData.outPepole && this.form.outRemark) {
+				// 	uni.showToast({
+				// 		title: '出青备注不能为空',
+				// 		icon: 'none'
+				// 	})
+				// 	return;
+				// }
+				uni.showModal({
+					title: '提示',
+					content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
+					success: (res) => {
+						if (res.confirm) {
+							this.submitForm();
+						}
+					}
+				})
+			},
+			submitForm() {
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				})
+				this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/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/railway/railwayRunData/list'
+										})
+									}, 300)
+								} else {
+									uni.navigateBack();
+								}
+							}
+						})
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				})
+			},
+		}
+	}
+</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;
+
+			//环比同比
+			.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: 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;
+						// }
+
+						.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 {
+								height: 35rpx !important;
+								text-align: right;
+							}
+						}
+
+						/deep/ .uni-date-x--border {
+							border: 0 !important;
+
+							.uni-date__x-input {
+								// height: 35rpx !important;
+								text-align: right;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//收费站
+	.station_box {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 40rpx;
+
+		.station_item {
+			height: 60rpx;
+			color: #666666;
+			line-height: 60rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			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;
+					background: #1ECE5F;
+					border-radius: 0rpx 20rpx 0rpx 5rpx;
+					text-align: center;
+				}
+			}
+		}
+	}
+
+	.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: 690rpx;
+			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;
+			}
+		}
+	}
+
+	//增行
+	.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>
diff --git a/pages/portShipping/internationalTransport/list.vue b/pages/portShipping/internationalTransport/list.vue
new file mode 100644
index 0000000..7669ffe
--- /dev/null
+++ b/pages/portShipping/internationalTransport/list.vue
@@ -0,0 +1,445 @@
+<template>
+	<view class="page">
+		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/portShipping/internationalTransport/form?id='+item.id)">
+			<view class="list_top">
+				<view class="unit_tags">报送时间</view>
+				<view class="unit_name">{{item.statDate || ''}}<text
+					style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view>
+			</view>
+		</view>
+		<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
+			:contentText="contentText"></uni-load-more>
+		<!-- 筛选 -->
+		<view class="foot_btn_box">
+			<!-- <view @click="goPage('/pages/highway/runStatusData/form?type=add')" class="act_btn"><uni-icons type="plusempty"
+					size="18" color="#fff" style="margin-right: 9rpx;"></uni-icons>新建</view> -->
+			<view @click="showSearch" class="act_btn btn1"><uni-icons type="search" size="18" color="#2D8CF0"
+					style="margin-right: 9rpx;"></uni-icons>查询
+			</view>
+		</view>
+		<!-- 筛选 -->
+		<uni-popup ref="popup" style="width: 100%;" background-color="none">
+			<view class="pop_box">
+				<view class="pop_title">
+					查询条件
+					<uni-icons type="closeempty" size="18" color="#666" class="pop_close"></uni-icons>
+				</view>
+				<view class="popup-content">
+					<view class="cont_tit">
+						统计起止时间
+					</view>
+					<view class="time_box">
+						<uni-datetime-picker v-model="timeRange" type="daterange" />
+					</view>
+					<view class="cont_tit picker">
+						<view>统计时段</view>
+						<view class="picker_select">
+							<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
+								<text class="unselect_txt"
+									:style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
+								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+							</picker>
+						</view>
+					</view>
+				</view>
+				<view class="btn_box">
+					<p class="btn" @click="searchReset">重置</p>
+					<p class="btn" @click="searchList">确认</p>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				data: [],
+				current: 0,
+				size: 10,
+				hasMore: true,
+				status: '',
+				query: {
+					statDateStart: '',
+					statDateEnd: '',
+					statPeriod: ''
+				},
+				contentText: {
+					contentdown: "点击查看更多",
+					contentrefresh: "正在加载...",
+					contentnomore: "没有更多数据了",
+				},
+				timeRange: [], //查询起止日期
+				array: [], //时段选择列表
+				index: '', //时段选择
+			}
+		},
+		onLoad() {
+			this.queryTime();
+			this.loadMore();
+		},
+		onUnload() {
+			this.hasMore = true;
+			this.data = [];
+		},
+		onPullDownRefresh() {
+			console.log('onPullDownRefresh');
+			this.data = [];
+			this.current = 0;
+			this.hasMore = true;
+			this.loadMore();
+		},
+		methods: {
+			//折叠
+			showDetail(index1, index2, flag) {
+				this.data[index1].highwaySubDataList[index2].show = flag;
+			},
+			//搜索时段选择
+			bindPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.index = e.detail.value
+			},
+			//确认查询
+			searchList() {
+				this.query = {
+					statDateStart: this.timeRange.length > 0 ? this.timeRange[0] : '',
+					statDateEnd: this.timeRange.length > 0 ? this.timeRange[1] : '',
+					statPeriod: this.index != '' && this.index > -1 ? this.array[this.index].dictValue : ''
+				};
+				this.data = [];
+				this.current = 0;
+				this.hasMore = true;
+				this.$refs.popup.close();
+				this.loadMore();
+			},
+			//重置搜索
+			searchReset() {
+				this.timeRange = [];
+				this.query = {
+					statDateStart: '',
+					statDateEnd: '',
+					statPeriod: ''
+				};
+				this.index = '';
+			},
+			//查询
+			showSearch() {
+				this.$refs.popup.open('bottom');
+			},
+			//时段
+			queryTime() {
+				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse(
+					new Date()), {}, 'GET').then(res => {
+					this.array = res.data;
+				})
+			},
+			loadMore() {
+				if (this.hasMore) {
+					this.current = this.current + 1;
+					this.status = 'loading';
+					let params = '';
+					Object.keys(this.query).map(key => {
+						params = params + '&' + key + '=' + this.query[key]
+					})
+					this.$request(getApp().globalData.baseUrl + '/api/biz/highSpeedOperationController/list?page=' + this.current +
+						'&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => {
+						if (res.code == 200) {
+							this.data = this.data.concat(res.data.list);
+							if (res.data.list.length == 0 || res.data.totalCount < this.size) {
+								this.hasMore = false;
+								this.status = 'nomore';
+							} else {
+								this.status = 'more';
+							}
+							uni.stopPullDownRefresh();
+						} else {
+							this.status = 'more';
+							uni.stopPullDownRefresh();
+						}
+					}).catch(() => {
+						this.status = 'more';
+						uni.stopPullDownRefresh();
+					})
+				}
+			},
+			//页面跳转
+			goPage(url, param) {
+				if (param) {
+					uni.navigateTo({
+						url: url + '?item=' + JSON.stringify(param)
+					})
+				} else {
+					uni.navigateTo({
+						url: url
+					})
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		padding: 30rpx 30rpx 195rpx;
+	}
+
+	.list_box {
+		background-color: #fff;
+		border-radius: 30rpx;
+		margin-bottom: 30rpx;
+		padding: 30rpx;
+
+		.list_top {
+			display: flex;
+
+			.unit_tags {
+				height: 37rpx;
+				line-height: 37rpx;
+				color: #E37616;
+				font-size: 20rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				background: #FFF7E4;
+				border-radius: 10rpx;
+				border: 1rpx solid #EF9A4F;
+				padding: 0 11rpx;
+				margin-right: 16rpx;
+			}
+
+			.unit_name {
+				color: #333333;
+				font-size: 30rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				line-height: 48rpx;
+				margin-left: 20rpx;
+				word-break: break-all;
+			}
+		}
+
+		.report_time {
+			color: #999999;
+			font-size: 24rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			line-height: 48rpx;
+			text-align: center;
+			margin-bottom: 30rpx;
+		}
+
+		.list_item_box {
+			padding: 30rpx 30rpx 0;
+			background: #F8F8F8;
+			border-radius: 30rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.list_item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 0 30rpx;
+
+			.list_item_label {
+				width: 240rpx;
+				color: #666666;
+				font-size: 26rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				line-height: 48rpx;
+			}
+
+			.list_item_cnt {
+				flex: 1;
+				color: #333333;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				line-height: 48rpx;
+				text-align: right;
+				margin-left: 20rpx;
+				word-break: break-all;
+			}
+		}
+
+		.list_item_shouqi {
+			color: #2D8CF0;
+			font-size: 24rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			text-align: center;
+			line-height: 33rpx;
+			padding-bottom: 30rpx;
+
+			.txt {
+				margin-left: 12rpx;
+			}
+		}
+
+		.act_btn_box {
+			display: flex;
+			flex-direction: row-reverse;
+			margin: 10rpx 0;
+
+			.act_btn {
+				width: 180rpx;
+				color: #666666;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				line-height: 70rpx;
+				background: #FFFFFF;
+				border-radius: 100rpx;
+				border: 1rpx solid #C1C1C1;
+				text-align: center;
+
+				&.blue {
+					color: #fff;
+					background: #2D8CF0;
+					border-color: #2D8CF0;
+				}
+			}
+		}
+	}
+
+	.foot_btn_box {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #F8F8F8;
+		padding: 20px 30rpx;
+
+		.act_btn {
+			width: 690rpx;
+			height: 90rpx;
+			line-height: 88rpx;
+			display: flex;
+			justify-content: center;
+			color: #FFFFFF;
+			font-size: 28rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			background: #2D8CF0;
+			border-radius: 100rpx;
+			border: 1rpx solid #2D8CF0;
+
+			.txt {
+				margin-left: 9rpx;
+			}
+
+			&.btn1 {
+				color: #2D8CF0;
+				background: #F6F6F6;
+			}
+		}
+	}
+
+	.pop_box {
+		border-radius: 30rpx 30rpx 0 0;
+		background-color: #fff;
+		padding: 30rpx;
+
+		.pop_title {
+			color: #333333;
+			font-size: 32rpx;
+			font-family: PingFang SC-Bold, PingFang SC;
+			font-weight: bold;
+			line-height: 45rpx;
+			text-align: center;
+			margin: 20rpx 0;
+
+			.pop_close {
+				float: right;
+			}
+		}
+
+		.popup-content {
+			// display: flex;
+			// flex-direction: column;
+
+			.cont_tit {
+				width: 100%;
+				color: #333333;
+				font-size: 26rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				line-height: 37rpx;
+				display: flex;
+				margin-bottom: 40rpx;
+
+				&.picker {
+					display: flex;
+					justify-content: space-between;
+					margin: 60rpx 0;
+
+					.picker_select {
+						color: #D4D4D4;
+						font-size: 28rpx;
+						font-family: PingFang SC-Regular, PingFang SC;
+						font-weight: 400;
+						text-align: right;
+					}
+				}
+			}
+
+			.time_box {
+				width: 690rpx;
+				margin: 0 auto;
+
+				/deep/ .uni-date-x--border {
+					border-radius: 30rpx;
+
+					.uni-date-x {
+						background: transparent;
+
+						.icon-calendar {
+							padding-left: 20rpx;
+						}
+					}
+				}
+
+				/deep/ .uni-date-editor--x .uni-date__icon-clear {
+					padding-right: 20rpx;
+				}
+			}
+
+			.picker_box {
+				width: 690rpx;
+				margin: 0 auto;
+
+				/deep/.input-value-border {
+					border-radius: 30rpx;
+				}
+			}
+		}
+
+		.btn_box {
+			width: 100%;
+			height: 120rpx;
+			display: flex;
+			margin-top: 20px;
+			align-items: center;
+			justify-content: space-between;
+
+			.btn {
+				width: 290rpx;
+				height: 90rpx;
+				background: #FFFFFF;
+				border-radius: 100rpx;
+				border: 1rpx solid #C1C1C1;
+				color: #666;
+				font-size: 28rpx;
+				line-height: 88rpx;
+				text-align: center;
+
+				&:last-child {
+					background: #2D8CF0;
+					color: #FFFFFF;
+					border-color: #2D8CF0;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/water/waterWay/form.vue b/pages/water/waterWay/form.vue
index 4133ee8..1cc72b6 100644
--- a/pages/water/waterWay/form.vue
+++ b/pages/water/waterWay/form.vue
@@ -213,7 +213,7 @@
 			},
 			//陆岛列表
 			queryLandList() {
-				this.$request(getApp().globalData.baseUrl + '/api/biz/bizWaterwayIslandAuthority/list', {}, 'GET').then(res => {
+				this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getByCurrentUserId', {}, 'GET').then(res => {
 					this.landList = res.data;
 					if (this.pageType == 'add') {
 						this.landList.map(item => {