From 629e682694d7cbdd21c4d207cd8a326b2887ecbc Mon Sep 17 00:00:00 2001 From: zhoule Date: Thu, 22 Feb 2024 18:03:00 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/event/FormEvent/PresetFormItems.js | 20 +- .../control/event/event/FormEvent/data.js | 1184 ++++++++++++++--- .../control/event/event/FormEvent/index.vue | 39 +- 3 files changed, 1017 insertions(+), 226 deletions(-) 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 1fcdedac..b1abf167 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 @@ -716,7 +716,13 @@ export const locationMode = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; + const { data, formList } = args.slice(-1)[0]; + if(data.dcEventAccident) { + data.dcEventAccident.facilityId = null; + } + if(data.dcEventVehicleAccident) { + data.dcEventVehicleAccident.facilityId = null; + } let facilityType = 1; if (value == 2) { @@ -744,7 +750,7 @@ export const locationMode = { }).catch((err) => { console.log('err',err) - Message.error("查询失败", err); + Message.error("查询失败1", err); }) } @@ -1129,9 +1135,9 @@ export const congestionCause = { }, ons: { input(value, ...args) { - console.log(value); + // console.log(value); const { formList } = args.slice(-1)[0]; - const config = formList.find((it) => it.key == "xxyy"); + const config = formList.find((it) => it.key == "detailedReasons"); let ad = { 1: [ { @@ -1181,4 +1187,10 @@ export const congestionCause = { config.options.options = value != 1 ? ad[1] : ad[2]; }, }, + visible: (data) => { + if (data?.eventSubclass != '4-1') { + return false; + } + return true; + }, }; 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 6d4420b0..a1ff8c8c 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 @@ -1,4 +1,53 @@ import * as PresetFormItems from "./PresetFormItems"; +import request from "@/utils/request"; +import { Message } from "element-ui"; + +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 = [ { @@ -6,11 +55,23 @@ export const tabConfigList = [ label: "交通事故", formConfig: { list: [ - { ...PresetFormItems.callPolicePersonName, key: 'dcEventAccident.reporterName' }, - { ...PresetFormItems.callPolicePersonPhone, key: 'dcEventAccident.reporterPhoneNumber' }, - { ...PresetFormItems.trafficAccidentType, key: 'dcEventAccident.accidentType' }, + { + ...PresetFormItems.callPolicePersonName, + key: "dcEventAccident.reporterName", + }, + { + ...PresetFormItems.callPolicePersonPhone, + key: "dcEventAccident.reporterPhoneNumber", + }, + { + ...PresetFormItems.trafficAccidentType, + key: "dcEventAccident.accidentType", + }, PresetFormItems.eventLevel, - { ...PresetFormItems.locationMode, key: 'dcEventAccident.locationType' }, + { + ...PresetFormItems.locationMode, + key: "dcEventAccident.locationType", + }, PresetFormItems.freeway, { label: "服务区:", @@ -26,12 +87,12 @@ export const tabConfigList = [ }, ], }, - visible:(data) => { - if(data?.dcEventAccident?.locationType == 2){ - return true; + visible: (data) => { + if (data?.dcEventAccident?.locationType == 2) { + return true; } return false; - } + }, }, { label: "地点:", @@ -41,12 +102,12 @@ export const tabConfigList = [ options: { placeholder: "服务区地点", }, - visible:(data) => { - if(data?.dcEventAccident?.locationType == 2){ - return true; + visible: (data) => { + if (data?.dcEventAccident?.locationType == 2) { + return true; } return false; - } + }, }, { label: "立交桥:", @@ -62,46 +123,39 @@ export const tabConfigList = [ }, ], }, - visible:(data) => { - if(data?.dcEventAccident?.locationType == 3){ - return true; + visible: (data) => { + if (data?.dcEventAccident?.locationType == 3) { + return true; } return false; }, ons: { change(value, ...args) { const { formList } = args.slice(-1)[0]; - - let facilityType = 1; - if (value == 2) { - facilityType = 6; - } else if (value == 3) { - facilityType = 3; - } else if (value == 4) { - facilityType = 1; - } - if(value && value != 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 == "dcEventAccident.facilityId" || it.key == "dcEventVehicleAccident.facilityId"){ - // it.options.options = lwss; - // } - // }); - - // }).catch((err) => { - // console.log('err',err) - // Message.error("查询失败", err); - // }) - } - + + //匝道 + 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); + }); }, }, }, @@ -112,13 +166,14 @@ export const tabConfigList = [ isAlone: false, required: true, options: { + options: [], }, - visible:(data) => { - if(data?.dcEventAccident?.locationType == 3){ - return true; + visible: (data) => { + if (data?.dcEventAccident?.locationType == 3) { + return true; } return false; - } + }, }, { label: "收费站:", @@ -134,12 +189,12 @@ export const tabConfigList = [ }, ], }, - visible:(data) => { - if(data?.dcEventAccident?.locationType == 4){ - return true; + visible: (data) => { + if (data?.dcEventAccident?.locationType == 4) { + return true; } return false; - } + }, }, { label: "地点:", @@ -149,44 +204,56 @@ export const tabConfigList = [ required: true, options: { placeholder: "收费站地点", - options: [ - { - value: "1", - label: "入口车道", - }, - { - value: "2", - label: "出口车道", - }, - ], + options: locationSelect, }, - visible:(data) => { - if(data?.dcEventAccident?.locationType == 4){ - return true; + visible: (data) => { + if (data?.dcEventAccident?.locationType == 4) { + return true; } return false; - } + }, }, PresetFormItems.direction, 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.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.vehicleCondition("dcEventAccident"), + PresetFormItems.casualties("dcEventAccident"), PresetFormItems.eventTitle, PresetFormItems.eventDesc, PresetFormItems.source, @@ -199,25 +266,192 @@ export const tabConfigList = [ formConfig: { formOptions: {}, list: [ - { ...PresetFormItems.callPolicePersonName, key: 'dcEventVehicleAccident.reporterName' }, - { ...PresetFormItems.callPolicePersonPhone, key: 'dcEventVehicleAccident.reporterPhoneNumber' }, + { + ...PresetFormItems.callPolicePersonName, + key: "dcEventVehicleAccident.reporterName", + }, + { + ...PresetFormItems.callPolicePersonPhone, + key: "dcEventVehicleAccident.reporterPhoneNumber", + }, PresetFormItems.vehicleMalfunctionType, PresetFormItems.eventLevel, - { ...PresetFormItems.locationMode, key: 'dcEventVehicleAccident.locationType' }, + { + ...PresetFormItems.locationMode, + key: "dcEventVehicleAccident.locationType", + }, PresetFormItems.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; + }, + }, PresetFormItems.direction, PresetFormItems.station, 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.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.vehicleCondition("dcEventVehicleAccident"), + PresetFormItems.casualties("dcEventVehicleAccident"), PresetFormItems.eventTitle, PresetFormItems.eventDesc, PresetFormItems.source, @@ -238,6 +472,7 @@ export const tabConfigList = [ type: "RadioGroup", isAlone: true, required: true, + default: "3-1", options: { activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ @@ -266,6 +501,7 @@ export const tabConfigList = [ type: "RadioGroup", isAlone: true, required: true, + default: "1", options: { activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ @@ -279,6 +515,85 @@ export const tabConfigList = [ }, ], }, + ons: { + input(value, ...args) { + const { data, formList } = args.slice(-1)[0]; + const config = 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]; + config.options.options = ad[value]; + }, + }, }, { label: "分类:", @@ -286,6 +601,7 @@ export const tabConfigList = [ type: "RadioGroup", isAlone: true, required: true, + default: "1", options: { activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ @@ -318,6 +634,7 @@ export const tabConfigList = [ type: "RadioGroup", isAlone: true, required: true, + default: "1", options: { activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ @@ -347,6 +664,61 @@ export const tabConfigList = [ }, ], }, + 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, { @@ -354,53 +726,64 @@ export const tabConfigList = [ key: "dcEventTrafficControl.causeType", type: "select", options: { - options: [ - { - 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: "沙尘暴", - }, - { - value: "4-1", - label: "专项工程施工", - }, + options: [], + }, + visible: (data) => { + if ( + data?.dcEventTrafficControl.controlCause == "3" || + data?.dcEventTrafficControl.controlCause == "4" + ) { + return true; + } + return false; + }, + }, + PresetFormItems.freeway, + PresetFormItems.direction, + PresetFormItems.emptyLine, + { + label: "出入口:", + key: "dcEventTrafficControl.controlCause", + type: "RadioGroup", + isAlone: true, + required: true, + default: "2", + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ { - value: "4-2", - label: "改扩建工程施工", + key: "1", + label: "出口", }, { - value: "4-3", - label: "其他施工", + key: "2", + label: "入口", }, - ] - } + ], + }, + 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-2") { + return true; + } + return false; + }, }, - PresetFormItems.freeway, - PresetFormItems.direction, - PresetFormItems.emptyLine, { label: "措施:", required: true, @@ -412,34 +795,154 @@ export const tabConfigList = [ value: "1", label: "临时关闭", }, + ], + }, + }, + { + label: "限制类型:", + key: "dcEventAccident.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: "dcEventAccident.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: "三类以上班线客车" }, { - value: "2", - label: "限行车辆", - }, - { - value: "3", - label: "限行车道", - }, - { - value: "4", - label: "限行车道且限行车辆", - }, - { - value: "5", - 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: [ { - value: "6", - label: "并道行驶", + prefix: { + text: "K", + style: { + color: "#3DE8FF", + }, + }, + key: "stakeMark[0]", }, { - value: "7", - label: "限速", + prefix: { + text: "+", + style: { + color: "#3DE8FF", + }, + }, + key: "stakeMark[1]", }, ], }, + visible: (data) => { + if (data?.eventSubclass == '3-1') { + return true; + } + return false; + }, }, - PresetFormItems.station, PresetFormItems.startTime, PresetFormItems.expectedEndTime, PresetFormItems.remark, @@ -481,11 +984,47 @@ export const tabConfigList = [ }, ], }, + 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", }, - { ...PresetFormItems.congestionCause, key: 'dcEventTrafficCongestion.congestionCause' }, { label: "详细原因:", - key: "xxyy", + key: "detailedReasons", type: "RadioGroup", isAlone: true, required: true, @@ -527,14 +1066,162 @@ export const tabConfigList = [ }, ], }, - visible:(data) => { - if(data?.dcEventTrafficCongestion?.congestionCause == 1 || data?.dcEventTrafficCongestion?.congestionCause == 6){ + 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", @@ -555,6 +1242,12 @@ export const tabConfigList = [ }, ], }, + visible: (data) => { + if (data?.eventSubclass == "4-1") { + return true; + } + return false; + }, }, { label: "桩号:", @@ -583,12 +1276,12 @@ export const tabConfigList = [ }, ], }, - visible:(data) => { - if(data?.locationType != 1){ - return false; + visible: (data) => { + if (data?.eventSubclass == "4-1" && data?.locationType == 1) { + return true; } - return true; - } + return false; + }, }, { label: "起止桩号:", @@ -636,13 +1329,80 @@ export const tabConfigList = [ }, ], }, - visible:(data) => { - if(data?.locationType == 2){ + 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", @@ -784,31 +1544,34 @@ export const tabConfigList = [ }, ], }, - ons:{ - input(value, ...args){ + 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: [ + 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: "道路建设施工", @@ -828,11 +1591,12 @@ export const tabConfigList = [ { key: "7-10", label: "地方道路建设施工", - } - ]}; - config.options.options = ad[value] || [] - } - } + }, + ], + }; + config.options.options = ad[value] || []; + }, + }, }, { label: "施工分类:", @@ -887,7 +1651,10 @@ export const tabConfigList = [ }, }, PresetFormItems.isInTunnel, - { ...PresetFormItems.locationType, key: 'dcEventConstruction.locationType' }, + { + ...PresetFormItems.locationType, + key: "dcEventConstruction.locationType", + }, PresetFormItems.freeway, PresetFormItems.direction, PresetFormItems.station, @@ -904,8 +1671,14 @@ export const tabConfigList = [ showWordLimit: true, }, }, - { ...PresetFormItems.specialConstruction, key: 'dcEventConstruction.specialConstruction' }, - { ...PresetFormItems.constructionMeasurement, key: 'dcEventConstruction.constructionMeasurement' }, + { + ...PresetFormItems.specialConstruction, + key: "dcEventConstruction.specialConstruction", + }, + { + ...PresetFormItems.constructionMeasurement, + key: "dcEventConstruction.constructionMeasurement", + }, PresetFormItems.startTime, PresetFormItems.expectedEndTime, PresetFormItems.remark, @@ -1113,7 +1886,10 @@ export const tabConfigList = [ ], }, }, - { ...PresetFormItems.weatherSituation, key: 'dcEventAbnormalWeather.weatherSituation' }, + { + ...PresetFormItems.weatherSituation, + key: "dcEventAbnormalWeather.weatherSituation", + }, PresetFormItems.additionalNotes, PresetFormItems.freeway, PresetFormItems.direction, @@ -1133,8 +1909,8 @@ export const tabConfigList = [ value: "2", label: "紧急", }, - ] - } + ], + }, }, PresetFormItems.isInTunnel, PresetFormItems.startTime, @@ -1175,6 +1951,4 @@ export const tabConfigList = [ ], }, }, - - ]; 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 9c94e6d4..65da9a77 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 @@ -88,7 +88,7 @@ export default { this.roads.push({ key: it.id, label: it.roadName }) }) }).catch((err) => { - Message.error("查询失败", err); + Message.error("查询失败4", err); }), //方向字典 request({ @@ -100,7 +100,7 @@ export default { this.direction.push({ key: it.dictValue, label: it.dictLabel }) }) }).catch((err) => { - Message.error("查询失败", err); + Message.error("查询失败5", err); }), //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 request({ @@ -108,9 +108,10 @@ export default { method: "get" }).then((result) => { if (result.code != 200) return Message.error(result?.msg); - result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: facilityType })) + result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: it.facilityType })) }).catch((err) => { - Message.error("查询失败", err); + console.log('err', err) + Message.error("查询失败6", err); }) ]) @@ -148,9 +149,15 @@ export default { if (this.index == 0 || this.index == 1) { formData.lang = formData.lang.join(',') } - if (this.index == 9) { + if (formData.endStakeMark) { let endStakeMark = formData.endStakeMark; - formData.dcEventAbnormalWeather.endStakeMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : ''; + let strMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : ''; + if (this.index == 3) { + formData.dcEventTrafficCongestion.endStakeMark = strMark; + } + if (this.index == 9) { + formData.dcEventAbnormalWeather.endStakeMark = strMark; + } formData.endStakeMark = ''; } // console.log('formData',formData) @@ -163,19 +170,17 @@ export default { data: { ...formData, eventType: Number(this.index) + 1, - stakeMark: (stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '', + stakeMark: stakeMark ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '', } + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + Message.success("提交成功"); + this.modelVisible = false; + }).catch(() => { + Message.error("提交失败"); + }).finally(() => { + this.submitting = false; }) - .then((result) => { - if (result.code != 200) return Message.error(result?.msg); - Message.success("提交成功"); - this.modelVisible = false; - }) - .catch(() => { - Message.error("提交失败"); - }).finally(() => { - this.submitting = false; - }) }) From 954b94410b1e2c10bb3a38da70d1538d99b1b228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Thu, 22 Feb 2024 18:05:54 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E2=80=9C=E6=96=B0=E5=A2=9E=E2=80=9D=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=86=85=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Card.vue | 6 +++- .../PublishingChannelManagement/index.vue | 30 +++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue index 8522d4d8..fa854f02 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue @@ -16,7 +16,10 @@
- + +
@@ -96,6 +99,7 @@ export default { width: 100%; align-items: center; justify-content: flex-end; + gap: 6px; } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue index 7b8848e4..0b03b1a7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue @@ -2,12 +2,20 @@
- - - 刷新 - +
+ + + 新增 + + + + 刷新 + +
@@ -38,6 +46,12 @@ export default { Card, ButtonGradient }, + methods: { + handleOpenDialogAddEdit(data) { + this.addNEditDialogVisible = true; + this.dialogData = data; + }, + } } @@ -56,6 +70,10 @@ export default { height: 60px; display: flex; justify-content: space-between; + div { + display: flex; + gap: 6px; + } } .body { From 45cfd53d53c4bd0a50fa8c460838bc0e2b8538a5 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 23 Feb 2024 09:24:42 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=97=A5=E4=BA=8B=E4=BB=B6=E5=A4=84?= =?UTF-8?q?=E7=BD=AE=E5=8D=A0=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/control/event/event/index.vue | 12 ++++++++++++ .../components/dailyDisposal/assets/charts.js | 4 ++-- .../components/dailyDisposal/index.vue | 9 +++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index e60d42f8..a576320e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -87,6 +87,11 @@ const directionMapping = { '2': '中', '3': '下行' } +const gzDirectionMapping = { + '1': '菏泽方向', + '2': '双向', + '3': '济南方向' +} const warningStateMapping = { 1: '上报', 2: '已完成', @@ -205,6 +210,13 @@ export default { params: this.searchData, }).then((result) => { if (result.code != 200) return Message.error(result?.msg); + result.rows.forEach(it => { + it.stringDirection = gzDirectionMapping[it.direction] || it.direction; + // if (it.otherConfig) { + // let otherConfig = JSON.parse(it.otherConfig); + // it.pictures = otherConfig.pictures || []; + // } + }) this.data = result.rows; this.total = result.total; }); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js index d942d30c..c935e8b8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js @@ -66,7 +66,7 @@ var options = { { name: "", type: "pie", - radius: "120px", + radius: "60px", width: "200px", center: ["130px", "50%"], roseType: "radius", @@ -111,7 +111,7 @@ var options = { { name: "", type: "pie", - radius: "130px", + radius: "70px", hoverAnimation: false, emphasis: { scale: false }, center: ["130px", "50%"], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue index bef82428..96e1de1c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue @@ -66,6 +66,7 @@ export default { for (let i = 0; i < data.length; i++) { let it = data[i]; if (it.warningState == 1) { + // it.number = 86; echartsData.push({ name: "上报", value: it.number @@ -141,10 +142,10 @@ export default { context.lineWidth = 1; // 设置线段宽度 // 绘制圆角矩形 - drawRoundRect(context, 242, 36, 180, 24, 12, gr) - drawRoundRect(context, 242, 63, 180, 24, 12, gr) - drawRoundRect(context, 242, 90, 180, 24, 12, gr) - drawRoundRect(context, 242, 117, 180, 24, 12, gr) + drawRoundRect(context, 230, 36, 180, 24, 12, gr) + drawRoundRect(context, 230, 63, 180, 24, 12, gr) + drawRoundRect(context, 230, 90, 180, 24, 12, gr) + drawRoundRect(context, 230, 117, 180, 24, 12, gr) }); }); }, From 2beda874d9200c5116904f9bccec30361823ed2b Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 23 Feb 2024 10:04:53 +0800 Subject: [PATCH 04/10] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/event/event/FormEvent/data.js | 179 +++++++++++++++--- .../pages/control/event/event/data.js | 2 +- 2 files changed, 158 insertions(+), 23 deletions(-) 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 a1ff8c8c..274eccb1 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 @@ -494,6 +494,81 @@ export const tabConfigList = [ }, ], }, + 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 = 3; + } 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: "管制分类:", @@ -518,7 +593,7 @@ export const tabConfigList = [ ons: { input(value, ...args) { const { data, formList } = args.slice(-1)[0]; - const config = formList.find( + const classify = formList.find( (it) => it.key == "dcEventTrafficControl.classify" ); const measure = formList.find( @@ -591,7 +666,7 @@ export const tabConfigList = [ ], }; measure.options.options = cs[value]; - config.options.options = ad[value]; + classify.options.options = ad[value]; }, }, }, @@ -608,24 +683,7 @@ export const tabConfigList = [ { key: "1", label: "主线关闭", - }, - { - key: "2", - label: "主线限行", - }, - { - key: "3", - label: "主线间隔放行", - }, - { - key: "4", - label: "主线并道", - }, - { - key: "5", - label: "主线限速", - }, - ], + },], }, }, { @@ -743,7 +801,7 @@ export const tabConfigList = [ PresetFormItems.emptyLine, { label: "出入口:", - key: "dcEventTrafficControl.controlCause", + key: "dcEventTrafficControl.exitsInlets", type: "RadioGroup", isAlone: true, required: true, @@ -762,7 +820,7 @@ export const tabConfigList = [ ], }, visible: (data) => { - if (data?.eventSubclass == "3-2") { + if (data?.eventSubclass == "3-2" || data?.eventSubclass == "3-4") { return true; } return false; @@ -784,6 +842,83 @@ export const tabConfigList = [ 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, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js index f958b6f8..a5423158 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js @@ -109,7 +109,7 @@ export const gjSearchFormList = [ required: false, type: "datePicker", options: { - type: "daterange", + type: "datetimerange", format: "yyyy-MM-dd HH:mm:ss", valueFormat: "yyyy-MM-dd HH:mm:ss", }, From 26308c4c78efebd26260d2fe6b3127d570d920e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Fri, 23 Feb 2024 10:53:15 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E4=B8=AD=E5=8D=95=E9=80=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=80=89=E4=B8=AD=E5=90=8E=E7=9A=84=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=B8=BA=E7=99=BD=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/assets/styles/JiHeExpressway.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss index f12ce990..0105eb62 100644 --- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss +++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss @@ -133,7 +133,8 @@ .el-radio__label{ color: #fff; } &.is-checked{ .el-radio__label { - color: #3de8ff; + // color: #3de8ff; + color: #fff; } } } From c87f3b87c24220f399c6e996724d8aa0aa31ba88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Fri, 23 Feb 2024 10:58:59 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=8D=8F=E8=B0=83=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/event/coordinateSchedulingRecords/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue index d986cb28..be94807d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue @@ -9,7 +9,7 @@ 刷新 - +
@@ -30,6 +30,8 @@ import InputSearch from '@screen/components/InputSearch/index.vue'; import Card from './components/Card/index.vue'; import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue'; +import { searchFormList } from "./data"; + export default { name: 'CoordinateSchedulingRecords', components: { @@ -40,6 +42,7 @@ export default { }, data() { return { + searchFormList, eventDetailDialogVisible: false } }, From 298c698a05b999824b80d0bd4b79a54f238a4d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Fri, 23 Feb 2024 11:02:01 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE,?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiHeExpressway/common/PresetFormItems.js | 18 ++++++ .../PublishingChannelManagement/data.js | 56 +++++++++++++++++++ .../PublishingChannelManagement/index.vue | 14 ++++- 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/data.js diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js index 09ec829d..7f61b9c2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js @@ -41,6 +41,24 @@ export const source = { }, }; +export const releaseChannel = { + label: "发布渠道:", + key: "channel", + type: "CheckboxGroup", + isAlone: true, + default: [], + options: { + options: [ + { key: "1", label: "微博" }, + { key: "3", label: "微信小程序" }, + { key: "4", label: "服务网站" }, + { key: "5", label: "情报板" }, + { key: "6", label: "手机短信" }, + { key: "7", label: "微信公众号" }, + ], + }, +}; + export const illegalTriggeringType = { label: "类型:", key: "eventSubclass", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/data.js new file mode 100644 index 00000000..09ad820f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/data.js @@ -0,0 +1,56 @@ +import * as PresetFormItems from "@screen/common/PresetFormItems.js"; +import { merge, cloneDeep } from "lodash"; + +export const searchFormList = [ + { + label: "启用日期:", + key: "daterange", + required: false, + type: "datePicker", + options: { + type: "daterange", + format: "yyyy-MM-dd HH:mm:ss", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + }, + PresetFormItems.eventType, + PresetFormItems.releaseChannel, + { + label: "信息级别:", + key: "level", + type: "RadioGroup", + isAlone: true, + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "影响通行", + }, + { + key: "2", + label: "不影响通行", + }, + ], + }, + }, + { + label: "启用状态:", + key: "status", + type: "RadioGroup", + isAlone: true, + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ + { + key: "1", + label: "启用", + }, + { + key: "2", + label: "停用", + }, + ], + }, + }, +]; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue index 0b03b1a7..f5aefd76 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue @@ -17,7 +17,7 @@ - + @@ -29,6 +29,9 @@
+ + + @@ -38,6 +41,8 @@ import InputSearch from '@screen/components/InputSearch/index.vue'; import Card from './components/Card'; import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue'; +import { searchFormList } from './data'; + export default { name: 'PublishingChannelManagement', components: { @@ -46,6 +51,13 @@ export default { Card, ButtonGradient }, + data() { + return { + searchFormList, + addNEditDialogVisible: false, + dialogData: null + } + }, methods: { handleOpenDialogAddEdit(data) { this.addNEditDialogVisible = true; From 70130583d9653191dd453d5632e5c94eb11ea529 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 23 Feb 2024 14:11:28 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/event/perceiveEvent.js | 2 +- .../components/RoadStateCard/index.vue | 23 +++++++++++---- .../JiHeExpressway/components/Video/index.vue | 6 +++- .../EventDetailDialog/Carousel/index.vue | 4 +-- .../event/event/EventDetailDialog/index.vue | 29 ++++++++++++------- .../pages/control/event/event/index.vue | 8 ++--- .../components/eventQuery/index copy.vue | 2 +- .../components/eventQuery/index.vue | 2 +- 8 files changed, 51 insertions(+), 25 deletions(-) diff --git a/ruoyi-ui/src/api/event/perceiveEvent.js b/ruoyi-ui/src/api/event/perceiveEvent.js index 7a147f24..c8336aa6 100644 --- a/ruoyi-ui/src/api/event/perceiveEvent.js +++ b/ruoyi-ui/src/api/event/perceiveEvent.js @@ -165,7 +165,7 @@ export function geTwarningTotal(query) { export function getRoadSectionList(query) { //system/status/tablist return request({ - url: '/business/roadSection/list', + url: '/business/roadSection/listAll', method: 'get', params: { ...query, diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue index 6126f45b..e0acb02b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue @@ -2,7 +2,7 @@
- +
@@ -15,10 +15,10 @@
-
@@ -82,7 +82,7 @@ export default { ]) } }, - data(){ + data() { return { picUrl: './test.png' } @@ -94,6 +94,19 @@ export default { }, created() { this.statusMap = statusMap; + }, + methods: { + getFirstBtnText(state) { + let text = '详情'; + if(state == 5) text = '去确认' + if(state == 4) text = '详情' + if(state == 3) text = '处置记录' + return text; + }, + getLastBtnText(state) { + let text = '去处置'; + return text; + }, } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue index a47c01f4..83f0da7e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue @@ -1,6 +1,6 @@