首页bug

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue

@@ -9,9 +9,6 @@
         <ElTabPane label="气象情况" name="second">
           <Descriptions labelWidth="104px" :list="weatherList" :data="weatherData" style="gap: 14px" />
         </ElTabPane>
-        <ElTabPane label="联动策略" name="third">
-          <!-- <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" /> -->
-        </ElTabPane>
       </ElTabs>
     </div>
 

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({
+          if (item.propertyName) {
-            label: item.propertyName,
+            devs.push({
-            key: item.property,
+              label: item.propertyName,
-            gridColumn: 3,
+              key: item.property,
-          });
+              gridColumn: 3,
-          this.devicesData[item.property] = item.formatValue;
+            });
+            this.devicesData[item.property] = item.formatValue;
+          }
+
         });
         this.devicesList = devs;
       })

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue

@@ -156,11 +156,18 @@ div.switcher {
 <style lang="scss" scoped>
 .SolarEnergy {
   width: 508px;
-  // height: 240px;
+  // height: 248px;
   color: #fff;
   display: flex;
   flex-direction: column;
 
+  ::v-deep {
+    .el-tabs__content {
+      overflow-y: auto;
+      max-height: 220px;
+    }
+  }
+
   .camera-video {
     flex: 1.5;
   }