From c7bded84b246fc935b82975249fdec526fc077e3 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Sat, 2 Sep 2023 13:41:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E9=80=9F=E8=BF=90=E8=A1=8C=E6=83=85?=
=?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 2 +-
pages/highWay/runData/form.vue | 75 ++++--
pages/highWay/runData/list.vue | 2 +-
pages/highWay/runStatusData/detail.vue | 12 +
pages/highWay/runStatusData/form.vue | 332 ++++++++++++++++++-------
pages/highWay/runStatusData/list.vue | 2 +-
static/60x60.png | Bin 774 -> 0 bytes
static/api.png | Bin 1449 -> 0 bytes
static/apiHL.png | Bin 1418 -> 0 bytes
static/apiIndex.png | Bin 1927 -> 0 bytes
static/app-plus/location@3x.png | Bin 4980 -> 0 bytes
static/app-plus/uni@2x.png | Bin 4162 -> 0 bytes
static/c1.png | Bin 401 -> 0 bytes
static/c2.png | Bin 470 -> 0 bytes
static/c3.png | Bin 511 -> 0 bytes
static/c4.png | Bin 476 -> 0 bytes
static/c5.png | Bin 472 -> 0 bytes
static/c6.png | Bin 545 -> 0 bytes
static/c7.png | Bin 365 -> 0 bytes
static/c8.png | Bin 587 -> 0 bytes
static/c9.png | Bin 565 -> 0 bytes
static/compass.png | Bin 24706 -> 0 bytes
static/component.png | Bin 1146 -> 0 bytes
static/componentHL.png | Bin 1142 -> 0 bytes
static/componentIndex.png | Bin 1705 -> 0 bytes
static/extui.png | Bin 5094 -> 0 bytes
static/extuiHL.png | Bin 5089 -> 0 bytes
static/extuiIndex.png | Bin 5951 -> 0 bytes
static/home-active.png | Bin 577 -> 0 bytes
static/home.png | Bin 554 -> 0 bytes
static/icons/badge.png | Bin 677 -> 0 bytes
static/icons/button.png | Bin 3465 -> 0 bytes
static/icons/calendar.png | Bin 735 -> 0 bytes
static/icons/card.png | Bin 429 -> 0 bytes
static/icons/collapse.png | Bin 802 -> 0 bytes
static/icons/color.png | Bin 4635 -> 0 bytes
static/icons/combox.png | Bin 828 -> 0 bytes
static/icons/countdown.png | Bin 1527 -> 0 bytes
static/icons/data-checkbox.png | Bin 1888 -> 0 bytes
static/icons/data-picker.png | Bin 588 -> 0 bytes
static/icons/dateformat.png | Bin 879 -> 0 bytes
static/icons/datetime-picker.png | Bin 1779 -> 0 bytes
static/icons/drawer.png | Bin 686 -> 0 bytes
static/icons/easyinput.png | Bin 465 -> 0 bytes
static/icons/fab.png | Bin 1303 -> 0 bytes
static/icons/fav.png | Bin 1480 -> 0 bytes
static/icons/file-picker.png | Bin 1017 -> 0 bytes
static/icons/font.png | Bin 3816 -> 0 bytes
static/icons/forms.png | Bin 801 -> 0 bytes
static/icons/goods-nav.png | Bin 902 -> 0 bytes
static/icons/grid.png | Bin 412 -> 0 bytes
static/icons/group.png | Bin 948 -> 0 bytes
static/icons/icons.png | Bin 1199 -> 0 bytes
static/icons/indexed-list.png | Bin 1620 -> 0 bytes
static/icons/link.png | Bin 1670 -> 0 bytes
static/icons/list.png | Bin 534 -> 0 bytes
static/icons/load-more.png | Bin 1342 -> 0 bytes
static/icons/nav-bar.png | Bin 716 -> 0 bytes
static/icons/notice-bar.png | Bin 981 -> 0 bytes
static/icons/number-box.png | Bin 455 -> 0 bytes
static/icons/pagination.png | Bin 943 -> 0 bytes
static/icons/popup.png | Bin 980 -> 0 bytes
static/icons/radius.png | Bin 1249 -> 0 bytes
static/icons/rate.png | Bin 1624 -> 0 bytes
static/icons/row.png | Bin 400 -> 0 bytes
static/icons/search-bar.png | Bin 1249 -> 0 bytes
static/icons/section.png | Bin 541 -> 0 bytes
static/icons/segmented-control.png | Bin 624 -> 0 bytes
static/icons/space.png | Bin 4175 -> 0 bytes
static/icons/steps.png | Bin 1203 -> 0 bytes
static/icons/swipe-action.png | Bin 1660 -> 0 bytes
static/icons/swiper-dot.png | Bin 1023 -> 0 bytes
static/icons/tag.png | Bin 569 -> 0 bytes
static/icons/title.png | Bin 364 -> 0 bytes
static/icons/transition.png | Bin 1415 -> 0 bytes
static/image-active.png | Bin 557 -> 0 bytes
static/image.png | Bin 524 -> 0 bytes
static/location.png | Bin 4980 -> 0 bytes
static/menu.png | Bin 2098 -> 0 bytes
static/nav.png | Bin 15782 -> 0 bytes
static/pause.png | Bin 3760 -> 0 bytes
static/play.png | Bin 4420 -> 0 bytes
static/plus.png | Bin 1252 -> 0 bytes
static/record.png | Bin 5801 -> 0 bytes
static/shuijiao.jpg | Bin 15766 -> 0 bytes
static/star-active.png | Bin 907 -> 0 bytes
static/star.png | Bin 839 -> 0 bytes
static/stop.png | Bin 2539 -> 0 bytes
static/template.png | Bin 461 -> 0 bytes
static/templateHL.png | Bin 459 -> 0 bytes
static/templateIndex.png | Bin 606 -> 0 bytes
static/trash.png | Bin 2656 -> 0 bytes
92 files changed, 310 insertions(+), 115 deletions(-)
delete mode 100644 static/60x60.png
delete mode 100644 static/api.png
delete mode 100644 static/apiHL.png
delete mode 100644 static/apiIndex.png
delete mode 100644 static/app-plus/location@3x.png
delete mode 100644 static/app-plus/uni@2x.png
delete mode 100644 static/c1.png
delete mode 100644 static/c2.png
delete mode 100644 static/c3.png
delete mode 100644 static/c4.png
delete mode 100644 static/c5.png
delete mode 100644 static/c6.png
delete mode 100644 static/c7.png
delete mode 100644 static/c8.png
delete mode 100644 static/c9.png
delete mode 100644 static/compass.png
delete mode 100644 static/component.png
delete mode 100644 static/componentHL.png
delete mode 100644 static/componentIndex.png
delete mode 100644 static/extui.png
delete mode 100644 static/extuiHL.png
delete mode 100644 static/extuiIndex.png
delete mode 100644 static/home-active.png
delete mode 100644 static/home.png
delete mode 100644 static/icons/badge.png
delete mode 100644 static/icons/button.png
delete mode 100644 static/icons/calendar.png
delete mode 100644 static/icons/card.png
delete mode 100644 static/icons/collapse.png
delete mode 100644 static/icons/color.png
delete mode 100644 static/icons/combox.png
delete mode 100644 static/icons/countdown.png
delete mode 100644 static/icons/data-checkbox.png
delete mode 100644 static/icons/data-picker.png
delete mode 100644 static/icons/dateformat.png
delete mode 100644 static/icons/datetime-picker.png
delete mode 100644 static/icons/drawer.png
delete mode 100644 static/icons/easyinput.png
delete mode 100644 static/icons/fab.png
delete mode 100644 static/icons/fav.png
delete mode 100644 static/icons/file-picker.png
delete mode 100644 static/icons/font.png
delete mode 100644 static/icons/forms.png
delete mode 100644 static/icons/goods-nav.png
delete mode 100644 static/icons/grid.png
delete mode 100644 static/icons/group.png
delete mode 100644 static/icons/icons.png
delete mode 100644 static/icons/indexed-list.png
delete mode 100644 static/icons/link.png
delete mode 100644 static/icons/list.png
delete mode 100644 static/icons/load-more.png
delete mode 100644 static/icons/nav-bar.png
delete mode 100644 static/icons/notice-bar.png
delete mode 100644 static/icons/number-box.png
delete mode 100644 static/icons/pagination.png
delete mode 100644 static/icons/popup.png
delete mode 100644 static/icons/radius.png
delete mode 100644 static/icons/rate.png
delete mode 100644 static/icons/row.png
delete mode 100644 static/icons/search-bar.png
delete mode 100644 static/icons/section.png
delete mode 100644 static/icons/segmented-control.png
delete mode 100644 static/icons/space.png
delete mode 100644 static/icons/steps.png
delete mode 100644 static/icons/swipe-action.png
delete mode 100644 static/icons/swiper-dot.png
delete mode 100644 static/icons/tag.png
delete mode 100644 static/icons/title.png
delete mode 100644 static/icons/transition.png
delete mode 100644 static/image-active.png
delete mode 100644 static/image.png
delete mode 100644 static/location.png
delete mode 100644 static/menu.png
delete mode 100644 static/nav.png
delete mode 100644 static/pause.png
delete mode 100644 static/play.png
delete mode 100644 static/plus.png
delete mode 100644 static/record.png
delete mode 100644 static/shuijiao.jpg
delete mode 100644 static/star-active.png
delete mode 100644 static/star.png
delete mode 100644 static/stop.png
delete mode 100644 static/template.png
delete mode 100644 static/templateHL.png
delete mode 100644 static/templateIndex.png
delete mode 100644 static/trash.png
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}}
+
高速公路名称:
-
-
+
+ changeHighway(e, 'highwayCongestionDetailDTOS', index)">
+ {{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">
-