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

08/22问题修改

Browse Source
This commit is contained in:
home孙 2025-08-22 16:39:07 +08:00
parent 250f2f86c6
commit 99645caeb8
3 changed files with 78 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
pages/controller/controller.vue
View File

@ -4,7 +4,7 @@
title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar> title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
<!-- 通风窗 --> <!-- 通风窗 -->
<view class="content" v-if="purviewList.indexOf('19')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='19')!=-1&&purviewList[purviewList.findIndex(item => item.id =='19')].state===0">
<template v-for="(item,index) in airWindowList"> <template v-for="(item,index) in airWindowList">
<!-- --> <!-- -->
<view class="lishui-item" :key="index" v-show="item.state != 0"> <view class="lishui-item" :key="index" v-show="item.state != 0">
@ -49,7 +49,7 @@
</view> </view>
<!-- 外遮阳 --> <!-- 外遮阳 -->
<view class="content" v-if="purviewList.indexOf('25')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='25')!=-1&&purviewList[purviewList.findIndex(item => item.id =='25')].state===0">
<template v-for="(item,index) in externalsunshadeList"> <template v-for="(item,index) in externalsunshadeList">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -91,7 +91,7 @@
</view> </view>
<!-- 内遮阳 --> <!-- 内遮阳 -->
<view class="content" v-if="purviewList.indexOf('24')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='24')!=-1&&purviewList[purviewList.findIndex(item => item.id =='24')].state===0">
<template v-for="(item,index) in innercurtainList"> <template v-for="(item,index) in innercurtainList">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -133,7 +133,7 @@
</view> </view>
<!-- 内保温 --> <!-- 内保温 -->
<view class="content" v-if="purviewList.indexOf('27')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='27')!=-1&&purviewList[purviewList.findIndex(item => item.id =='27')].state===0">
<template v-for="(item,index) in interiorthermalinsulationList"> <template v-for="(item,index) in interiorthermalinsulationList">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -175,7 +175,7 @@
</view> </view>
<!-- 立面保温 --> <!-- 立面保温 -->
<view class="content" v-if="purviewList.indexOf('29')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='29')!=-1&&purviewList[purviewList.findIndex(item => item.id =='29')].state===0">
<template v-for="(item,index) in upFaceInsulationList"> <template v-for="(item,index) in upFaceInsulationList">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -217,7 +217,7 @@
</view> </view>
<!-- 标准风机 --> <!-- 标准风机 -->
<view class="content" v-if="purviewList.indexOf('26')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='26')!=-1&&purviewList[purviewList.findIndex(item => item.id =='26')].state===0">
<view class="lishui-item" v-if="standardFanStatus.open != 0"> <view class="lishui-item" v-if="standardFanStatus.open != 0">
<view class="lishui-title"> <view class="lishui-title">
<view class="title-left"> <view class="title-left">
@ -285,7 +285,7 @@
</view> </view>
</view> </view>
<!-- 空调 --> <!-- 空调 -->
<view class="content" v-if="purviewList.indexOf('28')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='28')!=-1&&purviewList[purviewList.findIndex(item => item.id =='28')].state===0">
<template> <template>
<view class="lishui-item" v-show="airconditioning.state != 0"> <view class="lishui-item" v-show="airconditioning.state != 0">
<view class="lishui-title"> <view class="lishui-title">
@ -356,7 +356,7 @@
</template> </template>
</view> </view>
<!-- 湿帘泵 --> <!-- 湿帘泵 -->
<view class="content" v-if="purviewList.indexOf('26')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='26')!=-1&&purviewList[purviewList.findIndex(item => item.id =='26')].state===0">
<template v-for="(item,index) in fanwetcurtainList"> <template v-for="(item,index) in fanwetcurtainList">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -401,7 +401,7 @@
</template> </template>
</view> </view>
<!-- CO2补气 --> <!-- CO2补气 -->
<view class="content" v-if="purviewList.indexOf('30')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='30')!=-1&&purviewList[purviewList.findIndex(item => item.id =='30')].state===0">
<template v-for="(item,index) in CO2List"> <template v-for="(item,index) in CO2List">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -444,7 +444,7 @@
</template> </template>
</view> </view>
<!-- #湿窗外翻窗 --> <!-- #湿窗外翻窗 -->
<view class="content" v-if="purviewList.indexOf('26')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='26')!=-1&&purviewList[purviewList.findIndex(item => item.id =='26')].state===0">
<template v-for="(item,index) in outFlipWindowList"> <template v-for="(item,index) in outFlipWindowList">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -486,7 +486,7 @@
</view> </view>
<!-- 环流风扇 --> <!-- 环流风扇 -->
<view class="content" v-if="purviewList.indexOf('21')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='21')!=-1&&purviewList[purviewList.findIndex(item => item.id =='21')].state===0">
<template v-for="(item,index) in circulationFengshanList"> <template v-for="(item,index) in circulationFengshanList">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -531,7 +531,7 @@
</view> </view>
<!-- 金华权限 --> <!-- 金华权限 -->
<view class="content" v-if="purviewList.indexOf('10')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='10')!=-1&&purviewList[purviewList.findIndex(item => item.id =='10')].state===0">
<div class="item"> <div class="item">
<u-collapse :accordion='false' :item-style="itemStyle" :head-style='headStyle' ref="collapseView"> <u-collapse :accordion='false' :item-style="itemStyle" :head-style='headStyle' ref="collapseView">
<u-collapse-item :title="item.nickName" v-for="(item,index) in itemList" :key="index" align="center" <u-collapse-item :title="item.nickName" v-for="(item,index) in itemList" :key="index" align="center"
@ -586,7 +586,7 @@
</view> </view>
<!-- 丽水权限 --> <!-- 丽水权限 -->
<view class="content" v-if="purviewList.indexOf('9')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='9')!=-1&&purviewList[purviewList.findIndex(item => item.id =='9')].state===0">
<view class="lishui-item" v-if="fanStatus.open != 0"> <view class="lishui-item" v-if="fanStatus.open != 0">
<view class="lishui-title"> <view class="lishui-title">
<view class="title-left"> <view class="title-left">
@ -684,7 +684,7 @@
</view> </view>
<!-- 东北五防 --> <!-- 东北五防 -->
<view class="content" v-if="purviewList.indexOf('8')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='8')!=-1&&purviewList[purviewList.findIndex(item => item.id =='8')].state===0">
<template v-for="(item,index) in fiveControlList"> <template v-for="(item,index) in fiveControlList">
<view class="lishui-item" v-show="item.controlState != 0" :key="index"> <view class="lishui-item" v-show="item.controlState != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -744,7 +744,7 @@
</template> </template>
</view> </view>
<!-- 冷暖风机 --> <!-- 冷暖风机 -->
<view class="content" v-if="purviewList.indexOf('31')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='31')!=-1&&purviewList[purviewList.findIndex(item => item.id =='31')].state===0">
<view class="lishui-item" v-if="coldWarmFanStatus.open != 0"> <view class="lishui-item" v-if="coldWarmFanStatus.open != 0">
<view class="lishui-title"> <view class="lishui-title">
<view class="title-left"> <view class="title-left">
@ -832,7 +832,7 @@
</view> </view>
</view> </view>
<!-- 补光灯 --> <!-- 补光灯 -->
<view class="content" v-if="purviewList.indexOf('20')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='20')!=-1&&purviewList[purviewList.findIndex(item => item.id =='20')].state===0">
<view class="lishui-item" v-if="supplementLightStatus.open != 0"> <view class="lishui-item" v-if="supplementLightStatus.open != 0">
<view class="lishui-title"> <view class="lishui-title">
<view class="title-left"> <view class="title-left">
@ -951,7 +951,7 @@
</view> </view>
<!-- 高压微雾 --> <!-- 高压微雾 -->
<view class="content" v-if="purviewList.indexOf('23')!=-1"> <view class="content" v-if="purviewList.findIndex(item => item.id =='23')!=-1&&purviewList[purviewList.findIndex(item => item.id =='23')].state===0">
<template v-for="(item,index) in highpressuremistList"> <template v-for="(item,index) in highpressuremistList">
<view class="lishui-item" v-show="item.state != 0" :key="index"> <view class="lishui-item" v-show="item.state != 0" :key="index">
<view class="lishui-title"> <view class="lishui-title">
@ -2571,7 +2571,7 @@
}; };
}, },
onReady() { onReady() {
if (this.purviewList.indexOf('10') != -1) { if (this.purviewList.findIndex(item => item.id =='10') != -1) {
setTimeout(() => { setTimeout(() => {
this.$refs.collapseView.init(); this.$refs.collapseView.init();
}, 1000); }, 1000);
@ -3038,7 +3038,7 @@
res.data.forEach((el, index) => { res.data.forEach((el, index) => {
this.purviewList.push(el.id.toString()) this.purviewList.push({id:el.id.toString(),state:el.state})
if (el.id == '19') { if (el.id == '19') {
//通风窗 //通风窗
this.airWindowList = this.toNewList(this.airWindowList, el.child) this.airWindowList = this.toNewList(this.airWindowList, el.child)
@ -3118,7 +3118,7 @@
}, 3000); }, 3000);
//查看金华权限 //查看金华权限
if (this.purviewList.indexOf('10') != -1) { if (this.purviewList.findIndex(item => item.id =='10') != -1) {
// 小程序手机控制权限数据 // 小程序手机控制权限数据
this.getcontrol_wxgetpermission(); this.getcontrol_wxgetpermission();
this.$http({ this.$http({
@ -3159,7 +3159,7 @@
}) })
} }
//查看丽水权限 //查看丽水权限
// if (this.purviewList.indexOf('9') != -1) { // if (this.purviewList.findIndex(item => item.id =='9') != -1) {
// // this.getControl_getState() // // this.getControl_getState()
// // this.getReadControlliShuiControl() // // this.getReadControlliShuiControl()
// // clearInterval(this.statusInterval) && this.statusInterval // // clearInterval(this.statusInterval) && this.statusInterval
@ -3169,17 +3169,17 @@
// } // }
// 查看五防项目权限 // 查看五防项目权限
// if (this.purviewList.indexOf('8') != -1) { // if (this.purviewList.findIndex(item => item.id =='8') != -1) {
// } // }
// 读取（补光灯）控制器 // 读取（补光灯）控制器
// if(this.purviewList.indexOf('20') != -1){ // if(this.purviewList.findIndex(item => item.id =='20') != -1){
// }; // };
// 环流风扇 // 环流风扇
// if(this.purviewList.indexOf('21') != -1){}; // if(this.purviewList.findIndex(item => item.id =='21') != -1){};
} }
})) }))
@ -3245,7 +3245,7 @@
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
// 丽水 // 丽水
if (this.purviewList.indexOf('9') != -1) { if (this.purviewList.findIndex(item => item.id =='9') != -1) {
this.fanStatus.open = res.data['1023'] this.fanStatus.open = res.data['1023']
this.fanStatus.status = [] this.fanStatus.status = []
var num = res.data['1024'] var num = res.data['1024']
@ -3266,7 +3266,7 @@
} }
// 五防项目状态 // 五防项目状态
if (this.purviewList.indexOf('8') != -1) { if (this.purviewList.findIndex(item => item.id =='8') != -1) {
this.fiveControlList.forEach(el => { this.fiveControlList.forEach(el => {
el.controlState = res.data[el.num]; el.controlState = res.data[el.num];
if (el.progress_num) { if (el.progress_num) {
@ -3280,7 +3280,7 @@
console.log(this.fiveControlList, 'this.fiveControlList'); console.log(this.fiveControlList, 'this.fiveControlList');
} }
// 冷暖风机状态值获取 // 冷暖风机状态值获取
if (this.purviewList.indexOf('31') != -1) { if (this.purviewList.findIndex(item => item.id =='31') != -1) {
this.coldWarmFanStatus.open = res.data[1175]; this.coldWarmFanStatus.open = res.data[1175];
this.coldWarmFanStatus.open1 = res.data[1176]; this.coldWarmFanStatus.open1 = res.data[1176];
this.coldWarmFanStatus.status = []; this.coldWarmFanStatus.status = [];
@ -3291,7 +3291,7 @@
this.coldWarmFanStatus.status = openListNew.reverse() this.coldWarmFanStatus.status = openListNew.reverse()
}; };
// 补光灯状态值获取 // 补光灯状态值获取
if (this.purviewList.indexOf('20') != -1) { if (this.purviewList.findIndex(item => item.id =='20') != -1) {
this.supplementLightStatus.open = res.data[1068]; this.supplementLightStatus.open = res.data[1068];
this.supplementLightStatus.status = []; this.supplementLightStatus.status = [];
let numLight = res.data[1069]; let numLight = res.data[1069];
@ -3302,7 +3302,7 @@
}; };
// 环流风扇状态值获取 // 环流风扇状态值获取
if (this.purviewList.indexOf('21') != -1) { if (this.purviewList.findIndex(item => item.id =='21') != -1) {
this.circulationFengshanList.forEach((el, index) => { this.circulationFengshanList.forEach((el, index) => {
el.state = res.data[1074 + index * 2]; el.state = res.data[1074 + index * 2];
el.open = res.data[1075 + index * 2]; el.open = res.data[1075 + index * 2];
@ -3310,7 +3310,7 @@
}; };
// 标准风机 // 标准风机
if (this.purviewList.indexOf('26') != -1) { if (this.purviewList.findIndex(item => item.id =='26') != -1) {
this.standardFanStatus.open = res.data['1078'] this.standardFanStatus.open = res.data['1078']
this.standardFanStatus.status = [] this.standardFanStatus.status = []
var standardnum = res.data['1079'] var standardnum = res.data['1079']
@ -3320,28 +3320,28 @@
this.standardFanStatus.status = openListNew.reverse() this.standardFanStatus.status = openListNew.reverse()
}; };
// CO2补气 // CO2补气
if (this.purviewList.indexOf('30') != -1) { if (this.purviewList.findIndex(item => item.id =='30') != -1) {
this.CO2List.forEach((el, index) => { this.CO2List.forEach((el, index) => {
el.state = res.data[1178 + index * 2]; el.state = res.data[1178 + index * 2];
el.open = res.data[1179 + index * 2]; el.open = res.data[1179 + index * 2];
}) })
}; };
// 湿帘泵 // 湿帘泵
if (this.purviewList.indexOf('26') != -1) { if (this.purviewList.findIndex(item => item.id =='26') != -1) {
this.fanwetcurtainList.forEach((el, index) => { this.fanwetcurtainList.forEach((el, index) => {
el.state = res.data[1080 + index * 2]; el.state = res.data[1080 + index * 2];
el.open = res.data[1081 + index * 2]; el.open = res.data[1081 + index * 2];
}) })
}; };
// 空调 // 空调
if (this.purviewList.indexOf('28') != -1) { if (this.purviewList.findIndex(item => item.id =='28') != -1) {
this.airconditioning.state = res.data['1160'] this.airconditioning.state = res.data['1160']
this.airconditioning.open = res.data['1161'] this.airconditioning.open = res.data['1161']
this.airconditioning.open1 = res.data['1162'] this.airconditioning.open1 = res.data['1162']
}; };
// 高压微雾 // 高压微雾
if (this.purviewList.indexOf('23') != -1) { if (this.purviewList.findIndex(item => item.id =='23') != -1) {
this.highpressuremistList.forEach((el, index) => { this.highpressuremistList.forEach((el, index) => {
el.state = res.data[1070 + index * 2]; el.state = res.data[1070 + index * 2];
el.open = res.data[1071 + index * 2]; el.open = res.data[1071 + index * 2];
@ -3349,7 +3349,7 @@
}; };
// 湿窗外翻窗 // 湿窗外翻窗
if (this.purviewList.indexOf('26') != -1) { if (this.purviewList.findIndex(item => item.id =='26') != -1) {
this.outFlipWindowList.forEach((el, index) => { this.outFlipWindowList.forEach((el, index) => {
el.state = res.data[1084 + index * 3]; el.state = res.data[1084 + index * 3];
el.progress = res.data[1086 + index * 3]; el.progress = res.data[1086 + index * 3];
@ -3358,7 +3358,7 @@
}; };
//内遮阳 //内遮阳
if (this.purviewList.indexOf('24') != -1) { if (this.purviewList.findIndex(item => item.id =='24') != -1) {
this.innercurtainList.forEach((el, index) => { this.innercurtainList.forEach((el, index) => {
el.state = res.data[1090 + index * 3]; el.state = res.data[1090 + index * 3];
el.progress = res.data[1092 + index * 3]; el.progress = res.data[1092 + index * 3];
@ -3367,7 +3367,7 @@
}; };
//外遮阳 //外遮阳
if (this.purviewList.indexOf('25') != -1) { if (this.purviewList.findIndex(item => item.id =='25') != -1) {
this.externalsunshadeList.forEach((el, index) => { this.externalsunshadeList.forEach((el, index) => {
el.state = res.data[1096 + index * 3]; el.state = res.data[1096 + index * 3];
el.progress = res.data[1098 + index * 3]; el.progress = res.data[1098 + index * 3];
@ -3376,7 +3376,7 @@
}; };
//通风窗 //通风窗
if (this.purviewList.indexOf('19') != -1) { if (this.purviewList.findIndex(item => item.id =='19') != -1) {
this.airWindowList.forEach((el, index) => { this.airWindowList.forEach((el, index) => {
if (el.id == '8') { if (el.id == '8') {
el.state = res.data[1188] ? res.data[1188] : 0; el.state = res.data[1188] ? res.data[1188] : 0;
@ -3399,7 +3399,7 @@
}; };
// 内保温 // 内保温
if (this.purviewList.indexOf('27') != -1) { if (this.purviewList.findIndex(item => item.id =='27') != -1) {
this.interiorthermalinsulationList.forEach((el, index) => { this.interiorthermalinsulationList.forEach((el, index) => {
el.state = res.data[1182 + index * 3]; el.state = res.data[1182 + index * 3];
el.progress = res.data[1184 + index * 3]; el.progress = res.data[1184 + index * 3];
@ -3408,7 +3408,7 @@
}; };
// 立面保温 // 立面保温
if (this.purviewList.indexOf('29') != -1) { if (this.purviewList.findIndex(item => item.id =='29') != -1) {
this.upFaceInsulationList.forEach((el, index) => { this.upFaceInsulationList.forEach((el, index) => {
el.state = res.data[1196 + index * 3]; el.state = res.data[1196 + index * 3];
el.progress = res.data[1198 + index * 3]; el.progress = res.data[1198 + index * 3];

60
pages/login/login.vue
View File

@ -108,32 +108,42 @@
} }
}).then(res => { }).then(res => {
// console.log(res, '00000000000'); // console.log(res, '00000000000');
uni.setStorage({ if(res.code==200){
key: 'token', uni.setStorage({
data: res.data.token key: 'token',
}); data: res.data.token
uni.setStorage({ });
key: 'userid', uni.setStorage({
data: res.data.userid key: 'userid',
}); data: res.data.userid
uni.setStorage({ });
key: 'HBusername', uni.setStorage({
data: this.form.name key: 'HBusername',
}); data: this.form.name
uni.setStorage({ });
key: 'HBpassword', uni.setStorage({
data: this.form.password key: 'HBpassword',
}); data: this.form.password
uni.showToast({ });
icon: 'success', uni.showToast({
title: '登录成功!', icon: 'success',
duration: 2000 title: '登录成功!',
}) duration: 2000
uni.switchTab({ })
url: '/pages/timeEnvironment/timeEnvironment' uni.switchTab({
}) url: '/pages/timeEnvironment/timeEnvironment'
})
}else{
uni.showToast({
icon: 'none',
title: res.msg,
duration: 2000
})
}
}) })
} else { } else {
uni.showToast({ uni.showToast({
icon: 'error', icon: 'error',

6
pages/target_water_fertilizer_PH/target_water_fertilizer_PH.vue
View File

@ -2,7 +2,7 @@
<view class="target_water_fertilizer_PH"> <view class="target_water_fertilizer_PH">
<!-- 目标水肥PH --> <!-- 目标水肥PH -->
<u-navbar :background="background" :is-back='true' back-icon-color='#FFFFFF' :border-bottom="false" <u-navbar :background="background" :is-back='true' back-icon-color='#FFFFFF' :border-bottom="false"
:title="(flag != 1 ? titleName : '') + echartName" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar> :title="echartName" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
<view class="navbar"> <view class="navbar">
<image src="../../static/PH_bg.png" mode=""></image> <image src="../../static/PH_bg.png" mode=""></image>
@ -19,7 +19,7 @@
<view class="echart"> <view class="echart">
<view class="title"> <view class="title">
<image src="../../static/icon_ph.png" mode=""></image> <image src="../../static/icon_ph.png" mode=""></image>
<text>{{ (flag != 1 ? titleName : '') + echartName }}</text> <text>{{echartName }}</text>
</view> </view>
<view id="echart_p"> <view id="echart_p">
<qiun-data-charts type="area" :opts="opts" :chartData="chartData" :ontouch="true" <qiun-data-charts type="area" :opts="opts" :chartData="chartData" :ontouch="true"
@ -177,7 +177,7 @@ getServerData1() {
this.$http({ this.$http({
url:this.api.equip_chartdata + '?equipmentId=' + this.equipmentId, url:this.api.equip_chartdata + '?equipmentId=' + this.equipmentId,
method: 'POST' method: 'get'
}).then(res=>{ }).then(res=>{
// console.log(res,'气象站折线图数据'); // console.log(res,'气象站折线图数据');
res.data.forEach((i, index) => { res.data.forEach((i, index) => {