1

.gitignore

@@ -1 +1,2 @@
-unpackage/
+unpackage/
+node_modules

api/driverapi.js

@@ -56,7 +56,24 @@ let api = {
 	camera_getphonehls:'/camera/getphonehls',//获取摄像头得地址 Copy Copy Copy Copy
 	
 	readFs_byid:'/readFs/byid',//查看用户施肥机名称信息
-	
+	getFiState:"/readControl/getFiState",//智能灌溉控制器读取.
+	irrigate1:"/readFi/irrigate1",//智能灌溉组
+	irrigate2:"/readFi/irrigate2",//智能灌溉组
+	irrigate3:"/readFi/irrigate3",//智能灌溉组
+	irrigate4:"/readFi/irrigate4",//智能灌溉组
+	irrigate5:"/readFi/irrigate5",//智能灌溉组
+	irrigate6:"/readFi/irrigate6",//智能灌溉组
+	irrigate7:"/readFi/irrigate7",//智能灌溉组
+	irrigate8:"/readFi/irrigate8",//智能灌溉组
+	irrigate9:"/readFi/irrigate9",//智能灌溉组
+	irrigate10:"/readFi/irrigate10",//智能灌溉组
+	irrigate11:"/readFi/irrigate11",//智能灌溉组
+	irrigate12:"/readFi/irrigate12",//智能灌溉组
+	irrigate13:"/readFi/irrigate13",//智能灌溉组
+	irrigate14:"/readFi/irrigate14",//智能灌溉组
+	irrigate15:"/readFi/irrigate15",//智能灌溉组
+	irrigate16:"/readFi/irrigate16",//智能灌溉组
+	writeFi_write:"/writeFi/write",//智能灌溉组写入
 	getcontrol_geteqetdata:'/getcontrol/geteqetdata',//小程序气象站显示
 	
 	getcontrol_rtDatastation:'/getcontrol/rtDatastation',//主页查看控制器气象站实时数据 
@@ -70,7 +87,7 @@ let api = {
 	camera_start:'/camera/start',//摄像头开始
 	camera_stop:'/camera/stop',//摄像头结束
 
-
+	
 	//countType计算类型 0是原数据 1是原数据-400 2是原数据/10 3是(原数据-400) / 10 4是(原数据-1000)/10
 	typeList: [{
 			label: '无意义的传感器',

pages/fertilizer_machine_new/fertilizer_machine_new.vue

@@ -365,7 +365,7 @@
 					"regNum": 72
 				}
 				this.$http({
-					url: this.api.readFs_state,
+					url: this.api.getFiState,
 					data: data
 				}).then(res => {
 					if (res.code == 200) {
@@ -458,12 +458,12 @@
 				const that = this
 				var data = {
 					equipmentId: this.deviceId,
-					pattern: 10 + (this.indexs - 1) + "00", //需要根据文档填写 //6目标ph-数值
-					regNum: 75,
+					// pattern: 10 + (this.indexs - 1) + "00", //需要根据文档填写 //6目标ph-数值
+					// regNum: 75,
 				};
 
 				this.$http({
-					url: this.api.readFs_reg,
+					url: '/readFi/irrigate'+this.indexs,
 					data: data
 				}).then((res) => {
 					// console.log(res, 11);

pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.vue

@@ -4,18 +4,20 @@
 			title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
 
 		<view class="content">
-			<view class="item" v-for="item,index in deviceList" :key="index" v-if="item.equipmentName==1">
-				<image src="../../static/icon_precise.png" mode=""></image>
-				<view class="center">
-					<text>{{item.deviceTypeName}}</text>
-					<text
-						:class="item.deviceState == 1 ? 'state' : 'state_act'">{{ item.deviceState == 1 ? "在线" : "离线"}}</text>
+			<template v-for="item,index in deviceList">
+				<view class="item"  :key="index" v-if="item.equipmentName==1||item.equipmentName==20">
+					<image src="../../static/icon_precise.png" mode=""></image>
+					<view class="center">
+						<text>{{item.deviceTypeName}}</text>
+						<text
+							:class="item.deviceState == 1 ? 'state' : 'state_act'">{{ item.deviceState == 1 ? "在线" : "离线"}}</text>
+					</view>
+					<view class="right" @click="toFertilizer(item)" v-if="item.deviceState == 1">
+						<text>状态</text>
+						<image src="../../static/right-arrow.png" mode=""></image>
+					</view>
 				</view>
-				<view class="right" @click="toFertilizer(item)" v-if="item.deviceState == 1">
-					<text>状态</text>
-					<image src="../../static/right-arrow.png" mode=""></image>
-				</view>
-			</view>
+			</template>
 		</view>
 	</view>
 </template>
@@ -102,7 +104,7 @@
 						uni.hideLoading()
 						uni.stopPullDownRefresh();
 						this.deviceList = res.data;
-						this.deviceList = this.deviceList.filter(e=>e.equipmentName == 1).sort((a,b)=>a.equipmentStatu - b.equipmentStatu)
+						this.deviceList = this.deviceList.filter(e=>e.equipmentName == 1||e.equipmentName == 20).sort((a,b)=>a.equipmentStatu - b.equipmentStatu)
 					}else {
 						this.$refs.uToast.show({
 							title: res.msg,