diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/1.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/1.svg new file mode 100644 index 00000000..a1979bb8 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/1.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/10.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/10.svg new file mode 100644 index 00000000..a0cefbcd --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/10.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/11.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/11.svg new file mode 100644 index 00000000..1c56a53c --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/11.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/2.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/2.svg new file mode 100644 index 00000000..e9678e3e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/2.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/3.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/3.svg new file mode 100644 index 00000000..6a75eadf --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/3.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/4.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/4.svg new file mode 100644 index 00000000..c67a8df1 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/4.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/5.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/5.svg new file mode 100644 index 00000000..8431dd64 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/5.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/6.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/6.svg new file mode 100644 index 00000000..4db5043b --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/6.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/7.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/7.svg new file mode 100644 index 00000000..13e8a5b3 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/7.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/8.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/8.svg new file mode 100644 index 00000000..8e78a36f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/8.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/9.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/9.svg new file mode 100644 index 00000000..d845704e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/9.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..874c4087 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机.svg @@ -0,0 +1,5 @@ + + + + + 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..370cad14 --- /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..066c2569 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机_fault.svg @@ -0,0 +1,3 @@ + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue new file mode 100644 index 00000000..200357eb --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParams.vue new file mode 100644 index 00000000..dc8d4b51 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParams.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParamsMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParamsMulti.vue new file mode 100644 index 00000000..64b0dda6 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParamsMulti.vue @@ -0,0 +1,166 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue new file mode 100644 index 00000000..3053c351 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue @@ -0,0 +1,195 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue index 29feb81b..556bcb0f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue @@ -12,19 +12,12 @@ - + - + @@ -122,12 +112,16 @@ export default { }, async created() { // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883'; - + if(this.dialogData){ + this.data = { + ...this.dialogData, + } + } let deviceInfo = await this.getDeviceInfo(); this.data = { - ...this.dialogData, roadName: null, - deviceStateLiteral: deviceInfo.data.formatValue.deviceState, + deviceStateLiteral: deviceInfo?.data.formatValue.deviceState, + ...this.data }; // console.log( @@ -148,9 +142,8 @@ export default { methods: { async getDeviceInfo() { return request({ - url: `/business/device/properties/latest/${ - this.dialogData.iotDeviceId || "10.0.36.143-1883" - }/3`, + url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || "10.0.36.143-1883" + }/3`, method: "get", params: {}, }); @@ -200,7 +193,7 @@ div.switcher { align-items: center; justify-content: end; - > div { + >div { font-size: 16px; padding: 6px 12px; } 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 5844f6ff..8c296b5a 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 @@ -161,7 +161,7 @@ export default { // this.$emit('traffic-relieve', this.data); // }); request({ - url: `dc/system/event/${this.data.eventType}/${this.dialogData.id}`, + url: `dc/system/event/${this.dialogData.id}`, method: "delete", }).then((result) => { if (result.code == 200) Message.success("成功!"); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue index 4e55059c..f7b33396 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue @@ -110,7 +110,8 @@ export default { this.formList[2].options.options = options; }, immediate: true, - deep: true + deep: true, + isButtonClick: false } }, methods: { @@ -126,6 +127,13 @@ export default { this.$parent.$refs.RoadAndEventsRef?.setFilterDataNoAction?.(data); }, async handleResetForm() { + if(this.isButtonClick){return} + + this.isButtonClick = true; + setTimeout(() => { + this.isButtonClick = false; + }, 500); + this.$refs.FormConfigRef?.reset(); this.activeIcon = "filter"; this.filterEnd(initSearch); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue index 3485c370..7b231d2a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue @@ -1,13 +1,18 @@