diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue index 53202380..6a223d83 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue @@ -31,7 +31,8 @@ export default { for (const key in callbacks) { result[key] = (...args) => callbacks[key](...args, { data: this.getFormData(), - formList: this.parent.formList + formList: this.parent.formList, + self: this }) } 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 80c6e030..1fcdedac 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 @@ -1,4 +1,5 @@ -import { options } from "runjs"; +import request from '@/utils/request' +import { Message } from "element-ui"; export const source = { label: "来源:", @@ -713,6 +714,42 @@ export const locationMode = { { key: "4", label: "收费站" }, ], }, + 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); + }) + } + + }, + }, }; export const route = { @@ -1130,7 +1167,7 @@ export const congestionCause = { label: "备注项添加", }, ], - 2 : [ + 2: [ { key: "1", label: "主线车流量大", @@ -1139,9 +1176,9 @@ export const congestionCause = { key: "2", label: "收费站出口车流量大导致主线压车", }, - ] - } - config.options.options = (value != 1 ? ad[1] : ad[2]); + ], + }; + config.options.options = value != 1 ? ad[1] : ad[2]; }, }, }; 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 9cfe7f00..6d4420b0 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 @@ -67,7 +67,43 @@ export const tabConfigList = [ 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); + // }) + } + + }, + }, }, { label: "匝道:", 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 8176fa4f..9c94e6d4 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 @@ -49,7 +49,8 @@ export default { tabConfigList, index: 1, roads: [], - direction: [] + direction: [], + lwss: [] } }, created() { @@ -77,6 +78,7 @@ export default { methods: { initData() { return Promise.all([ + //道路 request({ url: `/business/road/query`, method: "get", @@ -85,10 +87,10 @@ export default { result.data.forEach(it => { this.roads.push({ key: it.id, label: it.roadName }) }) - }) - .catch((err) => { - Message.error("查询失败", err); - }), + }).catch((err) => { + Message.error("查询失败", err); + }), + //方向字典 request({ url: `/system/dict/data/type/iot_event_direction`, method: "get", @@ -97,10 +99,20 @@ export default { result.data.forEach(it => { this.direction.push({ key: it.dictValue, label: it.dictLabel }) }) + }).catch((err) => { + Message.error("查询失败", err); + }), + //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 + request({ + url: `/business/facility/query`, + 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 })) + }).catch((err) => { + Message.error("查询失败", err); }) - .catch((err) => { - Message.error("查询失败", err); - }) + ]) }, handleChange({ index }) { @@ -108,30 +120,6 @@ export default { this.index = index; let formConfig = tabConfigList[index].formConfig; - if (index == 0 || index == 1 || index == 7) { - let fwq = []; - - request({ - url: `/business/facility/query?facilityType=6`, - method: "get" - }).then((result) => { - if (result.code != 200) return Message.error(result?.msg); - result.data.forEach(it => { - fwq.push({ key: it.id, label: it.facilityName }) - }) - }) - .catch((err) => { - Message.error("查询失败", err); - }); - - formConfig.list.forEach(it => { - if (it.key === 'dcEventServiceArea.facilityId' || it.key === 'dcEventAccident.facilityId') { - it.options.options = fwq; - } - }) - - } - formConfig.list.forEach(it => { if (it.key == 'direction') { it.options.options = this.direction; @@ -139,6 +127,15 @@ export default { if (it.key == 'roadId') { it.options.options = this.roads; } + if (index == 7 || it.key === 'dcEventServiceArea.facilityId') { + it.options.options = this.lwss.filter(ss => ss.type == 6); + } + // if (index == 0 || index == 1 || index == 7) { + // if (it.key === 'dcEventAccident.facilityId' || it.key === 'dcEventVehicleAccident.facilityId' || it.key === 'dcEventServiceArea.facilityId') { + // it.options.options = this.lwss.filter(ss => ss.type == 6); + // } + // } + }) this.formConfig = formConfig; 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 d4e18d36..f958b6f8 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 @@ -1,6 +1,35 @@ import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js"; import { merge, cloneDeep } from "lodash"; +const station = { + 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]", + }, + ], + }, +}; + export const tabMap = { "-1": { state: 5, @@ -86,7 +115,7 @@ export const gjSearchFormList = [ }, }, { - ...PresetFormItems.station, + ...station, label: "桩号:", required: false, }, @@ -142,11 +171,11 @@ export const gzSearchFormList = [ }, }, { - ...PresetFormItems.station, + ...station, label: "开始桩号:", required: false, }, - merge(cloneDeep(PresetFormItems.station), { + merge(cloneDeep(station), { options: { options: [ { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js index 2b30e267..09d1e5cc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js @@ -4,6 +4,7 @@ var data1 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15]; var data2 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15]; var options = { tooltip: { + show:true // trigger: "axis", // backgroundColor: 'rgba(17,95,182,0.5)', // textStyle: { @@ -238,6 +239,8 @@ var options = { }, symbolPosition: "end", data: data1, + tooltip: { + show:false} }, { name: "增涨率", @@ -269,6 +272,8 @@ var options = { opacity: 0.7, }, data: [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18], + tooltip: { + show:false} }, ], }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue index a74e198f..b974fb6f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue @@ -14,14 +14,14 @@ - + - + - +