From 68a95d2777fd8b242cd6cdfc3751a4a80a2a1b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Tue, 21 May 2024 17:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiHeExpressway/common/PresetFormItems.js | 1 - .../views/JiHeExpressway/components/Table.vue | 2 +- .../Home/components/Dialogs/Camera/index.vue | 1 - .../Dialogs/RoadNetworkFacilities/chart.js | 146 + .../Dialogs/RoadNetworkFacilities/data.js | 12 +- .../Dialogs/RoadNetworkFacilities/index.vue | 92 +- .../Dialogs/TrafficIncidents/index.vue | 5 +- .../pages/Home/components/Dialogs/mixin.js | 10 +- .../Home/components/RoadAndEvents/index.vue | 1 - .../CrowdnessIndicatorRankings/index.vue | 3 - .../DeviceControl/components/ScopeTable.vue | 21 +- .../Cards/DeviceControl/index.vue | 28 +- .../EditEventInformationDialog/data.js | 5 +- .../EditEventInformationDialog/data_back.js | 2572 +++++++++++++++++ .../AddControlEventInfoDialog/data.js | 4 +- .../control/event/commandDispatch/index.vue | 3 +- .../event/event/FormEvent/PresetFormItems.js | 5 +- .../control/event/event/FormEvent/data.js | 4 +- .../control/event/event/FormEvent/index.vue | 19 +- .../plan/addAndEditDialog/ScopeTable.vue | 2 +- .../smart/analysis/index.vue | 301 +- .../FormEvent/PresetFormItems.js | 1 - .../eventAnalysis/FormEvent/data.js | 3 +- .../components/eventQuery/ElQuarterPicker.vue | 3 - .../trafficIndicators/ElQuarterPicker.vue | 3 - .../components/postTrendsDay/index.vue | 1 - .../publicService/components/record/index.vue | 25 +- 27 files changed, 3173 insertions(+), 100 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data_back.js diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js index cee3f96d..51e08685 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js @@ -806,7 +806,6 @@ export const locationMode = { key: "dcEventAccident.locationType", required: true, type: "select", - default: "1", options: { options: [ { key: "1", label: "高速主线" }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Table.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Table.vue index 6927af95..e0aeb9f5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Table.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Table.vue @@ -32,7 +32,7 @@ div.Table { font-size: 16px; background-color: unset; color: #fff; - + width:100%; ::v-deep { tr { background-color: rgba(6, 66, 88, 0); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue index 72848b7f..8fc6ae1e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue @@ -171,7 +171,6 @@ export default { }, 150), visibleClose(bool) { if (bool) return; - this.controlDialogVisible = false; }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js new file mode 100644 index 00000000..faf755c5 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js @@ -0,0 +1,146 @@ +import * as echarts from "echarts"; + +export const chartOption ={ + color: ["#2AD9FD"], + xAxis: { + name: "日", + type: "category", + // boundaryGap: ["15%", "15%"], + nameTextStyle: { + color: "#2AD9FD", + align: "right", + fontSize: 15, + padding: [0, -15, 0, 0], + }, + boundaryGap: false, + data: ['00:00','02:00','04:00','06:00'], + axisTick: { + show: false, + }, + axisLabel: { + color: "#fff", + fontSize: 12, + }, + axisLine: { + lineStyle: { + color: "#668598", + }, + }, + }, + yAxis: [{ + name: "雨量日计", + type: "value", + nameTextStyle: { + color: "#2AD9FD", + // align: "right", + fontSize: 15, + // padding: [0, -15, 0, 0], + }, + // nameGap: 24, + splitLine: { + lineStyle: { + type: [6, 9], + color: "rgba(255,255,255, .3)", + // dashOffset: [10, 10], + // cap: 21, + // width: 2 + }, + }, + axisLabel: { + color: "#fff", + fontSize: 12, + formatter: "{value}", + }, + },{ + name: "雨量累计", + type: "value", + nameTextStyle: { + color: "#2AD9FD", + // align: "right", + fontSize: 15, + // padding: [0, -15, 0, 0], + }, + // nameGap: 24, + splitLine: { + lineStyle: { + type: [6, 9], + color: "rgba(255,255,255, .3)", + // dashOffset: [10, 10], + // cap: 21, + // width: 2 + }, + }, + axisLabel: { + color: "#fff", + fontSize: 12, + formatter: "{value}", + }, + }], + grid: { + left: 33, + top: 33, + bottom: 24, + right: 36, + }, + tooltip: { + trigger: "axis", + backgroundColor: "rgba(0,0,0,0.36)", + borderWidth: 0, + textStyle: { + color: "#fff", + }, + formatter: "{b}：{c}", + }, + legend: { + textStyle: { + color: '#2AD9FD' + } + }, + series: [ + { + data: [1,2,3,4], + type: "line", + showSymbol: false, + smooth: true, + name: '计数', + lineStyle: { + color: "#2AD9FD", + }, + areaStyle: { + opacity: 0.8, + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: "rgb(90, 227, 255, .9)", + }, + { + offset: 1, + color: "rgba(42,217,253,0)", + }, + ]), + }, + }, { + data: [1,2,3,4], + type: "line", + showSymbol: false, + smooth: true, + name: '计数', + lineStyle: { + color: "#2AD9FD", + }, + areaStyle: { + opacity: 0.8, + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: "rgb(90, 227, 255, .9)", + }, + { + offset: 1, + color: "rgba(42,217,253,0)", + }, + ]), + }, + }, + ], +}; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js index d5291305..c69a6134 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js @@ -428,6 +428,16 @@ export const tabList = { key: "direction", gridColumn: "3", }, + { + label: "所属机构", + key: "branchCenterFullName", + gridColumn: "3", + }, + { + label: "单位", + key: "groupCompany", + gridColumn: "3", + }, { label: "桩号", key: "end_mark", @@ -468,7 +478,7 @@ export const tabList = { }, { label: "测点编号", - key: "meaPointnum", + key: "meaPointNum", gridColumn: "3", }, { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue index b68749bb..6991dcd6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue @@ -10,6 +10,19 @@ + + +
+
@@ -27,7 +40,9 @@ import request from "@/utils/request"; import { dialogDelayVisible } from "./../mixin"; import { tabList } from './data' import { DirectionTypes } from "@screen/utils/enum.js" - +import * as echarts from "echarts"; +import { chartOption } from "./chart" +import moment from "moment"; // 所有交通事件的详情 export default { @@ -51,13 +66,24 @@ export default { deviceState: "0", deviceVendors: "XXX厂家", }, - formList: [] + formList: [], + dateRange:[], + daterangeChangeTime:[] }; }, + watch: { + daterangeChangeTime: { + handler(val) { + this.dateRange = [moment(val[0]).valueOf(),moment(val[1]).valueOf()]; + + this.bindListAsync(); + }, + }, + }, async created() { let dData = { ...this.dialogData }; this.formList = tabList[dData.facilityType] - + if (dData.facilityType) if (dData.otherConfig) { let otherConfig = JSON.parse(dData.otherConfig); @@ -66,25 +92,65 @@ export default { dData.direction = DirectionTypes[dData.direction] } let resPointList = await request({ - url: `dc/sideSlope/GetMeasurePointList`, - method: "get", - }); - if (resPointList.code != 200) return Message.error(result?.msg); - let pointList = {}; - if(resPointList.data && resPointList.data.result && resPointList.data.result.length > 0){ - pointList = resPointList.data.result[0] - } + url: `sideSlope/GetMeasurePointList`, + method: "get", + }); + if (resPointList.code != 200) return Message.error(resPointList?.msg); + let pointList = {}; + if(resPointList.data && resPointList.data.result && resPointList.data.result.length > 0){ + pointList = resPointList.data.result[0] + } dData = { ...dData, ...otherConfig,...pointList } + //获取历史数据echart + + } this.data = dData; - // console.log('this.data', this.data) + this.daterangeChangeTime = [moment().startOf('months').format('YYYY-MM-DD'),moment().endOf('months').format('YYYY-MM-DD')] + + console.log('this.data', this.data) }, methods: { + async bindListAsync(){ + let res = await request({ + url: `sideSlope/GetPointDataListAsync`, + method: "get", + params:{ + projCode: this.data.pro_code, + unitCode: this.data.unit_code, + meaPointNum: this.data.meaPointNum, + starttime: this.dateRange[0], + endtime: this.dateRange[1], + } + }); + if (res.code != 200) return Message.error(res?.msg); + const cdata = []; + const cseries1 = []; + const cseries2 = []; + res.data.forEach(e => { + cdata.push((moment(e.measureTime).format('YYYY-MM-DD'))) + cseries1.push(e.data[0].value) + cseries2.push(e.data[0].cum) + }); + chartOption.xAxis.data = cdata; + chartOption.series[0].data = cseries1; + chartOption.series[1].data = cseries2; + const chartIns = echarts.init(this.$refs.chartRef); + chartIns.setOption(chartOption); + } }, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js index c118c862..b1fb3932 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js @@ -25,13 +25,9 @@ export const dialogDelayVisible = { computed: { obverseVisible: { set(bool) { - if(this.visibleClose){ - try { - typeof this.visibleClose === "function" && this.visibleClose?.(bool); - } catch (error) {} - - } - + try { + typeof this.visibleClose === "function" && this.visibleClose?.(bool); + } catch (error) {} setTimeout(() => { this.$emit("change", bool); }, 180); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index 169cbc77..354faf09 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -248,7 +248,6 @@ export default { const key = getHandleDeviceType(item) || `${this.active}/${item.title}`; const status = item.status; - console.log(item.status,'------------') if (!status) { //开启 this.nowSelected = item.title; this.nowSelectedCompleted = false; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue index 11a517ba..4583f0cf 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue @@ -288,7 +288,6 @@ export default { const self = this; setTimeout(() => { // 获取map接口 - console.log(self.detailData,'----------') const { AMap, mapIns } = self.$refs.AMapContainerRef.getMapInstance(); const { longitude, dimension, eventName } = self.detailData; const icon = require(`@screen/images/layer/事件专题/${eventName}_active.svg`); @@ -298,8 +297,6 @@ export default { ); self.addMarker(center, icon, 1); mapIns.setZoomAndCenter(12, center); - // - // console.log(self.detailData,mapIns, AMap, "############"); }, 500); }, addMarker(position, icon, state, fn = null) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue index b3473899..3ffbe92c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue @@ -4,7 +4,7 @@ + style="width: 120px;"> @@ -13,7 +13,7 @@ - + @@ -27,9 +27,9 @@ - 公里 + ㎞ - +
@@ -79,7 +79,7 @@ - + @@ -120,15 +120,16 @@ - + - + +
@@ -157,7 +158,7 @@ - + @@ -261,7 +262,7 @@ export default { label: '事发上游最近' }, { - value: 3, + value: 4, label: '最近公里数' }, ], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue index abd21e9b..e0449a82 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue @@ -73,7 +73,6 @@ export default { this.tableData = [{ ...defaultTableInfo }]; return Message.warning("该事件暂无处置预案"); } - let dcExecuteAction = data[0].dcExecuteAction || []; this.planId = data[0].id; @@ -82,13 +81,14 @@ export default { let action = { ...it }; if (it.executeConfig) { let executeConfig = JSON.parse(it.executeConfig); + let execute = this.mapKeys(executeConfig, "zx_"); - action = { ...action, ...execute }; + action = { ...action, ...execute,...{executeConfig} }; } if (it.recoverConfig) { let recoverConfig = JSON.parse(it.recoverConfig); let recover = this.mapKeys(recoverConfig, "hf_"); - action = { ...action, ...recover }; + action = { ...action, ...recover,...{recoverConfig} }; } if (it.deviceList) { action.devList = it.deviceList.split(",").map((str) => str); @@ -123,13 +123,7 @@ export default { }, onConfirm(index){ const param = { - "dcEvent": { - "eventType": this.detailData.eventType, - "direction": this.detailData.direction, - "id": this.detailData.id, - "stakeMark": this.detailData.stakeMark, - "subclass": this.detailData.subclass - }, + "dcEvent": this.detailData, "dcExecuteAction": { "id": "", "emergencyPlansId": "", @@ -141,18 +135,25 @@ export default { "recoverConfig": "{\"operationType\":2}" } } + if(this.tableData[index].isDefault !== true){ + param['dcExecuteAction']['executeConfig'] = JSON.stringify(this.tableData[index]['executeConfig']) + param['dcExecuteAction']['recoverConfig'] = JSON.stringify(this.tableData[index]['recoverConfig']) + + } request({ url: `business/plans/list/event/emergencyPlans`, method: "post", data: param, }).then(result=>{ if (result.code != 200) return Message.error(result?.msg); - console.log(param,result,'===============') + console.log(this.tableData[index]) let data = result.data; this.tableData[index].executeConfig = JSON.parse(data.executeConfig) this.tableData[index].recoverConfig = JSON.parse(data.recoverConfig) - this.tableData[index].zx_operationType = this.tableData[index].executeConfig?.operationType; - this.tableData[index].hf_operationType = this.tableData[index].recoverConfig?.operationType; + if(this.tableData[index].isDefault === true){ + this.tableData[index].zx_operationType = this.tableData[index].executeConfig?.operationType; + this.tableData[index].hf_operationType = this.tableData[index].recoverConfig?.operationType; + } this.tableData = _.cloneDeep(this.tableData) }) }, @@ -222,7 +223,6 @@ export default { }; console.log("reqData", reqData); - return; request({ url: "/business/plans/event/confirm", method: "post", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js index 1391de20..05d53346 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js @@ -937,8 +937,7 @@ export const configList = { isAlone: false, required: true, options: { - options: [], - multiple: true, + options: [] }, visible: (data) => { if (data?.eventSubclass == "3-3") { @@ -984,6 +983,8 @@ export const configList = { required: true, options: { options: [], + multiple: true, + }, visible: (data) => { if (data?.eventSubclass == "3-3") { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data_back.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data_back.js new file mode 100644 index 00000000..d0bae20c --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data_back.js @@ -0,0 +1,2572 @@ +import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js"; +import request from "@/utils/request"; +import { Message } from "element-ui"; +const directionName = { + label: "方向:", + key: "direction", + required: true, + type: "select", + options: { + options: [ + { value: "济南方向", label: "济南方向" }, + { value: "菏泽方向", label: "菏泽方向" }, + ], + }, +}; +const freeway = { + label: "路线:", + required: true, + key: "roadName", + type: "select", + options: { + options: [ + { + key: "济菏高速", + label: "济菏高速", + }, + ], + }, +} +const locationSelect = [ + { + value: "1", + label: "入口车道", + }, + { + value: "2", + label: "入口匝道", + }, + { + value: "3", + label: "入口", + }, + { + value: "4", + label: "入口内广场", + }, + { + value: "5", + label: "出口车道", + }, + { + value: "6", + label: "出口匝道", + }, + { + value: "7", + label: "外广场", + }, + { + value: "8", + label: "出口", + }, + { + value: "9", + label: "(站外)入口匝道", + }, + { + value: "10", + label: "(站外)出口匝道", + }, + { + value: "11", + label: "出口内广场", + }, +]; +export const tabConfigList = [ + { + key: "TrafficAccident", + label: "交通事故", + formConfig: { + list: [ + { + ...PresetFormItems.callPolicePersonName, + key: "dcEventAccident.reporterName", + }, + { + ...PresetFormItems.callPolicePersonPhone, + key: "dcEventAccident.reporterPhoneNumber", + }, + PresetFormItems.trafficAccidentType, + PresetFormItems.eventLevel, + { + ...PresetFormItems.locationMode, + key: "dcEventAccident.locationType", + }, + freeway, + { + label: "服务区:", + key: "dcEventAccident.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if (data?.dcEventAccident?.locationType == 2) { + return true; + } + return false; + }, + }, + { + label: "地点:", + key: "dcEventAccident.location", + isAlone: false, + required: true, + options: { + placeholder: "服务区地点", + }, + visible: (data) => { + if (data?.dcEventAccident?.locationType == 2) { + return true; + } + return false; + }, + }, + { + label: "立交桥:", + key: "dcEventAccident.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if (data?.dcEventAccident?.locationType == 3) { + return true; + } + return false; + }, + ons: { + change(value, ...args) { + const { formList } = args.slice(-1)[0]; + + //匝道 + request({ + url: `/system/ramp/listAll?facilityId=${value}`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let zd = []; + result.rows.forEach((it) => + zd.push({ key: it.id, label: it.rampName }) + ); + console.log("zd", zd); + formList.forEach((it) => { + if (it.key == "dcEventAccident.rampId") { + console.log("it", it); + it.options.options = zd; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败3", err); + }); + }, + }, + }, + { + label: "匝道:", + key: "dcEventAccident.rampId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data?.dcEventAccident?.locationType == 3) { + return true; + } + return false; + }, + }, + { + label: "收费站:", + key: "dcEventAccident.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if (data?.dcEventAccident?.locationType == 4) { + return true; + } + return false; + }, + }, + { + label: "地点:", + key: "dcEventAccident.location", + type: "select", + isAlone: false, + required: true, + options: { + placeholder: "收费站地点", + options: locationSelect, + }, + visible: (data) => { + if (data?.dcEventAccident?.locationType == 4) { + return true; + } + return false; + }, + }, + directionName, + PresetFormItems.station, + PresetFormItems.eventHappenTime, + PresetFormItems.aEstimatedReleaseTime, + { ...PresetFormItems.pressure, key: "dcEventAccident.trafficJam" }, + { + ...PresetFormItems.weatherCondition, + key: "dcEventAccident.weatherCondition", + }, + { ...PresetFormItems.effect, key: "dcEventAccident.impactLevel" }, + { ...PresetFormItems.isArrives, key: "dcEventAccident.isReverseCargo" }, + { + ...PresetFormItems.isMaintenanceAccident, + key: "dcEventAccident.isMaintenance", + }, + { + ...PresetFormItems.trafficPolicePhone, + key: "dcEventAccident.policeContact", + }, + { + ...PresetFormItems.wreckerCalls, + key: "dcEventAccident.towingServiceContact", + }, + { + ...PresetFormItems.isCongestionAhead, + key: "dcEventAccident.congestionAhead", + }, + { + ...PresetFormItems.isForkRoad, + key: "dcEventAccident.atIntersection", + }, + { ...PresetFormItems.isCurveRoad, key: "dcEventAccident.onCurve" }, + { ...PresetFormItems.isInTunnel, key: "dcEventAccident.inTunnel" }, + { ...PresetFormItems.spillName, key: "dcEventAccident.spillageItem" }, + { + ...PresetFormItems.ownerPhone, + key: "dcEventAccident.vehicleOwnerPhone", + }, + PresetFormItems.laneOccupancy, + PresetFormItems.vehicleCondition("dcEventAccident"), + PresetFormItems.casualties("dcEventAccident"), + PresetFormItems.eventTitle, + PresetFormItems.eventDesc, + PresetFormItems.source, + ], + }, + }, + { + key: "VehicleFault", + label: "车辆故障", + formConfig: { + formOptions: {}, + list: [ + { + ...PresetFormItems.callPolicePersonName, + key: "dcEventVehicleAccident.reporterName", + }, + { + ...PresetFormItems.callPolicePersonPhone, + key: "dcEventVehicleAccident.reporterPhoneNumber", + }, + PresetFormItems.vehicleMalfunctionType, + PresetFormItems.eventLevel, + { + ...PresetFormItems.locationMode, + key: "dcEventVehicleAccident.locationType", + }, + freeway, + { + label: "服务区:", + key: "dcEventVehicleAccident.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if (data?.dcEventVehicleAccident?.locationType == 2) { + return true; + } + return false; + }, + }, + { + label: "地点:", + key: "dcEventVehicleAccident.location", + isAlone: false, + required: true, + options: { + placeholder: "服务区地点", + }, + visible: (data) => { + if (data?.dcEventVehicleAccident?.locationType == 2) { + return true; + } + return false; + }, + }, + { + label: "立交桥:", + key: "dcEventVehicleAccident.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if (data?.dcEventVehicleAccident?.locationType == 3) { + return true; + } + return false; + }, + ons: { + change(value, ...args) { + const { formList } = args.slice(-1)[0]; + + //匝道 + request({ + url: `/system/ramp/listAll?facilityId=${value}`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let zd = []; + result.rows.forEach((it) => + zd.push({ key: it.id, label: it.rampName }) + ); + console.log("zd", zd); + formList.forEach((it) => { + if (it.key == "dcEventVehicleAccident.rampId") { + // console.log("it", it); + it.options.options = zd; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败2", err); + }); + }, + }, + }, + { + label: "匝道:", + key: "dcEventVehicleAccident.rampId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data?.dcEventVehicleAccident?.locationType == 3) { + return true; + } + return false; + }, + }, + { + label: "收费站:", + key: "dcEventVehicleAccident.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if (data?.dcEventVehicleAccident?.locationType == 4) { + return true; + } + return false; + }, + }, + { + label: "地点:", + key: "dcEventVehicleAccident.location", + type: "select", + isAlone: false, + required: true, + options: { + placeholder: "收费站地点", + options: locationSelect, + }, + visible: (data) => { + if (data?.dcEventVehicleAccident?.locationType == 4) { + return true; + } + return false; + }, + }, + { + label: "方向:", + key: "direction", + required: true, + type: "select", + options: { + options: [ + { key: "济南方向", label: "济南方向e" }, + { key: "菏泽方向", label: "菏泽方向2" }, + ], + }, + }, + { ...PresetFormItems.station, + visible: (data) => { + if (data.dcEventVehicleAccident && data.dcEventVehicleAccident.locationType != 1) { + return false; + } + return true; + }, + }, + PresetFormItems.eventHappenTime, + PresetFormItems.aEstimatedReleaseTime, + { + ...PresetFormItems.pressure, + key: "dcEventVehicleAccident.trafficJam", + }, + { + ...PresetFormItems.weatherCondition, + key: "dcEventVehicleAccident.weatherCondition", + }, + { + ...PresetFormItems.isCongestionAhead, + key: "dcEventVehicleAccident.congestionAhead", + }, + { + ...PresetFormItems.isForkRoad, + key: "dcEventVehicleAccident.atIntersection", + }, + { + ...PresetFormItems.isCurveRoad, + key: "dcEventVehicleAccident.onCurve", + }, + { + ...PresetFormItems.isInTunnel, + key: "dcEventVehicleAccident.inTunnel", + }, + PresetFormItems.laneOccupancy, + PresetFormItems.vehicleCondition("dcEventVehicleAccident"), + PresetFormItems.casualties("dcEventVehicleAccident"), + PresetFormItems.eventTitle, + PresetFormItems.eventDesc, + PresetFormItems.source, + ], + }, + }, + { + key: "TrafficControl", + label: "交通管制", + formConfig: { + formOptions: { + column: 2, + }, + list: [ + { + label: "管制设施:", + key: "eventSubclass", + type: "RadioGroup", + isAlone: true, + required: true, + default: "3-1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "3-1", + label: "主线", + }, + { + key: "3-2", + label: "收费站", + }, + { + key: "3-3", + label: "立交", + }, + { + key: "3-4", + label: "服务区", + }, + ], + }, + ons: { + input(value, ...args) { + const { data, formList } = args.slice(-1)[0]; + const classify = formList.find( + (it) => it.key == "dcEventTrafficControl.classify" + ); + let ss = { + "3-1": "主线", + "3-2": "收费站", + "3-3": "立交", + "3-4": "服务区", + }; + let ad = { + 1: [ + { + key: "1", + label: `${ss[value]}关闭`, + }, + ], + 2: [ + { + key: "2", + label: "主线限行", + }, + { + key: "3", + label: "主线间隔放行", + }, + { + key: "4", + label: "主线并道", + }, + { + key: "5", + label: "主线限速", + }, + ], + }; + classify.options.options = + ad[data.dcEventTrafficControl.controlType]; + + if (data.dcEventTrafficControl) { + data.dcEventTrafficControl.facilityId = null; + } + let facilityType = 1; + if (value == "3-2") { + facilityType = 1; + } else if (value == "3-3") { + facilityType = 4; + } else if (value == "3-4") { + facilityType = 6; + } + if (value && value != "3-1") { + //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 + request({ + url: `/business/facility/query?facilityType=${facilityType}`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let lwss = []; + result.data.forEach((it) => + lwss.push({ key: it.id, label: it.facilityName }) + ); + + formList.forEach((it) => { + if (it.key == "dcEventTrafficControl.facilityId") { + it.options.options = lwss; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败1", err); + }); + } + }, + }, + }, + { + label: "管制分类:", + key: "dcEventTrafficControl.controlType", + type: "RadioGroup", + isAlone: true, + required: true, + default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "封闭", + }, + { + key: "2", + label: "限行", + }, + ], + }, + ons: { + input(value, ...args) { + const { data, formList } = args.slice(-1)[0]; + const classify = formList.find( + (it) => it.key == "dcEventTrafficControl.classify" + ); + const measure = formList.find( + (it) => it.key == "dcEventTrafficControl.measure" + ); + let ss = { + "3-1": "主线", + "3-2": "收费站", + "3-3": "立交", + "3-4": "服务区", + }; + let ad = { + 1: [ + { + key: "1", + label: `${ss[data.eventSubclass]}关闭`, + }, + ], + 2: [ + { + key: "2", + label: "主线限行", + }, + { + key: "3", + label: "主线间隔放行", + }, + { + key: "4", + label: "主线并道", + }, + { + key: "5", + label: "主线限速", + }, + ], + }; + let cs = { + 1: [ + { + value: "1", + label: "临时关闭", + }, + ], + 2: [ + { + value: "2", + label: "限行车辆", + }, + { + value: "3", + label: "限行车道", + }, + { + value: "4", + label: "限行车道且限行车辆", + }, + { + value: "5", + label: "间隔放行", + }, + { + value: "6", + label: "并道行驶", + }, + { + value: "7", + label: "限速", + }, + ], + }; + measure.options.options = cs[value]; + classify.options.options = ad[value]; + }, + }, + }, + { + label: "分类:", + key: "dcEventTrafficControl.classify", + type: "RadioGroup", + isAlone: true, + required: true, + default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "主线关闭", + }, + ], + }, + }, + { + label: "分类原因:", + key: "dcEventTrafficControl.controlCause", + type: "RadioGroup", + isAlone: true, + required: true, + default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "车流量大", + }, + { + key: "2", + label: "交通事故", + }, + { + key: "3", + label: "恶劣天气", + }, + { + key: "4", + label: "施工", + }, + { + key: "5", + label: "警备任务", + }, + { + key: "6", + label: "其他", + }, + ], + }, + ons: { + input(value, ...args) { + const { formList } = args.slice(-1)[0]; + const config = formList.find( + (it) => it.key == "dcEventTrafficControl.causeType" + ); + let ad = { + 3: [ + { + value: "3-1", + label: "雨", + }, + { + value: "3-2", + label: "雪", + }, + { + value: "3-3", + label: "雾", + }, + { + value: "3-4", + label: "道路积水", + }, + { + value: "3-5", + label: "道路湿滑", + }, + { + value: "3-6", + label: "道路结冰", + }, + { + value: "3-7", + label: "沙尘暴", + }, + ], + 4: [ + { + value: "4-1", + label: "专项工程施工", + }, + { + value: "4-2", + label: "改扩建工程施工", + }, + { + value: "4-3", + label: "其他施工", + }, + ], + }; + config.options.options = ad[value]; + }, + }, + }, + PresetFormItems.isInTunnel, + { + label: "原因类型:", + key: "dcEventTrafficControl.causeType", + type: "select", + options: { + options: [], + }, + visible: (data) => { + if ( + data?.dcEventTrafficControl.controlCause == "3" || + data?.dcEventTrafficControl.controlCause == "4" + ) { + return true; + } + return false; + }, + }, + freeway, + directionName, + PresetFormItems.emptyLine, + { + label: "出入口:", + key: "dcEventTrafficControl.exitsInlets", + type: "RadioGroup", + isAlone: true, + required: true, + default: "2", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "出口", + }, + { + key: "2", + label: "入口", + }, + ], + }, + visible: (data) => { + if (data?.eventSubclass == "3-2" || data?.eventSubclass == "3-4") { + return true; + } + return false; + }, + }, + { + label: "收费站:", + key: "dcEventTrafficControl.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + multiple: true, + }, + visible: (data) => { + if (data?.eventSubclass == "3-2") { + return true; + } + return false; + }, + }, + { + label: "立交桥:", + key: "dcEventTrafficControl.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [] + }, + visible: (data) => { + if (data?.eventSubclass == "3-3") { + return true; + } + return false; + }, + ons: { + change(value, ...args) { + const { formList } = args.slice(-1)[0]; + + //匝道 + request({ + url: `/system/ramp/listAll?facilityId=${value}`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let zd = []; + result.rows.forEach((it) => + zd.push({ key: it.id, label: it.rampName }) + ); + // console.log("zd", zd); + formList.forEach((it) => { + if (it.key == "dcEventTrafficControl.rampId") { + console.log("it", it); + it.options.options = zd; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败3", err); + }); + }, + }, + }, + { + label: "匝道:", + key: "dcEventTrafficControl.rampId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data?.eventSubclass == "3-3") { + return true; + } + return false; + }, + }, + { + label: "服务区:", + key: "dcEventTrafficControl.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data?.eventSubclass == "3-4") { + return true; + } + return false; + }, + }, + { + label: "措施:", + required: true, + key: "dcEventTrafficControl.measure", + type: "select", + options: { + options: [ + { + value: "1", + label: "临时关闭", + }, + ], + }, + }, + { + label: "限制类型:", + key: "dcEventTrafficControl.limitedType", + required: true, + type: "select", + options: { + options: [ + { key: "1", label: "只允许" }, + { key: "2", label: "禁止" }, + ], + }, + visible: (data) => { + if (data?.dcEventTrafficControl.controlType == "2") { + return true; + } + return false; + }, + }, + { + label: "车辆类型:", + key: "dcEventTrafficControl.vehicleType", + required: true, + type: "select", + options: { + options: [ + { key: "1", label: "10座以下客车" }, + { key: "2", label: "10座以下客车(间隔放行)" }, + { key: "3", label: "19座以上客车" }, + { key: "4", label: "一型客车(不含面包车)" }, + { key: "5", label: "两客一危" }, + { key: "6", label: "三类以上班线客车" }, + { + key: "7", + label: "四轴及四轴以上货车(运送生鲜果蔬、抗疫物资车辆除外)", + }, + { key: "8", label: "三轴及以上(含三轴)货车" }, + { key: "9", label: "3轴以上货车(不含危险品运输车)" }, + { key: "10", label: "3轴以上货车" }, + { key: "11", label: "四轴及以上(含四轴)货车" }, + { key: "12", label: "4轴以上货车(不含危险品运输车)" }, + { key: "13", label: "4轴以上货车" }, + { key: "14", label: "4轴以下货车" }, + { key: "15", label: "57座以上客车" }, + { key: "16", label: "五轴及以上货车" }, + { key: "17", label: "5轴以上货车" }, + { key: "18", label: "5轴以上货车(不含危险品运输车)" }, + { key: "19", label: "5轴以下货车" }, + { key: "20", label: "6座以上客车" }, + { key: "21", label: "6座以上面包车" }, + { key: "22", label: "7座以上客车" }, + { key: "23", label: "7座以下客车" }, + { key: "24", label: "8座以上客车" }, + // 25- 8座以下客车 + // 26- 8座以下客车(间隔放行) + // 27- 9座以上客车 + // 28- 半挂货车 + // 29- 车辆（不含10座以下客车） + // 30- 车辆（不含8座以下客车） + // 31- 车辆（不含小轿车） + // 32- 不可解体物品超限运输车 + // 33- 不可解体物品运输车 + // 34- 超长超宽超高车辆 + // 35- 车辆运输车 + // 36- 超限运输车 + // 37- 大型货车(不含危险品运输车) + // 38- 大型货车 + // 39- 大型客车 + // 40- 大中型货车 + // 41- 已安装ETC的客车 + // 42- 已安装ETC的小型客车 + // 43- 罐车 + // 44- 货车 + // 45- 黄牌货车 + // 46- 黄牌货车(不含危险品运输车) + // 47- 黄牌货车(运送民生物资车辆除外) + // 48- 核载总质量4.5吨以上货车(运送民生物资车辆除外) + // 49- 客车（包括小轿车） + // 50- 客运车辆 + // 51- 蓝牌货车 + // 52- 旅游包车 + // 53- 面包车 + // 54- 皮卡 + // 55- 全部车型 + // 56- (未安装ETC)车辆 + // 57- 外埠号牌车辆 + // 58- 危化品运输车 + // 59- 危险物品运输车 + // 60- 武装押运车辆 + // 61- 小轿车 + // 62- 厢式货车 + // 63- 小型车辆 + // 64- (已安装ETC)车辆 + // 65- 已安装ETC的货车 + // 66- 押款车辆 + // 67- 疫情防控物资运输车辆 + // 68- 运输剧毒、放射性物品车辆 + // 69- 运输枪支弹药、爆炸、剧毒、放射性物品车辆 + // 70- 营运客车 + // 71- 重型货车 + // 72- 核载总质量1.8吨以上货车 + // 73- 中型货车 + // 74- 小型车辆限速80公里/小时、大型车辆限速70 + ], + }, + visible: (data) => { + if (data?.dcEventTrafficControl.controlType == "2") { + return true; + } + return false; + }, + }, + { + label: "桩号:", + key: "stakeMark", + required: true, + type: "MultipleLabelItem", + options: { + options: [ + { + prefix: { + text: "K", + style: { + color: "#3DE8FF", + }, + }, + key: "stakeMark[0]", + }, + { + prefix: { + text: "+", + style: { + color: "#3DE8FF", + }, + }, + key: "stakeMark[1]", + }, + ], + }, + visible: (data) => { + if (data?.eventSubclass == "3-1") { + return true; + } + return false; + }, + }, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.remark, + PresetFormItems.source, + ], + }, + }, + { + key: "TrafficCongestion", + label: "交通拥堵", + formConfig: { + formOptions: {}, + list: [ + { + label: "拥堵类型:", + key: "eventSubclass", + type: "RadioGroup", + isAlone: true, + required: true, + default: "4-1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "4-1", + label: "道路拥堵", + }, + { + key: "4-2", + label: "立交拥堵", + }, + { + key: "4-3", + label: "收费站拥堵", + }, + { + key: "4-4", + label: "服务区拥堵", + }, + ], + }, + ons: { + input(value, ...args) { + const { data, formList } = args.slice(-1)[0]; + if (data.dcEventTrafficCongestion) { + data.dcEventTrafficCongestion.facilityId = null; + } + let facilityType = 1; + if (value == "4-2") facilityType = 3; + if (value == "4-3") facilityType = 1; + if (value == "4-4") facilityType = 6; + //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 + request({ + url: `/business/facility/query?facilityType=${facilityType}`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let lwss = []; + result.data.forEach((it) => + lwss.push({ key: it.id, label: it.facilityName }) + ); + formList.forEach((it) => { + if (it.key == "dcEventTrafficCongestion.facilityId") { + it.options.options = lwss; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败1", err); + }); + }, + }, + }, + { + ...PresetFormItems.congestionCause, + key: "dcEventTrafficCongestion.congestionCause", + }, + { + label: "详细原因:", + key: "detailedReasons", + type: "RadioGroup", + isAlone: true, + required: true, + // default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "收费站广场拥堵导致出口压车", + }, + { + key: "2", + label: "收费站设备故障", + }, + { + key: "3", + label: "地方道路原因", + }, + { + key: "4", + label: "省内非集团所辖高速原因", + }, + { + key: "5", + label: "集团所辖道路拥堵", + }, + { + key: "6", + label: "集团所辖枢纽立交异常导致主线压车", + }, + { + key: "7", + label: "路侧起火", + }, + { + key: "8", + label: "备注项添加", + }, + ], + }, + ons: { + input(value, ...args) { + const { data, formList } = args.slice(-1)[0]; + if (data.dcEventTrafficCongestion) { + data.dcEventTrafficCongestion.facilityId = null; + } + if ( + data.dcEventTrafficCongestion.congestionCause == 1 && + value == 2 + ) { + console.log("value2", value); + //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 + request({ + url: `/business/facility/query?facilityType=1`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let sfz = []; + result.data.forEach((it) => + sfz.push({ key: it.id, label: it.facilityName }) + ); + formList.forEach((it) => { + if (it.key == "dcEventTrafficCongestion.facilityId") { + it.options.options = sfz; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败1", err); + }); + } + }, + }, + visible: (data) => { + if ( + data?.eventSubclass == "4-1" && + (data?.dcEventTrafficCongestion?.congestionCause == 1 || + data?.dcEventTrafficCongestion?.congestionCause == 6) + ) { + return true; + } + return false; + }, + }, + { ...PresetFormItems.isInTunnel, isAlone: true }, + { + label: "高速公路:", + required: true, + key: "roadId", + type: "select", + options: { + options: [], + }, + visible: (data) => { + if (data?.eventSubclass == "4-1" || data?.eventSubclass == "4-3") { + return true; + } + return false; + }, + }, + { + label: "方向:", + key: "direction", + required: true, + type: "select", + options: { + options: [], + }, + visible: (data) => { + if (data?.eventSubclass == "4-1" || data?.eventSubclass == "4-3") { + return true; + } + return false; + }, + }, + { + label: "拥堵收费站:", + key: "dcEventTrafficCongestion.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if ( + data?.eventSubclass == "4-3" || + (data?.eventSubclass == "4-1" && + data?.dcEventTrafficCongestion.congestionCause == "1" && + data.detailedReasons == "2") + ) { + return true; + } + return false; + }, + }, + { + label: "地点:", + key: "dcEventTrafficCongestion.location", + type: "select", + isAlone: false, + required: true, + options: { + placeholder: "收费站地点", + options: locationSelect, + }, + visible: (data) => { + if (data?.eventSubclass == "4-3") { + return true; + } + return false; + }, + }, + { + label: "拥堵服务区:", + key: "dcEventTrafficCongestion.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if (data?.eventSubclass == "4-4") { + return true; + } + return false; + }, + }, + { + label: "地点:", + key: "dcEventTrafficCongestion.location", + isAlone: false, + required: true, + options: { + placeholder: "地点描述", + }, + visible: (data) => { + if (data?.eventSubclass == "4-4") { + return true; + } + return false; + }, + }, + { + label: "地点类型:", + key: "locationType", + type: "RadioGroup", + isAlone: true, + required: true, + default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "单点", + }, + { + key: "2", + label: "多点", + }, + ], + }, + visible: (data) => { + if (data?.eventSubclass == "4-1") { + return true; + } + return false; + }, + }, + { + label: "桩号:", + key: "stakeMark", + required: true, + type: "MultipleLabelItem", + options: { + options: [ + { + prefix: { + text: "K", + style: { + color: "#3DE8FF", + }, + }, + key: "stakeMark[0]", + }, + { + prefix: { + text: "+", + style: { + color: "#3DE8FF", + }, + }, + key: "stakeMark[1]", + }, + ], + }, + visible: (data) => { + if (data?.eventSubclass == "4-1" && data?.locationType == 1) { + return true; + } + return false; + }, + }, + { + label: "起止桩号:", + key: "stakeMark", + required: true, + isAlone: true, + type: "MultipleLabelItem", + options: { + options: [ + { + prefix: { + text: "K", + style: { + color: "#3DE8FF", + }, + }, + key: "stakeMark[0]", + }, + { + prefix: { + text: "+", + style: { + color: "#3DE8FF", + }, + }, + key: "stakeMark[1]", + }, + { + prefix: { + text: "至K", + style: { + color: "#3DE8FF", + }, + }, + key: "endStakeMark[0]", + }, + { + prefix: { + text: "+", + style: { + color: "#3DE8FF", + }, + }, + key: "endStakeMark[1]", + }, + ], + }, + visible: (data) => { + if (data?.eventSubclass == "4-1" && data?.locationType == 2) { + return true; + } + return false; + }, + }, + { + label: "立交桥:", + key: "dcEventTrafficCongestion.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + visible: (data) => { + if (data?.eventSubclass == "4-2") { + return true; + } + return false; + }, + ons: { + change(value, ...args) { + const { formList } = args.slice(-1)[0]; + + //匝道 + request({ + url: `/system/ramp/listAll?facilityId=${value}`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let zd = []; + result.rows.forEach((it) => + zd.push({ key: it.id, label: it.rampName }) + ); + console.log("zd", zd); + formList.forEach((it) => { + if (it.key == "dcEventTrafficCongestion.rampId") { + console.log("it", it); + it.options.options = zd; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败3", err); + }); + }, + }, + }, + { + label: "匝道:", + key: "dcEventTrafficCongestion.rampId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data?.eventSubclass == "4-2") { + return true; + } + return false; + }, + }, + + { + label: "拥堵里程:", + key: "dcEventTrafficCongestion.congestionMileage", + required: true, + type: "MultipleLabelItem", + options: { + options: [ + { + suffix: { + text: "千米", + }, + type: "InputNumber", + key: "dcEventTrafficCongestion.congestionMileage", + }, + ], + }, + }, + { + label: "最大拥堵里程:", + key: "dcEventTrafficCongestion.maxCongestionMileage", + required: true, + type: "MultipleLabelItem", + options: { + options: [ + { + suffix: { + text: "千米", + }, + type: "InputNumber", + key: "dcEventTrafficCongestion.maxCongestionMileage", + }, + ], + }, + }, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.remark, + PresetFormItems.source, + ], + }, + }, + { + key: "IllegalOnRoad", + label: "非法上路", + formConfig: { + formOptions: { + column: 2, + }, + list: [ + PresetFormItems.illegalTriggeringType, + PresetFormItems.additionalNotes, + freeway, + directionName, + PresetFormItems.station, + PresetFormItems.isInTunnel, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.problemDescription, + PresetFormItems.source, + ], + }, + }, + { + key: "BarricadesCleared", + label: "路障清除", + formConfig: { + formOptions: { + column: 2, + }, + list: [ + { + label: "障碍物类型:", + key: "eventSubclass", + type: "RadioGroup", + isAlone: true, + required: true, + default: "6-1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "6-1", + label: "烟雾", + }, + { + key: "6-2", + label: "倒伏树木", + }, + { + key: "6-3", + label: "撒落物", + }, + { + key: "6-4", + label: "动物", + }, + { + key: "6-5", + label: "其他", + }, + ], + }, + }, + PresetFormItems.additionalNotes, + freeway, + directionName, + PresetFormItems.station, + PresetFormItems.isInTunnel, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.problemDescription, + PresetFormItems.source, + ], + }, + }, + { + key: "Construction", + label: "施工建设", + formConfig: { + formOptions: { + column: 2, + }, + list: [ + { + label: "施工类型:", + key: "key0123", + type: "RadioGroup", + isAlone: true, + required: true, + default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "养护施工类施工", + }, + { + key: "2", + label: "工程建设类施工", + }, + ], + }, + ons: { + input(value, ...args) { + const { formList } = args.slice(-1)[0]; + const config = formList.find((it) => it.key == "eventSubclass"); + const ad = { + 1: [ + { + key: "7-1", + label: "道路养护施工", + }, + { + key: "7-2", + label: "收费站养护施工", + }, + { + key: "7-3", + label: "服务区养护施工", + }, + { + key: "7-4", + label: "枢纽立交匝道养护施工", + }, + { + key: "7-5", + label: "地方道路养护施工", + }, + ], + 2: [ + { + key: "7-6", + label: "道路建设施工", + }, + { + key: "7-7", + label: "收费站建设施工", + }, + { + key: "7-8", + label: "服务区建设施工", + }, + { + key: "7-9", + label: "枢纽立交匝道建设施工", + }, + { + key: "7-10", + label: "地方道路建设施工", + }, + ], + }; + config.options.options = ad[value] || []; + }, + }, + }, + { + label: "施工分类:", + key: "eventSubclass", + type: "RadioGroup", + isAlone: true, + required: true, + default: "7-1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "7-1", + label: "道路养护施工", + }, + { + key: "7-2", + label: "收费站养护施工", + }, + { + key: "7-3", + label: "服务区养护施工", + }, + { + key: "7-4", + label: "枢纽立交匝道养护施工", + }, + { + key: "7-5", + label: "地方道路养护施工", + }, + ], + }, + ons: { + input(value, ...args) { + const { data, formList } = args.slice(-1)[0]; + if (data.dcEventConstruction) { + data.dcEventConstruction.facilityId = null; + } + let facilityType = 1; + if (value == "7-2" || value == "7-7") { + facilityType = 1; + } else if (value == "7-3" || value == "7-8") { + facilityType = 6; + } else if (value == "7-4" || value == "7-9") { + facilityType = 3; + } + if (value && (value != "7-1" && value != "7-6")) { + //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 + request({ + url: `/business/facility/query?facilityType=${facilityType}`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let lwss = []; + result.data.forEach((it) => + lwss.push({ key: it.id, label: it.facilityName }) + ); + + formList.forEach((it) => { + if (it.key == "dcEventConstruction.facilityId") { + it.options.options = lwss; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败1", err); + }); + } + }, + }, + }, + { + label: "管制方式:", + key: "dcEventConstruction.controlMode", + type: "RadioGroup", + required: true, + default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "封闭", + }, + { + key: "2", + label: "不封闭", + }, + ], + }, + }, + PresetFormItems.isInTunnel, + { + //地点类型 + ...PresetFormItems.locationType, + key: "dcEventConstruction.locationType", + visible: (data) => { + if (data.eventSubclass == "7-1" || data.eventSubclass == "7-6") { + return true; + } + return false; + }, + }, + { + label: "施工方式:", + key: "dcEventConstruction.constructionMethod", + type: "RadioGroup", + isAlone: false, + required: true, + default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "车道", + }, + { + key: "2", + label: "其他", + }, + ], + }, + visible: (data) => { + if (data.eventSubclass == "7-2" || data.eventSubclass == "7-7") { + return true; + } + return false; + }, + }, + { + label: "通行情况:", + key: "dcEventConstruction.trafficCondition", + type: "RadioGroup", + isAlone: true, + required: true, + default: "1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "通行受限", + }, + { + key: "2", + label: "车辆谨慎慢行", + }, + { + key: "3", + label: "车辆正常通行", + }, + ], + }, + visible: (data) => { + if ( + data.eventSubclass == "7-2" || + data.eventSubclass == "7-7" || + data.eventSubclass == "7-4" || + data.eventSubclass == "7-9" + ) { + return true; + } + return false; + }, + }, + freeway, + directionName, + { + ...PresetFormItems.station, + visible: (data) => { + if ( + (data.eventSubclass == "7-1" || data.eventSubclass == "7-6") && + data?.dcEventConstruction.locationType == "1" + ) { + return true; + } + return false; + }, + }, + { + ...PresetFormItems.startEndStation, + visible: (data) => { + if ( + (data.eventSubclass == "7-1" || data.eventSubclass == "7-6") && + data?.dcEventConstruction.locationType == "2" + ) { + return true; + } + return false; + }, + }, + // PresetFormItems.emptyLine, + { + ...PresetFormItems.laneOccupancy, + required: true, + visible: (data) => { + if (data?.dcEventConstruction.controlMode == "2") { + return true; + } + return false; + }, + }, + { + label: "收费站:", + key: "dcEventConstruction.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data.eventSubclass == "7-2" || data.eventSubclass == "7-7") { + return true; + } + return false; + }, + }, + { + label: "出入口:", + key: "dcEventConstruction.exitsInlets", + type: "RadioGroup", + isAlone: false, + required: true, + default: "2", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "出口", + }, + { + key: "2", + label: "入口", + }, + ], + }, + visible: (data) => { + if (data.eventSubclass == "7-2" || data.eventSubclass == "7-7") { + return true; + } + return false; + }, + }, + { + label: "服务区:", + key: "dcEventConstruction.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data.eventSubclass == "7-3" || data.eventSubclass == "7-8") { + return true; + } + return false; + }, + }, + { + label: "地点:", + key: "dcEventConstruction.location", + isAlone: false, + required: true, + options: { + placeholder: "服务区地点", + }, + visible: (data) => { + if (data.eventSubclass == "7-3" || data.eventSubclass == "7-8") { + return true; + } + return false; + }, + }, + { + label: "立交桥:", + key: "dcEventConstruction.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data.eventSubclass == "7-4" || data.eventSubclass == "7-9") { + return true; + } + return false; + }, + ons: { + change(value, ...args) { + const { formList } = args.slice(-1)[0]; + + //匝道 + request({ + url: `/system/ramp/listAll?facilityId=${value}`, + method: "get", + }) + .then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let zd = []; + result.rows.forEach((it) => + zd.push({ key: it.id, label: it.rampName }) + ); + // console.log("zd", zd); + formList.forEach((it) => { + if (it.key == "dcEventConstruction.rampId") { + // console.log("it", it); + it.options.options = zd; + } + }); + }) + .catch((err) => { + console.log("err", err); + Message.error("查询失败3", err); + }); + }, + }, + }, + { + label: "匝道:", + key: "dcEventConstruction.rampId", + type: "select", + isAlone: false, + required: true, + options: { + options: [], + }, + visible: (data) => { + if (data.eventSubclass == "7-4" || data.eventSubclass == "7-9") { + return true; + } + return false; + }, + }, + { + label: "地方道路名称:", + key: "dcEventConstruction.localRoadName", + isAlone: true, + required: true, + options: {}, + visible: (data) => { + if (data.eventSubclass == "7-5" || data.eventSubclass == "7-10") { + return true; + } + return false; + }, + }, + { + label: "特殊地点描述:", + key: "dcEventConstruction.specialPlaceDescription", + isAlone: true, + options: { + type: "textarea", + autosize: true, + maxlength: 50, + autosize: { minRows: 6, maxRows: 6 }, + showWordLimit: true, + }, + }, + { + ...PresetFormItems.specialConstruction, + key: "dcEventConstruction.specialConstruction", + }, + { + label: "专项施工名称:", + key: "dcEventConstruction.otherConstructionName", + isAlone: true, + options: {}, + visible: (data) => { + if (data?.dcEventConstruction.specialConstruction == "4") { + return true; + } + return false; + }, + }, + { + ...PresetFormItems.constructionMeasurement, + key: "dcEventConstruction.constructionMeasurement", + visible: (data) => { + if (data.eventSubclass == "7-1" || data.eventSubclass == "7-6") { + return true; + } + return false; + }, + }, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.remark, + PresetFormItems.source, + ], + }, + }, + { + key: "ServiceAreaAbnormal", + label: "服务区异常", + formConfig: { + formOptions: { + column: 2, + }, + list: [ + { + label: "异常分类:", + key: "eventSubclass", + type: "RadioGroup", + isAlone: true, + required: true, + default: "8-1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "8-1", + label: "封闭、暂停营业", + }, + { + key: "8-2", + label: "重要设施停用", + }, + { + key: "8-3", + label: "其他异常", + }, + ], + }, + }, + freeway, + directionName, + { + label: "服务区:", + key: "dcEventServiceArea.facilityId", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "选项1", + label: "黄金糕", + }, + ], + }, + }, + { + label: "停用设施:", + key: "dcEventServiceArea.disableFacility", + type: "select", + isAlone: false, + required: true, + options: { + options: [ + { + value: "1", + label: "卫生间", + }, + { + value: "2", + label: "餐厅", + }, + { + value: "3", + label: "停车场", + }, + { + value: "4", + label: "加油站", + }, + { + value: "5", + label: "充电桩", + }, + ], + }, + visible: (data) => { + if (data?.eventSubclass == "8-2") { + return true; + } + return false; + }, + }, + { + label: "出入口:", + key: "dcEventServiceArea.exitsInlets", + type: "RadioGroup", + isAlone: true, + required: true, + default: "2", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "出口", + }, + { + key: "2", + label: "入口", + }, + ], + }, + }, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.remark, + PresetFormItems.source, + ], + }, + }, + { + key: "HiddenDangersEquipment", + label: "设施设备隐患", + formConfig: { + formOptions: { + column: 2, + }, + list: [ + { + label: "类型:", + key: "eventSubclass", + type: "RadioGroup", + isAlone: true, + required: true, + default: "9-1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "9-1", + label: "摄像机", + }, + { + key: "9-2", + label: "护栏", + }, + { + key: "9-3", + label: "隔离栅", + }, + { + key: "9-4", + label: "情报板", + }, + { + key: "9-5", + label: "防眩板", + }, + { + key: "9-6", + label: "其他", + }, + ], + }, + }, + { + label: "设备补充说明:", + key: "eventSourceTips", + isAlone: true, + options: { + type: "textarea", + autosize: true, + maxlength: 150, + autosize: { minRows: 6, maxRows: 6 }, + showWordLimit: true, + }, + required: true, + }, + freeway, + directionName, + PresetFormItems.station, + PresetFormItems.isInTunnel, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.problemDescription, + PresetFormItems.source, + ], + }, + }, + { + key: "AbnormalWeather", + label: "异常天气", + formConfig: { + formOptions: { + column: 2, + }, + list: [ + { + label: "异常天气:", + key: "eventSubclass", + type: "RadioGroup", + isAlone: true, + required: true, + default: "10-1", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "10-1", + label: "雨", + }, + { + key: "10-2", + label: "雪", + }, + { + key: "10-3", + label: "雾", + }, + { + key: "10-4", + label: "大风", + }, + { + key: "10-5", + label: "低温寒潮", + }, + { + key: "10-6", + label: "路面积雪", + }, + { + key: "10-7", + label: "路面结冰", + }, + { + key: "10-8", + label: "路面积水", + }, + { + key: "10-9", + label: "其他", + }, + ], + }, + ons: { + input(value, ...args) { + const { formList } = args.slice(-1)[0]; + const config = formList.find( + (it) => it.key == "dcEventAbnormalWeather.weatherSituation" + ); + let ad = { + "10-1": [ + { + key: "1-1", + label: "雨雾", + }, + { + key: "1-2", + label: "雨雪", + }, + { + key: "1-3", + label: "中雨", + }, + { + key: "1-4", + label: "小雨", + }, + { + key: "1-5", + label: "大雨", + }, + { + key: "1-6", + label: "暴雨", + }, + ], + "10-2": [ + { + key: "2-1", + label: "小雪", + }, + { + key: "2-2", + label: "中雪", + }, + { + key: "2-3", + label: "大雪", + }, + { + key: "2-4", + label: "暴雪", + }, + { + key: "2-5", + label: "大暴雪", + }, + { + key: "2-6", + label: "特大暴雪", + }, + ], + "10-3": [ + { + key: "3-1", + label: "轻雾", + }, + { + key: "3-2", + label: "大雾", + }, + { + key: "3-3", + label: "浓雾", + }, + { + key: "3-4", + label: "强浓雾", + }, + { + key: "3-5", + label: "团雾", + }, + ], + }; + config.options.options = ad[value]; + }, + }, + }, + { + ...PresetFormItems.weatherSituation, + key: "dcEventAbnormalWeather.weatherSituation", + }, + PresetFormItems.additionalNotes, + freeway, + directionName, + PresetFormItems.startEndStation, + { + label: "紧急级别:", + key: "dcEventAbnormalWeather.emergencyLevel", + required: true, + type: "select", + options: { + options: [ + { + value: "1", + label: "一般", + }, + { + value: "2", + label: "紧急", + }, + ], + }, + }, + PresetFormItems.isInTunnel, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.problemDescription, + PresetFormItems.source, + ], + }, + }, + { + key: "OtherEvents", + label: "其他事件", + formConfig: { + formOptions: { + column: 2, + }, + list: [ + { + label: "事件说明:", + key: "eventSourceTips", + isAlone: true, + options: { + type: "textarea", + autosize: true, + maxlength: 150, + autosize: { minRows: 6, maxRows: 6 }, + showWordLimit: true, + }, + }, + freeway, + directionName, + PresetFormItems.station, + PresetFormItems.isInTunnel, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.problemDescription, + PresetFormItems.source, + ], + }, + }, +]; + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js index e85a7360..d448735a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js @@ -404,8 +404,7 @@ export const tabConfigList = [ isAlone: false, required: true, options: { - options: [], - multiple: true, + options: [] }, visible: (data) => { if (data?.eventSubclass == "3-3") { @@ -451,6 +450,7 @@ export const tabConfigList = [ required: true, options: { options: [], + multiple: true, }, visible: (data) => { if (data?.eventSubclass == "3-3") { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue index 9fbab5d2..a0187096 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue @@ -78,12 +78,11 @@ export default { getDetail() { // 指挥调度 - 只有交通事件没有感知事件，感知事件完成后自动转为交通事件 request({ - url: `/dc/system/event/${this.detailId}`, + url: `/dc/system/event/eventSubclass/${this.detailId}`, method: "GET", }) .then((result) => { if (result.code != 200) return; - console.log(result,'###########') this.provideData.detail = result.data; console.log("这里是事件详情", this.provideData.detail); if ( diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js index 93c2b120..af3b7db9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js @@ -540,11 +540,11 @@ export const isInTunnel = { activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "1", + key: 1, label: "是", }, { - key: "0", + key: 0, label: "否", }, ], @@ -728,7 +728,6 @@ export const locationMode = { key: "dcEventAccident.locationType", required: true, type: "select", - default: "1", options: { options: [ { key: 1, label: "高速主线" }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js index 1e0550c1..6417c9b1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js @@ -858,8 +858,7 @@ export const tabConfigList = [ isAlone: false, required: true, options: { - options: [], - multiple: true, + options: [] }, visible: (data) => { if (data?.eventSubclass == "3-3") { @@ -905,6 +904,7 @@ export const tabConfigList = [ required: true, options: { options: [], + multiple: true, }, visible: (data) => { if (data?.eventSubclass == "3-3") { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue index 964a4986..1f74cea3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue @@ -4,16 +4,18 @@ - - -
- +
+ + + +
@@ -244,6 +246,11 @@ export default { display: flex; flex-direction: column; + .fader { + height: 500px; + overflow-y: auto; + } + .form { flex: 1; overflow-y: auto; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue index daf5a5d1..b48f5fb3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue @@ -214,7 +214,7 @@ export default { label: '事发上游最近' }, { - value: 3, + value: 4, label: '最近公里数' }, ], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue index bd094ed2..186e9b0e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue @@ -1,34 +1,315 @@ + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js index 93c2b120..65ba1656 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js @@ -728,7 +728,6 @@ export const locationMode = { key: "dcEventAccident.locationType", required: true, type: "select", - default: "1", options: { options: [ { key: 1, label: "高速主线" }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js index 1e0550c1..e1119726 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js @@ -858,8 +858,7 @@ export const tabConfigList = [ isAlone: false, required: true, options: { - options: [], - multiple: true, + options: [] }, visible: (data) => { if (data?.eventSubclass == "3-3") { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/ElQuarterPicker.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/ElQuarterPicker.vue index 65cd0296..767693bc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/ElQuarterPicker.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/ElQuarterPicker.vue @@ -101,7 +101,6 @@ }, watch: { value(val) { - // console.log('change-------', val) this.changeValue(val) }, readonly(val) { @@ -131,7 +130,6 @@ } }, mounted() { - // console.log('mounted--------', this.value) this.changeValue(this.value) // 设置文本框是否可编辑 @@ -345,7 +343,6 @@ }, // 季度选择 clickItem(item) { - // console.log('select--------', item) if (this.viewType === 1) { // 选择季度 this.$emit('change', this.formatTo([item.year, item.quarter], this.valueFormat)) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/ElQuarterPicker.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/ElQuarterPicker.vue index 65cd0296..767693bc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/ElQuarterPicker.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/ElQuarterPicker.vue @@ -101,7 +101,6 @@ }, watch: { value(val) { - // console.log('change-------', val) this.changeValue(val) }, readonly(val) { @@ -131,7 +130,6 @@ } }, mounted() { - // console.log('mounted--------', this.value) this.changeValue(this.value) // 设置文本框是否可编辑 @@ -345,7 +343,6 @@ }, // 季度选择 clickItem(item) { - // console.log('select--------', item) if (this.viewType === 1) { // 选择季度 this.$emit('change', this.formatTo([item.year, item.quarter], this.valueFormat)) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue index 2f4af1bc..e380e36b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue @@ -35,7 +35,6 @@ export default { }) .then((result) => { if (result.code != 200) return; - // console.log(result,'-----------------') let sdata = [[],[],[],[],[],[],[]] for(let i of result.data){ sdata[i.publishChannels-1].push(i.number) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue index 0609ad9f..422b8f73 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue @@ -20,7 +20,8 @@ :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
- +
+
@@ -31,7 +32,7 @@ - +
- +
{ @@ -222,7 +223,7 @@ export default {