diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜.svg new file mode 100644 index 00000000..0d46cb38 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜.svg @@ -0,0 +1,3 @@ + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜_active.svg new file mode 100644 index 00000000..0f158b99 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜_active.svg @@ -0,0 +1,3 @@ + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜_fault.svg new file mode 100644 index 00000000..b6ad80f2 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/一体机柜_fault.svg @@ -0,0 +1,3 @@ + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜.svg new file mode 100644 index 00000000..7cc261de --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜_active.svg new file mode 100644 index 00000000..78a2e340 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜_active.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜_fault.svg new file mode 100644 index 00000000..2983b3d6 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/一体机柜_fault.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/AirConditioning.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/AirConditioning.vue new file mode 100644 index 00000000..2e0b7b55 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/AirConditioning.vue @@ -0,0 +1,319 @@ + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceAirConditioning.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceAirConditioning.vue new file mode 100644 index 00000000..188a9014 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceAirConditioning.vue @@ -0,0 +1,139 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceControlDialog.vue new file mode 100644 index 00000000..e93fe8f6 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceControlDialog.vue @@ -0,0 +1,298 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DevicePacks.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DevicePacks.vue new file mode 100644 index 00000000..3654b835 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DevicePacks.vue @@ -0,0 +1,148 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceParams.vue new file mode 100644 index 00000000..6acd2980 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/DeviceParams.vue @@ -0,0 +1,184 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/index.vue new file mode 100644 index 00000000..2ea60136 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/index.vue @@ -0,0 +1,231 @@ + + + + + + + \ No newline at end of file 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 5f02ce68..31732e10 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 @@ -60,6 +60,7 @@ import Intermodulation from "./../Dialogs/Intermodulation/index.vue"; import GuardrailCollision from "./../Dialogs/GuardrailCollision/index.vue"; import MeteorologicalDetection from "./../Dialogs/MeteorologicalDetection/index.vue"; import MillimeterWaveRadar from "./../Dialogs/MillimeterWaveRadar/index.vue"; +import IntegratedCabinet from "./../Dialogs/IntegratedCabinet/index.vue"; import FatigueWakesUp from "./../Dialogs/FatigueWakesUp/index.vue"; import { addInGraphHandle, markerClusterIns } from "./utils/map" @@ -85,7 +86,8 @@ export default { RemoteMachine, MeteorologicalDetection, MillimeterWaveRadar, - ConfluenceArea + ConfluenceArea, + IntegratedCabinet }, data() { return { 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 2ffdeb2c..2c9c3356 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 @@ -73,7 +73,7 @@ export const DeviceForMap = { type = 'b' } else if(ctype && (ctype === '2-4'||ctype === '2-2')){ type = 'c' - } + } return boardIcon[`${type}${+!bool}`]; }, }, @@ -113,7 +113,7 @@ export const DeviceForMap = { deviceType: "10", dialog: "FatigueWakesUp", }, - 离网光伏供电: { + 太阳能板: { deviceType: "15", dialog: "SolarEnergy", }, @@ -121,6 +121,10 @@ export const DeviceForMap = { deviceType: "16", dialog: "RemoteMachine", }, + 一体机柜: { + deviceType: "17", + dialog: "IntegratedCabinet", + }, }; export const lngLatMap = {}; //优化 缩略图 + 地图 复用lngLatmap @@ -282,7 +286,7 @@ export const eventMap = { ); addDataPreHandle(removeData); markerClusterIns.addData(removeData, isDefault); - + this.emitter.emit("selectedCompleted", item); cacheRemoveFunc[`地图事件专题/${item.title}`] = () => { @@ -468,4 +472,4 @@ function removeDataPreHandle(markers) { }; lngLatMapHandle(markers, cb); window.renderData?.(window.page); //移除后,重新渲染弹出框更新数据 -} +} \ No newline at end of file