Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master

pull/200/head
home孙 2024-11-30 17:07:41 +08:00
commit d87f42cec1
1 changed files with 3 additions and 3 deletions

View File

@ -354,7 +354,7 @@
</div> </div>
</div> </div>
<!-- 大冶鑫 --> <!-- 大冶鑫 -->
<div class="content_item" v-if="limitUserId == 7"> <div class="content_item" v-if="limitUserId == 7|| limitUserId == 9">
<div v-for="(item, index) in fiveControlList" :key="index" style="margin-bottom: 0.15rem"> <div v-for="(item, index) in fiveControlList" :key="index" style="margin-bottom: 0.15rem">
<div class="i_title" v-if="item.controlState != 0"> <div class="i_title" v-if="item.controlState != 0">
<img src="../../assets/img/i_title_img.png" alt="" /> <img src="../../assets/img/i_title_img.png" alt="" />
@ -987,8 +987,8 @@ export default {
} else if (limitUserId == 9) { } else if (limitUserId == 9) {
// charts // charts
this.get_weather_echart_data(2024070113400048); this.get_weather_echart_data(2023120613270131);
this.get_thisWeekTemperature_echart_data(2024070113400048); this.get_thisWeekTemperature_echart_data(2023120613270131);
this.get_environmentData(2024070113400048); this.get_environmentData(2024070113400048);
this.get_readControl_getState(2024070113400048); this.get_readControl_getState(2024070113400048);
// //