diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js index 89ccd0e4..fabf1536 100644 --- a/ruoyi-ui/src/common/menuData.js +++ b/ruoyi-ui/src/common/menuData.js @@ -113,18 +113,6 @@ export default [ path: "/control/device/strategy", name: "controlDeviceStrategy", component: "control/device/strategy/index.vue", - }, - { - title: "网络拓扑", - name: "controlDeviceTopology", - path: "/control/device/topology", - component: "control/device/topology/index.vue" - }, - { - title: "设备管理", - name: "controlDeviceMange", - path: "/control/device/manage", - component: "control/device/manage/index.vue" } ], }, @@ -163,14 +151,8 @@ export default [ { title:"收费运营", name:"fee", - children:[ - { - title: "统计分析", - name: "feeStatistic", - path: "/maintain/fee/statistic", - component: "maintenanceOperations/chargeableOperations/index.vue", - } - ] + path: "/maintain/fee", + component: "maintenanceOperations/chargeableOperations/index.vue" },{ title:"智能养护", name:"smart", @@ -179,7 +161,19 @@ export default [ title: "统计分析", name: "smartStatistic", path: "/maintain/smart/statistic", - component: "maintenanceOperations/statisticalAnalysis/index.vue", + component: "maintenanceOperations/smart/statisticalAnalysis/index.vue", + }, + { + title: "网络拓扑", + name: "smartTopology", + path: "/maintain/smart/topology", + component: "maintenanceOperations/smart/topology/index.vue" + }, + { + title: "设备管理", + name: "smartDeviceMange", + path: "/maintain/smart/manage", + component: "maintenanceOperations/smart/manage/index.vue" } ] }, { diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue index 4b6bff56..dbd28147 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue @@ -68,8 +68,14 @@ export default { computed: { }, mounted() { + //添加全局事件监听 + this.$root.$on('refresh-event', this.getMainData); this.getMainData(); }, + beforeDestroy() { + // 在实例销毁前移除事件监听，防止内存泄漏 + this.$root.$off('refresh-event', this.getMainData); + }, methods: { onChangeTab(tab, event) { console.log(tab, event); diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue b/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue index 7b513421..548f436f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue @@ -35,15 +35,16 @@ export default { showNotify(para){ let _this = this; let eventType = ["trafficAccident", "vehicleBroken", "trafficControl", "trafficJam", "illegalVehicle", "barrierClear", "construction", "serviceAreaAbnormal", "equipmentTrouble", "abnormalWeather", "otherEvent"]; + let time = para.subEvent == "0" ? para.content.event.occurrenceTime : para.content.event.warningTime; let obj = { content: para.content.content, - time: para.subEvent == "0" ? para.content.event.occurrenceTime : para.content.event.warning_time, + time, // moment().format("yyyy-MM-DD hh:mm"), type: para.subEvent == '1' ? "signal" : eventType[para.content.event.eventType*1-1], level: ["danger", "info"][para.subEvent*1], duration: para.subEvent == "0" ? 0 : 4000 } - + this.speak(time + '' + para.content.content); _this.notifications[_this.notifyIndex] = _this.$notify({ title: '', dangerouslyUseHTMLString: true, @@ -124,6 +125,25 @@ export default { ), }); _this.notifyIndex++; + }, + speak(text){ + // 创建SpeechSynthesisUtterance实例 + const utterance = new SpeechSynthesisUtterance(text); + + // 设置语音的语言 + utterance.lang = 'zh-CN'; // 中文简体 + + // 设置语音的音量（0到1之间） + utterance.volume = 10; + + // 设置语音的语速（1是正常语速） + utterance.rate = 1; + + // 设置语音的音调（可以是"default", "female", "male"） + utterance.pitch = 1; + + // 使用SpeechSynthesis接口播放语音 + window.speechSynthesis.speak(utterance); } }, mounted() { diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg index a6705492..d63f6d9e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg @@ -1,15 +1,7 @@ - - - - - - - - - - - - - + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg index 716b7e01..791b3bd3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg @@ -1,14 +1,10 @@ - - - - - - - - - - - + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg index 83bff754..52dd7e36 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg @@ -1,14 +1,10 @@ - - - - - - - - - - - + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg index 53329e6a..e07f38e9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg +++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg @@ -1,11 +1,9 @@ - - - - + + + - - - + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg deleted file mode 100644 index e07f38e9..00000000 --- a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg new file mode 100644 index 00000000..53329e6a --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg new file mode 100644 index 00000000..b4f76297 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg new file mode 100644 index 00000000..b4f76297 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue index 01cbfb3f..2a0c0977 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue @@ -1,8 +1,8 @@
- - +
路测广播列表
-
--> + @@ -85,6 +85,7 @@ export default { }, created() { getDeviceList(5).then((data) => { + console.log('-00--------------',data) if (Array.isArray(data)) this.musicList = data.map((item) => ({ ...item, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue index 5d3ba978..9a59b27b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue @@ -227,6 +227,8 @@ export default { }, "special" ); + //触发全局监听事件 + this.$root.$emit('refresh-event'); // markerClusterIns.setData(); }); }); 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 7c17759d..c60bfeb7 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 @@ -95,7 +95,7 @@ export default { justify-content: center; >div.video-stream { - height: 255px; + height: 286px; } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue index 99d76608..4eb6d86b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue @@ -50,32 +50,75 @@ export default { } } }, - created() { + async created() { // this.devicesList = devicesFormList; this.devicesList = []; let devs = []; // Promise.all([this.getAc('A1'), this.getAc('A2'), this.getAc('A3'), this.getAc('A4'), this.getAc('A5'), this.getAc('A6')]).then(res => { - Promise.all([this.getAc()]).then(res => { - console.log('res', res) - request({ - url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`, - method: "get", - }).then(result => { - if (result.code != 200) return Message.error("操作失败"); - result.data.forEach(item => { - if (item.propertyName) { - devs.push({ - label: item.propertyName, - key: item.property, - gridColumn: 3, - }); - this.devicesData[item.property] = item.formatValue; - } - }); - this.devicesList = devs; + await request({ + url: `/business/device/batchFunctions`, + method: "post", + data: { + devices: [{ + iotDeviceId: this.dialogData.iotDeviceId, + id: this.dialogData.id, + deviceType: 15 + }], + functions: [ + { + functionId: "A1", + params: {} + }, { + functionId: "A2", + params: {} + }, { + functionId: "A3", + params: {} + }, { + functionId: "A4", + params: {} + }, { + functionId: "A5", + params: {} + }, { + functionId: "A6", + params: {} + } + ], + // parameter: {} + } + }).then(res => { + console.log('res', res) + if (res.msg == 500) { + this.getAc(); + } + }) + .catch((err) => { + console.log('err', err) + this.getAc(); }) + // console.log('res', res) + // if (res.code == 500) { + // await this.getAc(); + // } + request({ + url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`, + method: "get", + }).then(result => { + if (result.code != 200) return Message.error("操作失败"); + result.data.forEach(item => { + if (item.propertyName) { + devs.push({ + label: item.propertyName, + key: item.property, + gridColumn: 3, + }); + this.devicesData[item.property] = item.formatValue; + } + }); + this.devicesList = devs; }) }, methods: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue index 8c296b5a..fc25dace 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue @@ -139,7 +139,7 @@ export default { methods: { handleClickTabs() { }, goDispatch() { - this.$router.push(`/control/event/commandDispatch`); + this.$router.push(`/control/event/commandDispatch?id=${this.dialogData.id}`); }, goStrategy() { this.$router.push(`/control/device/strategy`); @@ -164,11 +164,14 @@ export default { url: `dc/system/event/${this.dialogData.id}`, method: "delete", }).then((result) => { - if (result.code == 200) Message.success("成功！"); - else Message.error(result?.msg); + if (result.code == 200) this.$message.success("成功！"); + else this.$message.error(result?.msg); this.$emit('traffic-relieve', this.data); + //触发全局监听事件 + this.$root.$emit('refresh-event'); }); + }) .catch(() => { }); }, 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 f30a110b..1bd6844e 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 @@ -18,6 +18,10 @@
+
清空图层 @@ -185,12 +189,17 @@ export default { } getMinMapLayers(); + this.$root.$on('delete-event', this.handleRefresh); + }, beforeDestroy() { this.emitter.off("selectedCompleted", this.selectedCompletedHandle); Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]); markerClusterIns.clear(); window.renderData = undefined; + + this.$root.$off('delete-event', this.handleRefresh); + }, methods: { selectedCompletedHandle(item) { @@ -258,13 +267,21 @@ export default { handleDevice: debounce(async function (item) { await this.handleDeviceImmediate(item); }, 360), + async handleRefresh(){ + const tab = _.filter(this.tabContentData,{status:'_active'}) + try{ + this.handleCleared(); + } catch(e){ + } + tab.forEach(async item=>{ + await this.handleDeviceImmediate(item,true); + }) + }, handleCleared() { const { mapIns } = this.getMap(); - this.layerData.forEach(({ children }) => { children.forEach(item => item.status = "") }); - if (!mapIns) return; for (const key in cacheRemoveFunc) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js index 4b14cc68..9a6a25b3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js @@ -328,13 +328,14 @@ export const eventMap = { // 感知事件 async "事件专题/感知事件"(item, filterData, isDefault, cb) { let loadingMessage; - - loadingMessage = Message.info({ - message: `${item.title}位置${!isDefault?'加载':'更新'}中...`, - duration: 0, - customClass: "loading-message", - iconClass: "el-icon-loading", - }); + if(!isDefault){ + loadingMessage = Message.info({ + message: `${item.title}位置${!isDefault?'加载':'更新'}中...`, + duration: 0, + customClass: "loading-message", + iconClass: "el-icon-loading", + }); + } // if (!isDefault) { // } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js index e07ab632..b0e9d5b3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js @@ -213,22 +213,25 @@ export function getDeviceList(deviceType, options) { } let newEndStakeMark = []; let newStartStakeMark = []; - - options.endStakeMark.forEach((item) => { - newEndStakeMark.push(String(item)); - }); - options.startStakeMark.forEach((item) => { - newStartStakeMark.push(String(item)); - }); + if(options && options.endStakeMark){ + options.endStakeMark.forEach((item) => { + newEndStakeMark.push(String(item)); + }); + } + if(options && options.startStakeMark){ + options.startStakeMark.forEach((item) => { + newStartStakeMark.push(String(item)); + }); + } let data = { deviceType: deviceType, endStakeMark: newEndStakeMark, startStakeMark: newStartStakeMark, }; - if (options.childType && options.childType.split("-")[0] === deviceType) { + if (options && options.childType && options.childType.split("-")[0] === deviceType) { data.childType = options.childType; } - if (options.deviceState && options.deviceState !== "") { + if (options && options.deviceState && options.deviceState !== "") { data["deviceState"] = options.deviceState; } request( diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue index fce48a9c..be60a8ba 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue @@ -116,9 +116,11 @@ import { // import { provideMixin } from "./../../mixin"; import { timeLine2List } from "./data"; import request from "@/utils/request"; +import { provideMixin } from "./../../mixin" export default { name: "DisposalProcess", + mixins: [provideMixin], inject: ["adpScale"], // mixins: [provideMixin], components: { @@ -180,7 +182,7 @@ export default { }, // 处置过程节点 - getProcess(eventId) { + getProcess() { getProcessNode(this.eventId).then((result) => { console.log("处置过程节点", result); if (result.code != 200) return []; @@ -301,8 +303,13 @@ export default { }, }, async mounted() { - this.getProcess(); - await this.disposalRecords(this.eventId); + const self = this; + setTimeout(async () => { + self.eventId = self.detailData.id; + self.getProcess(); + await self.disposalRecords(self.eventId); + }, 500); + }, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue index a78c2425..f4da8480 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue @@ -19,104 +19,6 @@ import request from "@/utils/request"; import { tabConfigList } from "./data.js"; import { Message } from "element-ui"; -const eventInfo = { - id: "60f022d95a7c4b6cada2d780246543d8", - deptId: null, - deptName: null, - stakeMark: "k103+900", - endStakeMark: null, - direction: "菏泽方向", - userId: 1, - startTime: null, - endTime: null, - estimatedEndTime: "2024-02-22 10:44:27", - eventLevel: 1, - eventType: 1, - stringEventType: "交通事故", - eventSubclass: "其他事故", - eventCause: "其他事故", - description: "其他事故", - eventState: 0, - eventSource: null, - stringEventSource: "96659", - eventNature: null, - eventSourceTips: null, - inTunnel: null, - roadId: null, - occurrenceTime: "2024-02-22 10:44:18", - isPerceived: 0, - lang: "2,3", - roadName: "济菏高速", - organizationName: "研发部门", - processConfigList: [ - { - "id": 8, - "eventType": 1, - "nodeNode": "1", - "processNode": "接警记录", - "commonPhrases": "" - }, - ], - eventTitle: "发生其他事故事故", - dimension: null, - longitude: null, - dcEventMap: null, - dcEventAbnormalWeather: null, - dcEventAccident: { - searchValue: null, - createBy: null, - createTime: null, - updateBy: null, - updateTime: null, - remark: null, - params: {}, - id: "60f022d95a7c4b6cada2d780246543d8", - reporterName: "王兴琳", - reporterPhoneNumber: "19806119906", - locationType: 1, - trafficJam: 100, - weatherCondition: 1, - impactLevel: 2, - isReverseCargo: 1, - isMaintenance: 1, - policeContact: "96659", - towingServiceContact: "19806119906", - congestionAhead: 0, - atIntersection: 0, - onCurve: 1, - spillageItem: "抛洒物", - vehicleOwnerPhone: "19806119906", - smallCar: 10, - trucks: 0, - buses: 0, - tankers: 0, - minorInjuries: 1, - seriousInjuries: null, - fatalities: null, - isPrivate: null, - facilityId: null, - rampId: null, - location: null, - dcEvent: null - }, - dcEventConstruction: null, - dcEventServiceArea: null, - dcEventTrafficCongestion: null, - dcEventVehicleAccident: null, - dcEventTrafficControl: null, - nickName: "管理员", - stringEventState: "待确认", - commonPhrases: null, - nodeNode: null, - eventName: "交通事故", - processNode: null, - updateTime: null, - createTime: "2024-02-22 10:49:34", - remark: null, - subclass: "1-5", - linkId: null -}; - export default { name: "EditEventInformationDialog", components: { @@ -176,6 +78,9 @@ export default { // console.log('numbers', numbers); info.stakeMark = numbers; } + if (typeof info.lang == 'string') { + info.lang = info.lang.split(','); + } this.fData = info; let configList = tabConfigList.find(item => item.label == this.fData.eventName) 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 e8cfe1e0..ff282185 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 @@ -40,10 +40,10 @@ export default { ...components, }, props: { - detailId: { - type: [String, Number], - default: "162cb8824ea141f3a96a74ad81c22796", - }, + // detailId: { + // type: [String, Number], + // default: "162cb8824ea141f3a96a74ad81c22796", + // }, }, provide() { return { @@ -59,10 +59,18 @@ export default { provideData: { detail: null, }, + detailId: '' }; }, created() { + let h = window.location.href.split('='); + if(h.length === 2){ + this.detailId = window.location.href.split('=')[1]; + } else { + this.detailId = 'b825c7bbf4de43cdb8f689e270adf7a1'; + } this.getDetail(); + }, methods: { getDetail() { @@ -87,7 +95,7 @@ export default { delete gridArea.TrafficControl; if (["设备设施隐患", "非法上路"].includes(result.data.eventName)) { // 第三列变化 - gridArea["RealTimeVideo"] = "1 / 3 / span 17 / 3"; + gridArea["RealTimeVideo"] = "1 / 3 / span 16 / 3"; delete gridArea.ReleaseInformation; } @@ -97,6 +105,7 @@ export default { .catch((err) => {}); }, handleFullHeight(key, opacityKey) { + // 还原图标 if (this.gridAreaMap[key] !== originGridArea[key]) { this.gridAreaMap[key] = originGridArea[key]; if (this.$refs[opacityKey]?.[0]) { @@ -109,7 +118,6 @@ export default { this.$refs[opacityKey][0].$el.style.opacity = 0; this.$refs[opacityKey][0].$el.style.pointerEvents = "none"; } - this.gridAreaMap[key] = originGridArea[key].replace( /[0-9]+/g, (num) => { @@ -121,6 +129,7 @@ export default { } } ); + this.gridAreaMap["DisposalProcess"] = "1 / 2 / span 33 / 2"; } }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index ed9b1bec..42fad4a7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -262,6 +262,8 @@ export default { else Message.error(result?.msg); this.modelVisible = false; this.$emit("queryData", true); + //触发全局监听事件 + this.$root.$emit('delete-event'); }); } else { request({ @@ -272,6 +274,8 @@ export default { else Message.error(result?.msg); this.modelVisible = false; this.$emit("queryData", true); + //触发全局监听事件 + this.$root.$emit('delete-event'); }); } }); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue index 5dbf5634..fec3da9f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue @@ -194,7 +194,7 @@ export default { }) let subItems = [ - "可变新消息标志", + "可变信息标志", "气象检测器", "一类交通量调查站", "枪机", @@ -216,7 +216,7 @@ export default { // const sub01 = createSub(0, 0, '气象检测器') // const sub02 = createSub(0, 100, '一类交通量调查站') - // const sub03 = createSub(0, 200, '可变新消息标志') + // const sub03 = createSub(0, 200, '可变信息标志') // link(main, sub02, [ // { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue index afef2b62..1f61c756 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue @@ -14,33 +14,40 @@ --> diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/assets/charts.js similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/assets/charts.js diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/shexiangtou.png b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/assets/shexiangtou.png similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/shexiangtou.png rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/assets/shexiangtou.png diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceSummary/index.vue similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceSummary/index.vue diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/assets/charts.js similarity index 100% rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/assets/charts.js diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/index.vue similarity index 97% rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/index.vue index 6f62deb1..2fff6663 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/index.vue @@ -9,7 +9,7 @@