高速运行情况

manifest.json

@@ -103,7 +103,7 @@
     },
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx9ea045523e5cbb02",
         "setting" : {
             "urlCheck" : false
         },

pages/highWay/runData/form.vue

@@ -155,9 +155,10 @@
 			if (!options.type || options.type == 'add') {
 				let now =  new Date();
 				this.form.statDate = getDateStr(now, -1);//默认前一天
-				this.queryStation();
+				this.queryStation('add');
 			} else if (options.item) {
-				this.form = JSON.parse(options.item)
+				this.form = JSON.parse(options.item);
+				this.queryStation();
 			}
 			this.queryTime();//统计时段
 		},
@@ -172,30 +173,60 @@
 				this.stationIndex = index;
 			},
 			//收费站列表
-			queryStation() {
+			queryStation(type) {
 				this.$request(getApp().globalData.baseUrl + '/api/biz/HighSpeedPermissionsInfo/findList?_t=' + Date.parse(
 					new Date()), {}, 'GET').then(res => {
 					this.highwaySubDataList = res.data;
-					this.highwaySubDataList.map(item => {
-						this.form.highwaySubDataList.push({
-							"entranceVehicleCount": '',
-							"entranceVehicleCountMom": 0.0,
-							"entranceVehicleCountYoy": 0.0,
-							"exitToll": 0.0,
-							"exitVehicleCount": '',
-							"exitVehicleCountMom": 0.0,
-							"exitVehicleCountYoy": 0.0,
-							"highwayId": item.highWayLineCode,
-							"highwayName": item.highWayLineName,
-							"submitPersonnelContact": this.userInfo.realName+','+this.userInfo.tel,
-							"tollExemptAmount": 0.0,
-							"tollExemptVehicleCount": 0,
-							"tollExemptVehicleCountMom": 0.0,
-							"tollExemptVehicleCountYoy": 0.0,
-							"tollStationName": item.stationName,
-							"remark": ''
+					if(type == 'add') {
+						this.highwaySubDataList.map(item => {
+							this.form.highwaySubDataList.push({
+								"entranceVehicleCount": '',
+								"entranceVehicleCountMom": 0.0,
+								"entranceVehicleCountYoy": 0.0,
+								"exitToll": 0.0,
+								"exitVehicleCount": '',
+								"exitVehicleCountMom": 0.0,
+								"exitVehicleCountYoy": 0.0,
+								"highwayId": item.highWayLineCode,
+								"highwayName": item.highWayLineName,
+								"submitPersonnelContact": this.userInfo.realName+','+this.userInfo.tel,
+								"tollExemptAmount": 0.0,
+								"tollExemptVehicleCount": 0,
+								"tollExemptVehicleCountMom": 0.0,
+								"tollExemptVehicleCountYoy": 0.0,
+								"tollStationName": item.stationName,
+								"remark": ''
+							})
 						})
-					})
+					}else{
+						this.highwaySubDataList.map(item => {
+							let idx = this.form.highwaySubDataList.findIndex(item2 => {
+								return item2.highwayId == item.highWayLineCode && item2.tollStationName == item.stationName;
+							})
+							if(idx > -1){
+								this.form.highwaySubDataList.push(this.form.highwaySubDataList[idx]);
+							}else{
+								this.form.highwaySubDataList.push({
+									"entranceVehicleCount": '',
+									"entranceVehicleCountMom": 0.0,
+									"entranceVehicleCountYoy": 0.0,
+									"exitToll": 0.0,
+									"exitVehicleCount": '',
+									"exitVehicleCountMom": 0.0,
+									"exitVehicleCountYoy": 0.0,
+									"highwayId": item.highWayLineCode,
+									"highwayName": item.highWayLineName,
+									"submitPersonnelContact": this.userInfo.realName+','+this.userInfo.tel,
+									"tollExemptAmount": 0.0,
+									"tollExemptVehicleCount": 0,
+									"tollExemptVehicleCountMom": 0.0,
+									"tollExemptVehicleCountYoy": 0.0,
+									"tollStationName": item.stationName,
+									"remark": ''
+								})
+							}
+						})
+					}
 				})
 			},
 			//取消

pages/highWay/runData/list.vue

@@ -117,7 +117,7 @@
 				},
 				timeRange: [], //查询起止日期
 				array: [], //时段选择列表
-				index: -1, //时段选择
+				index: '', //时段选择
 			}
 		},
 		onLoad() {

pages/highWay/runStatusData/detail.vue

@@ -14,6 +14,18 @@
 					<view class="all_left">高速开闭情况：</view>
 					<view class="all_right">{{ roadData.isOpen == 1 ? '开放' : '关闭' }}</view>
 				</view>
+				<view class="all_item">
+					<view class="all_left">已处理事故数量：</view>
+					<view class="all_right">
+						{{roadData.count1}}
+					</view>
+				</view>
+				<view class="all_item">
+					<view class="all_left">正在处理事故数量：</view>
+					<view class="all_right">
+						{{roadData.count2}}
+					</view>
+				</view>
 				<view class="all_item">
 					<view class="all_left">事故数量：</view>
 					<view class="all_right">

pages/highWay/runStatusData/form.vue

@@ -16,7 +16,7 @@
 				<view class="form_item_label">统计日期：</view>
 				<view class="form_item_input picker">
 					<picker mode="date" :value="form.statDate" @change="bindDateChange">
-						<text class="unselect_txt"
+						<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>
@@ -25,8 +25,8 @@
 			<view class="form_item">
 				<view class="form_item_label">统计时段：</view>
 				<view class="form_item_input picker">
-					<picker :value="index" :range="array" range-key="dictLabel">
-						<text class="unselect_txt"
+					<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>
@@ -35,9 +35,9 @@
 			<view class="form_item">
 				<view class="form_item_label">高速开闭情况：</view>
 				<view class="form_item_input form_input">
-					<picker :value="form.isOpen" :range="[{value:1,label:'开放'},{value:0,label:'关闭'}]" range-key="dictValue">
-						<text class="unselect_txt"
-							:style="form.isOpen > -1?'color:#333;':''">{{form.isOpen == 1 ? '开放' : form.isOpen === 0 ? '关闭' : '请选择'}}</text>
+					<picker :value="isOpenIndex" :range="isOpenArry" range-key="label" @change="changeIsOpen">
+						<text class="picker_select"
+							:style="isOpenIndex > -1?'color:#333;':''">{{form.isOpen == 1 ? '开放' : form.isOpen === 0 ? '关闭' : '请选择'}}</text>
 						<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 					</picker>
 				</view>
@@ -45,43 +45,41 @@
 			<view class="form_item">
 				<view class="form_item_label">已处理事故数量：</view>
 				<view class="form_item_input form_input">
-					<uni-easyinput v-model="item.count1" placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入"
+					<uni-easyinput v-model="form.count1" placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入"
 						type="number" maxlength="30"></uni-easyinput>
 				</view>
 			</view>
 			<view class="form_item">
 				<view class="form_item_label">正在处理事故数量：</view>
 				<view class="form_item_input form_input">
-					<uni-easyinput v-model="item.count2" placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入"
+					<uni-easyinput v-model="form.count2" placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入"
 						type="number" maxlength="30"></uni-easyinput>
 				</view>
 			</view>
 			<view class="form_item">
 				<view class="form_item_label">事故数量：</view>
 				<view class="form_item_input form_input">
-					<uni-easyinput v-model="item.accidentCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-						placeholder="请输入事故数量" type="number" maxlength="30"></uni-easyinput>
+					{{form.accidentCount}}
 				</view>
 			</view>
 			<view class="form_item">
 				<view class="form_item_label">拥堵数量：</view>
 				<view class="form_item_input form_input">
-					<uni-easyinput v-model="item.congestionCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-						placeholder="请输入拥堵数量" type="number" maxlength="30"></uni-easyinput>
+					{{form.congestionCount}}
 				</view>
 			</view>
 			<view class="form_item">
 				<view class="form_item_label">伤者人数：</view>
 				<view class="form_item_input form_input">
-					<uni-easyinput v-model="item.highwayName" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-						placeholder="请输入车辆数" type="number" maxlength="30"></uni-easyinput>
+					<uni-easyinput v-model="form.injuredCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+						placeholder="请输入" type="number" maxlength="30"></uni-easyinput>
 				</view>
 			</view>
 			<view class="form_item">
 				<view class="form_item_label">亡者人数：</view>
 				<view class="form_item_input form_input">
-					<uni-easyinput v-model="item.highwayName" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-						placeholder="请输入车辆数" type="number" maxlength="30"></uni-easyinput>
+					<uni-easyinput v-model="form.deceasedCount" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
+						placeholder="请输入" type="number" maxlength="30"></uni-easyinput>
 				</view>
 			</view>
 		</view>
@@ -94,109 +92,133 @@
 			<!-- 拥堵 -->
 			<view class="form_item_li" v-if="tabType == 1" v-for="(item,index) in form.highwayCongestionDetailDTOS"
 				:key="index">
-				<view class="form_item" style="font-size: 30rpx;color:#333;font-weight: bold;">
+				<view class="form_item" style="display:flex; justify-content: space-between; font-size: 30rpx;color:#333;font-weight: bold;margin-top: 30rpx;">
 					拥堵信息-{{index+1}}
+					<uni-icons type="trash" color="red" @click="delRow" size="18"></uni-icons>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">高速公路名称：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput v-model="item.highwayName" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入车辆数" type="number" maxlength="30"></uni-easyinput>
+					<view class="form_item_input picker">
+						<picker :value="item.highwayNameIndex" :range="highwayDataList" range-key="stdName" @change="e => changeHighway(e, 'highwayCongestionDetailDTOS', index)">
+							<text class="picker_select"
+								:style="item.highwayName?'color:#333;':''">{{item.highwayName ? item.highwayName : '请选择'}}</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-datetime-picker v-model="item.congestionStartTim"></uni-datetime-picker>
+					<view class="form_item_input picker">
+						<uni-datetime-picker v-model="item.congestionStartTime" :border="false">
+							<text class="picker_select"
+								:style="item.congestionStartTime?'color:#333;':''">{{item.congestionStartTime?item.congestionStartTime:'请选择'}}</text>
+							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+						</uni-datetime-picker>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">拥堵处理结束时间：</view>
-					<view class="form_item_input form_input">
-						<uni-datetime-picker v-model="item.congestionEndTime"></uni-datetime-picker>
+					<view class="form_item_input picker">
+						<uni-datetime-picker v-model="item.congestionEndTime" :border="false">
+							<text class="picker_select"
+								:style="item.congestionEndTime?'color:#333;':''">{{item.congestionEndTime?item.congestionEndTime:'请选择'}}</text>
+							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+						</uni-datetime-picker>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">发生位置：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.location" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">拥堵内容：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.congestionContent" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">阻断/拥堵持续时间：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.duration" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">截至当前拥堵空间范围(桩号及方向)：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.congestionRange" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">处置工作开展情况：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.disposalStatus" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
-				<view class="form_item_remark">
+				<view class="form_item">
 					<view class="form_item_label">补充说明：</view>
-					<view class="form_item_input">
+					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.additionalNotes" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入备注信息" type="textarea" maxlength="200" autoHeight></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="line"></view>
-				<view class="add_btn">增行</view>
 			</view>
+
 			<!-- 事故 -->
-			<view class="form_item_li" v-if="tabType == 1" v-for="(item,index) in form.highwayAccidentDetailVOS" :key="index">
-				<view class="form_item" style="font-size: 30rpx;color:#333;font-weight: bold;">
+			<view class="form_item_li" v-if="tabType == 2" v-for="(item,index) in form.highwayAccidentDetailDTOS" :key="index">
+				<view class="form_item" style="display:flex; justify-content: space-between;font-size: 30rpx;color:#333;font-weight: bold;margin-top: 30rpx;">
 					事故信息-{{index+1}}
+					<uni-icons type="trash" color="red" @click="delRow" size="18"></uni-icons>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">高速公路名称：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput v-model="item.highwayName" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入车辆数" type="number" maxlength="30"></uni-easyinput>
+					<view class="form_item_input picker">
+						<picker :value="item.highwayNameIndex" :range="highwayDataList" range-key="stdName" @change="e => changeHighway(e, 'highwayCongestionDetailDTOS', index)">
+							<text class="picker_select"
+								:style="item.highwayName?'color:#333;':''">{{item.highwayName ? item.highwayName : '请选择'}}</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-datetime-picker v-model="item.accidentStartTime"></uni-datetime-picker>
+					<view class="form_item_input picker">
+						<uni-datetime-picker v-model="item.accidentStartTime" :border="false">
+							<text class="picker_select"
+								:style="item.accidentStartTime?'color:#333;':''">{{item.accidentStartTime?item.accidentStartTime:'请选择'}}</text>
+							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+						</uni-datetime-picker>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">事故处理结束时间：</view>
-					<view class="form_item_input form_input">
-						<uni-datetime-picker v-model="item.accidentEndTime"></uni-datetime-picker>
+					<view class="form_item_input picker">
+						<uni-datetime-picker v-model="item.accidentEndTime" :border="false">
+							<text class="picker_select"
+								:style="item.accidentEndTime?'color:#333;':''">{{item.accidentEndTime?item.accidentEndTime:'请选择'}}</text>
+							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+						</uni-datetime-picker>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">发生位置：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.location" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">事故内容：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.congestionContent" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="form_item">
@@ -210,33 +232,33 @@
 					<view class="form_item_label">阻断/拥堵持续时间：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.duration" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">截至当前拥堵空间范围(桩号及方向)：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.congestionRange" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">处置工作开展情况：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.disposalStatus" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入金额" type="digit" maxlength="30"></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
-				<view class="form_item_remark">
+				<view class="form_item">
 					<view class="form_item_label">补充说明：</view>
-					<view class="form_item_input">
+					<view class="form_item_input form_input">
 						<uni-easyinput v-model="item.additionalNotes" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
-							placeholder="请输入备注信息" type="textarea" maxlength="200" autoHeight></uni-easyinput>
+							placeholder="请输入" maxlength="200"></uni-easyinput>
 					</view>
 				</view>
 				<view class="line"></view>
-				<view class="add_btn">增行</view>
 			</view>
+			<view class="add_btn" @click="addRow()">增行</view>
 
 		</view>
 		<!-- 底部按钮 -->
@@ -266,6 +288,7 @@
 						"congestionRange": "",
 						"disposalStatus": "",
 						"duration": "",
+						"higwayNameIndex": "",
 						"highwayName": "",
 						"location": "",
 					}],
@@ -277,64 +300,123 @@
 						"congestionStartTime": "",
 						"disposalStatus": "",
 						"duration": "",
+						"higwayNameIndex": "",
 						"highwayName": "",
 						"location": "",
 					}],
 					"injuredCount": 0,
-					"isOpen": 0,
+					"isOpen": 1,
 					"organizationName": "",
 					"statDate": "",
 					"statPeriod": ""
 				}, //登录form
-				highwaySubDataList: [], //收费站列表
-				stationIndex: 0, //收费站选中索引
+				highwayDataList: [], //高速列表
 				submitPerson: [], //报送人
 				submitPersonIndex: -1, //报送人选择索引
 				array: [], //时段选择列表
 				index: 2, //时段选择,默认0-24
+				isOpenArry: [{value:1,label:'开放'},{value:0,label:'关闭'}],//高速开闭情况
+				isOpenIndex: 0,
 				userInfo: {},
 				tabType: 1, //拥堵事故类型
 			}
 		},
 		onLoad(options) {
 			this.userInfo = uni.getStorageSync('userInfo');
-			if (!options.type || options.type == 'add') {
+			this.queryHighway();//高速公路列表
+			if (options.type == 'add') {
 				let now = new Date();
 				this.form.statDate = getDateStr(now, -1); //默认前一天
-				this.queryStation();
+				this.form.statPeriod = '03'; //默认0-24
 			} else if (options.item) {
-				this.form = JSON.parse(options.item)
+				this.form = JSON.parse(options.item);
+				this.form.highwayCongestionDetailDTOS = this.form.highwayCongestionDetailVOS;
+				this.form.highwayAccidentDetailDTOS = this.form.highwayAccidentDetailVOS;
+				console.log(this.form)
 			}
 			this.queryTime(); //统计时段
 		},
 		methods: {
-			//切换当前编辑收费站索引
-			changeStationIndex(index) {
-				if (this.form.highwaySubDataList[this.stationIndex].entranceVehicleCount != '' && this.form.highwaySubDataList[
-						this.stationIndex].exitVehicleCount != '') {
-					this.highwaySubDataList[this.stationIndex].isFinish = true;
-				} else {
-					this.highwaySubDataList[this.stationIndex].isFinish = false;
-				}
-				this.stationIndex = index;
+			//高速公路权限列表
+			queryHighway() {
+				this.highwayDataList = [{
+						"acctYear": 0,
+						"cdd": 0,
+						"createTime": "2016-06-12T16:47:50.992",
+						"createUnit": "4EB98423C0000041919F523B5D7A5CB1",
+						"createUserId": "AD049D34252E7C26A9B28DE393572C4B",
+						"creator": "青岛交通委员会管理员",
+						"dlwz": "",
+						"gldw": "青岛市高管处",
+						"glmc": "",
+						"gylc": 175.307,
+						"invalidTime": "9999-12-31T00:00:00",
+						"isLeaf": 1,
+						"jsdj": "540D47B620000001617BDD14C380A0D9",
+						"jsdw": "",
+						"jssj": "",
+						"jxscsd": 0,
+						"lddfmc": "",
+						"ldqdmc": "",
+						"ldqdzh": "",
+						"ldzdmc": "",
+						"ldzdzh": "",
+						"level": 1,
+						"ljlx": "",
+						"lkpddj": "",
+						"lmlx": "",
+						"lxqdmc": "",
+						"lxqdzh": "522.707",
+						"lxzdmc": "",
+						"lxzdzh": "698.014",
+						"memo": "",
+						"modifyTime": "2020-08-23T09:40:01.273",
+						"modifyUser": "admin",
+						"objectId": "5543CBB2C0000001F5F59149F1AF17CF",
+						"parents": "005543CBB2C0000001F5F59149F1AF17CF",
+						"recId": "5543CBB2C0000001F5F59149F1AF17CF",
+						"recVer": 8365710010537214000,
+						"resId": "5543CBB2C0000001F5F59149F1AF17CF",
+						"schemeId": "00000000000000000000000000000000",
+						"shareType": 0,
+						"shortName": "shgs",
+						"sjly": "",
+						"sjysnl": "",
+						"sortOrder": 21,
+						"ssdw": "",
+						"startFlag": 1,
+						"stdCode": "G15",
+						"stdIcon": "",
+						"stdName": "沈海高速",
+						"tcrq": null,
+						"unitId": "00000000000000000000000000000000",
+						"validTime": "1990-01-01T00:00:00",
+						"xxdx": "",
+						"xzdj": "540D4877C000000112D1F2C6DE6A1B49",
+						"xzqh": "",
+						"yhdw": "",
+						"zyds": 0
+				}]
+				// this.$request(getApp().globalData.baseUrl + '/api/biz/roadInfo/all?page=0&pageSize=-1&_t=' + Date.parse(new Date()), {}, 'GET').then(res => {
+				// 	this.highwayDataList = res.data.list;
+				// })
 			},
-			//收费站列表
-			queryStation() {
-				this.highwaySubDataList = [{
-						id: 4,
-						name: '城阳收费站',
-						highwayId: 1,
-						highwayName: '青龙高速公路建设有限公司',
-						isFinish: false
-					},
-					{
-						id: 5,
-						name: '夏庄收费站',
-						highwayId: 1,
-						highwayName: '青龙高速公路建设有限公司',
-						isFinish: false
-					},
-				];
+			//高速公路切换选择
+			changeHighway(e, key, index) {
+				this.form[key][index].highwayNameIndex = e.detail.value;
+				this.form[key][index].highwayName = this.highwayDataList[e.detail.value].stdName;
+				console.log(this.form)
+			},
+			//统计时段切换选择
+			changeStatPeriod(e) {
+				this.index = e.detail.value;
+				this.form.statPeriod = this.array[e.detail.value].dictValue;
+				console.log('change 时段', this.form)
+			},
+			//开闭切换选择
+			changeIsOpen(e) {
+				this.isOpenIndex = e.detail.value;
+				this.form.isOpen = this.isOpenArry[e.detail.value].value;
 			},
 			//取消
 			doCancel() {
@@ -351,6 +433,53 @@
 					this.array = res.data;
 				})
 			},
+			//增行
+			addRow() {
+				if(this.tabType == 1) {
+					//拥堵增行
+					this.form.highwayCongestionDetailDTOS.push({
+						"additionalNotes": "",
+						"congestionContent": "",
+						"congestionEndTime": "",
+						"congestionRange": "",
+						"congestionStartTime": "",
+						"disposalStatus": "",
+						"duration": "",
+						"highwayNameIndex": "",
+						"highwayName": "",
+						"location": "",
+					});
+					this.form.congestionCount = this.form.highwayCongestionDetailDTOS.length;
+				}else{
+					//事故增行
+					this.form.highwayAccidentDetailDTOS.push({
+						"accidentContent": "",
+						"accidentEndTime": "",
+						"accidentLevel": "",
+						"accidentStartTime": "",
+						"additionalNotes": "",
+						"congestionRange": "",
+						"disposalStatus": "",
+						"duration": "",
+						"highwayNameIndex": "",
+						"highwayName": "",
+						"location": "",
+					});
+					this.form.accidentCount = this.form.highwayCongestionDetailDTOS.length;
+				}
+			},
+			//删行
+			delRow(index) {
+				if(this.tabType == 1) {
+					//拥堵删行
+					this.form.highwayCongestionDetailDTOS.splice(index,1);
+					this.form.congestionCount = this.form.highwayCongestionDetailDTOS.length;
+				}else{
+					//事故删行
+					this.form.highwayAccidentDetailDTOS.splice(index,1);
+					this.form.accidentCount = this.form.highwayCongestionDetailDTOS.length;
+				}
+			},
 			//确认提交
 			doSubmit() {
 				uni.showModal({
@@ -364,15 +493,30 @@
 				})
 			},
 			submitForm() {
-				if (this.form.username == '' || this.form.password == '') {
+				console.log(this.form)
+				if (this.form.statDate == '' || this.form.statPeriod == '') {
+					uni.showToast({
+						title: '报送日期和时段不能为空',
+						icon: 'none'
+					})
+					return;
+				}
+				let checkCongestion = this.form.highwayCongestionDetailDTOS.every(item => {
+					return !item.highwayName || !item.congestionStartTime || !item.congestionEndTime || !item.duration || !item.location
+				})
+				let checkAccident = this.form.highwayAccidentDetailDTOS.every(item => {
+					return !item.highwayName || !item.accidentStartTime || !item.accidentEndTime || !item.duration || !item.location
+				})
+				if (this.form.highwayCongestionDetailDTOS.length > 0 && checkCongestion) {
 					uni.showToast({
-						title: '用户名密码不能为空',
+						title: '拥堵信息详情不能为空',
 						icon: 'none'
 					})
 					return;
-				} else if (this.form.verCode == '') {
+				}
+				if (this.form.highwayAccidentDetailDTOS.length > 0 && checkAccident) {
 					uni.showToast({
-						title: '验证码不能为空',
+						title: '事故信息详情不能为空',
 						icon: 'none'
 					})
 					return;
@@ -381,7 +525,7 @@
 					title: '提交中...',
 					mask: true
 				})
-				this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/saveOrUpdate', this.form,
+				this.$request(getApp().globalData.baseUrl + '/api/biz/highSpeedOperationController/saveOrUpdate', this.form,
 					'POST').then(res => {
 					uni.hideLoading();
 					if (res.code == 200) {
@@ -533,7 +677,14 @@
 							border: 0 !important;
 
 							.uni-easyinput__content-input {
-								height: 35rpx;
+								height: 35rpx !important;
+								text-align: right;
+							}
+						}
+						/deep/ .uni-date-x--border{
+							border: 0 !important;
+							.uni-date__x-input{
+								// height: 35rpx !important;
 								text-align: right;
 							}
 						}
@@ -591,7 +742,7 @@
 		justify-content: space-between;
 		padding: 40rpx 30rpx;
 		background-color: #f5f5f5;
-		z-index: 99;
+		z-index: 11;
 
 		.act_btn {
 			width: 329rpx;
@@ -631,6 +782,7 @@
 		background: #ECF5FF;
 		border-radius: 30rpx;
 		border: 2rpx solid #2D8CF0;
+		margin-top: 30rpx;
 	}
 
 	.tab_box {

pages/highWay/runStatusData/list.vue

@@ -101,7 +101,7 @@
 				},
 				timeRange: [], //查询起止日期
 				array: [], //时段选择列表
-				index: -1, //时段选择
+				index: '', //时段选择
 			}
 		},
 		onLoad() {