From 90d0d82de1f8606fb1d608ee952633942550f693 Mon Sep 17 00:00:00 2001
From: sunmeng <1162067978@qq.com>
Date: Mon, 9 Sep 2024 17:27:21 +0800
Subject: [PATCH] 1

---
 api/driverapi.js                                      |  1 +
 .../fertilizer_machine_new/fertilizer_machine_new.vue | 11 ++++++-----
 pages/timeEnvironment/timeEnvironment.vue             | 10 ++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/api/driverapi.js b/api/driverapi.js
index 1ed9e83..2f15bf2 100644
--- a/api/driverapi.js
+++ b/api/driverapi.js
@@ -55,6 +55,7 @@ let api = {
 	camera_gethls:'/camera/gethls',//获取摄像头得地址
 	camera_getphonehls:'/camera/getphonehls',//获取摄像头得地址 Copy Copy Copy Copy
 	
+	getFi_getName:'/getFi/getName',//查看用户智能灌溉组名称信息
 	readFs_byid:'/readFs/byid',//查看用户施肥机名称信息
 	getFiState:"/getFI/getState",//智能灌溉控制器读取.
 	getFi_rtdata:"/getFi/rtdata",//首页智能灌溉
diff --git a/pages/fertilizer_machine_new/fertilizer_machine_new.vue b/pages/fertilizer_machine_new/fertilizer_machine_new.vue
index bd7265c..35289f2 100644
--- a/pages/fertilizer_machine_new/fertilizer_machine_new.vue
+++ b/pages/fertilizer_machine_new/fertilizer_machine_new.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="fertilizer_machine">
-		<u-navbar :background="background" :is-back='true' back-icon-color='#FFFFFF' :border-bottom="false" title="施肥机"
+		<u-navbar :background="background" :is-back='true' back-icon-color='#FFFFFF' :border-bottom="false" title="智能灌溉控制器"
 			title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
 
 		<view class="content">
@@ -106,10 +106,11 @@
 					</view>
 				</view>
 			</view>
-			<view class="set">
+			<view class="set" v-if="readFs_byid_name_obj">
 				<view class="item" v-for="(item,index) in 16" :key="index" @click="showPop(index+1)">
 					<view class="left">
-						{{index+1}}#灌溉组
+						{{readFs_byid_name_obj['name'+(index+1)]}}
+						
 					</view>
 					<view class="right">
 						<text>设置</text>
@@ -395,7 +396,7 @@
 
 				timer_: null,
 				
-				readFs_byid_name_obj:{},
+				readFs_byid_name_obj:null,
 				readFs_byid_list:[
 					'solenoidOne',
 					'solenoidTwo',
@@ -501,7 +502,7 @@
 			getReadFs_byid(){
 				let deviceId = this.deviceId;
 				this.$http({
-					url:this.api.readFs_byid + '?deviceId=' + deviceId,
+					url:this.api.getFi_getName + '?deviceId=' + deviceId,
 					method:'GET'
 				}).then(res=>{
 					if(res.code == 200){
diff --git a/pages/timeEnvironment/timeEnvironment.vue b/pages/timeEnvironment/timeEnvironment.vue
index 8ede7e7..3bfe776 100644
--- a/pages/timeEnvironment/timeEnvironment.vue
+++ b/pages/timeEnvironment/timeEnvironment.vue
@@ -561,11 +561,13 @@
 									.getcontrol_rtdata) + "?equipmentId=" + i.deviceId,
 								method: 'post',
 							}).then(res => {
-
+								uni.hideLoading({
+									title: '完成'
+								});
 								if (res.code == 200 && res.data.length != 0) {
-									uni.hideLoading({
-										title: '完成'
-									});
+									// uni.hideLoading({
+									// 	title: '完成'
+									// });
 									uni.stopPullDownRefresh();
 									i.childList = res.data;
 									i.childList_mubiao = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == '目标' || (this.getStatus(el.equipmentNumber, el.targetValue)) == ('目标' + el.equipmentNumber +'#'));