diff --git a/manifest.json b/manifest.json
index 2f23cab..513a653 100644
--- a/manifest.json
+++ b/manifest.json
@@ -103,7 +103,7 @@
},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "",
+ "appid" : "wx9ea045523e5cbb02",
"setting" : {
"urlCheck" : false
},
diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue
index e09d913..7b5e6c9 100644
--- a/pages/highWay/runData/form.vue
+++ b/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": ''
+ })
+ }
+ })
+ }
})
},
//取消
diff --git a/pages/highWay/runData/list.vue b/pages/highWay/runData/list.vue
index 0359b23..315e1a8 100644
--- a/pages/highWay/runData/list.vue
+++ b/pages/highWay/runData/list.vue
@@ -117,7 +117,7 @@
},
timeRange: [], //查询起止日期
array: [], //时段选择列表
- index: -1, //时段选择
+ index: '', //时段选择
}
},
onLoad() {
diff --git a/pages/highWay/runStatusData/detail.vue b/pages/highWay/runStatusData/detail.vue
index ab909b2..1f70632 100644
--- a/pages/highWay/runStatusData/detail.vue
+++ b/pages/highWay/runStatusData/detail.vue
@@ -14,6 +14,18 @@
高速开闭情况：
{{ roadData.isOpen == 1 ? '开放' : '关闭' }}
+
+ 已处理事故数量：
+
+ {{roadData.count1}}
+
+
+
+ 正在处理事故数量：
+
+ {{roadData.count2}}
+
+
事故数量：
diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue
index 7764104..25247de 100644
--- a/pages/highWay/runStatusData/form.vue
+++ b/pages/highWay/runStatusData/form.vue
@@ -16,7 +16,7 @@
统计日期：
- {{form.statDate?form.statDate:'请选择时段'}}
@@ -25,8 +25,8 @@
统计时段：
-
-
+ {{index>-1?array[index].dictLabel:'请选择时段'}}
@@ -35,9 +35,9 @@
高速开闭情况：
-
- {{form.isOpen == 1 ? '开放' : form.isOpen === 0 ? '关闭' : '请选择'}}
+
+ {{form.isOpen == 1 ? '开放' : form.isOpen === 0 ? '关闭' : '请选择'}}
@@ -45,43 +45,41 @@
已处理事故数量：
-
正在处理事故数量：
-
事故数量：
-
+ {{form.accidentCount}}
拥堵数量：
-
+ {{form.congestionCount}}
伤者人数：
-
+
亡者人数：
-
+
@@ -94,109 +92,133 @@
-
+
拥堵信息-{{index+1}}
+
高速公路名称：
-
-
+
+
+ {{item.highwayName ? item.highwayName : '请选择'}}
+
+
拥堵发生时间：
-
-
+
+
+ {{item.congestionStartTime?item.congestionStartTime:'请选择'}}
+
+
拥堵处理结束时间：
-
-
+
+
+ {{item.congestionEndTime?item.congestionEndTime:'请选择'}}
+
+
发生位置：
+ placeholder="请输入" maxlength="200">
拥堵内容：
+ placeholder="请输入" maxlength="200">
阻断/拥堵持续时间：
+ placeholder="请输入" maxlength="200">
截至当前拥堵空间范围(桩号及方向)：
+ placeholder="请输入" maxlength="200">
处置工作开展情况：
+ placeholder="请输入" maxlength="200">
-