Browse Source

首页bug

wangqin
zhoule 7 months ago
parent
commit
8ae839a668
  1. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
  2. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
  3. 9
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue

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

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

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

@ -63,12 +63,15 @@ export default {
}).then(result => { }).then(result => {
if (result.code != 200) return Message.error("操作失败"); if (result.code != 200) return Message.error("操作失败");
result.data.forEach(item => { result.data.forEach(item => {
if (item.propertyName) {
devs.push({ devs.push({
label: item.propertyName, label: item.propertyName,
key: item.property, key: item.property,
gridColumn: 3, gridColumn: 3,
}); });
this.devicesData[item.property] = item.formatValue; this.devicesData[item.property] = item.formatValue;
}
}); });
this.devicesList = devs; this.devicesList = devs;
}) })

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

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

Loading…
Cancel
Save