xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaomeng:4ffd0205d886d459d0f4b2521b4f0929fa9b05be
Branches Tags
xiaomeng:main
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:f92632a750623767097bb71be7f808d43aa909ce
Branches Tags
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

4 Commits
4ffd0205d8 ... f92632a750

Author SHA1 Message Date
xiaomeng
f92632a750 Merge pull request 'pc-master' (#41) from pc-master into portal 
Reviewed-on: #41
 2023-11-17 06:29:05 +00:00
pangdundun
98dbf114ce ~ 2023-11-17 14:27:32 +08:00
pangdundun
a392c01e37 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-17 14:21:16 +08:00
pangdundun
15bf2a4bf6 ~ 2023-11-17 14:21:05 +08:00
1 changed files with 9 additions and 6 deletions
Show Stats Expand all files Collapse all files

15
src/views/page/largeScreen.vue
View File

@ -24,7 +24,7 @@
</div> </div>
<div class="item item_act" @click="toBackPage"> <div class="item item_act" @click="toBackPage">
<img src="../../assets/img/nav2.png" alt=""> <img src="../../assets/img/nav2.png" alt="">
<span>施肥机</span> <span>控制器</span>
</div> </div>
<div class="item item_act" v-show="false"> <div class="item item_act" v-show="false">
<img src="../../assets/img/nav3.png" alt=""> <img src="../../assets/img/nav3.png" alt="">
@ -705,13 +705,16 @@ export default {
this.dataList = res.data.data this.dataList = res.data.data
if (res.status === 200) { if (res.status === 200) {
res.data.data.forEach(el => { res.data.data.forEach(el => {
this.get_weather_echart_data(el.deviceId) // this.get_weather_echart_data(el.deviceId)
this.get_thisWeekTemperature_echart_data(el.deviceId) // this.get_thisWeekTemperature_echart_data(el.deviceId)
this.get_environmentData(el.deviceId) // this.get_environmentData(el.deviceId)
this.get_readControl_getState(el.deviceId) // this.get_readControl_getState(el.deviceId)
}); });
// this.get_readControl_getState(2023042214250018) this.get_weather_echart_data(2023042214250027)
this.get_thisWeekTemperature_echart_data(2023042214250027)
this.get_environmentData(2023042214250027)
this.get_readControl_getState(2023042214250027)
this.getWeatherData(2023042214250027) this.getWeatherData(2023042214250027)
} }
}) })