diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
index 0f93b269..57ad41ac 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
@@ -9,9 +9,6 @@
-
-
-
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 3241e95e..99d76608 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
@@ -63,12 +63,15 @@ export default {
}).then(result => {
if (result.code != 200) return Message.error("操作失败");
result.data.forEach(item => {
- devs.push({
- label: item.propertyName,
- key: item.property,
- gridColumn: 3,
- });
- this.devicesData[item.property] = item.formatValue;
+ if (item.propertyName) {
+ devs.push({
+ label: item.propertyName,
+ key: item.property,
+ gridColumn: 3,
+ });
+ this.devicesData[item.property] = item.formatValue;
+ }
+
});
this.devicesList = devs;
})
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
index ba20ca4d..a9008e70 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
@@ -156,11 +156,18 @@ div.switcher {