~

api/driverapi.js

@@ -61,6 +61,8 @@ let api = {
 	getcontrol_rtDatastation:'/getcontrol/rtDatastation',//主页查看控制器气象站实时数据 
 	
 	readControl_interiorthermalinsulation:'/readControl/interiorthermalinsulation',//读取（内保温）控制器 
+	
+	equip_chartdata:'/equip/chartdata',//气象站实时数据折线图
 
 
 	//countType计算类型 0是原数据 1是原数据-400 2是原数据/10 3是(原数据-400) / 10 4是(原数据-1000)/10

pages/target_water_fertilizer_PH/target_water_fertilizer_PH.vue

@@ -2,7 +2,7 @@
 	<view class="target_water_fertilizer_PH">
 		<!-- 目标水肥PH -->
 		<u-navbar :background="background" :is-back='true' back-icon-color='#FFFFFF' :border-bottom="false"
-			:title="titleName+echartName" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
+			:title="(flag != 1 ? titleName : '') + echartName" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
 
 		<view class="navbar">
 			<image src="../../static/PH_bg.png" mode=""></image>
@@ -10,7 +10,7 @@
 
 		<view class="content">
 			<view class="number">
-				{{ valuePH + unit }}
+				{{ echartName == '风向' ? getWindDirection(valuePH) : (valuePH + unit) }}
 			</view>
 			<view class="data_analysis">
 				<image src="../../static/data_analysis.png" mode=""></image>
@@ -19,7 +19,7 @@
 			<view class="echart">
 				<view class="title">
 					<image src="../../static/icon_ph.png" mode=""></image>
-					<text>{{ titleName+echartName }}</text>
+					<text>{{ (flag != 1 ? titleName : '') + echartName }}</text>
 				</view>
 				<view id="echart_p">
 					<qiun-data-charts type="area" :opts="opts" :chartData="chartData" :ontouch="true"
@@ -93,7 +93,8 @@
 				equipmentName:'',
 
 				titleName: '',
-				echartName: ''
+				echartName: '',
+				flag:''
 			};
 		},
 		onReady() {
@@ -119,6 +120,9 @@
 			if(option.equipmentName){
 				this.equipmentName = option.equipmentName
 			}
+			if(option.flag){
+				this.flag = option.flag
+			}
 
 			this.titleName = this.getStatus(option.equipmentNumber, option.targetValue)
 		},
@@ -134,7 +138,7 @@
 					let res = {
 						categories: this.categoriesList,
 						series: [{
-							name: this.titleName + this.echartName,
+							name: (this.flag != 1 ? this.titleName : '') + this.echartName,
 							data: this.newValuePHList
 						}, ]
 					};
@@ -144,32 +148,83 @@
 
 			// 获取折线图数据
 			getEchartsData() {
-				this.$http({
+				if(this.flag != 1){
-					url: (this.equipmentName == 1 ? this.api.chart_fsdata : this.api.getcontrol_fsdata) + '?equipmentId=' + this.equipmentId,
+					this.$http({
-					method: 'POST'
+						url: (this.equipmentName == 1 ? this.api.chart_fsdata : this.api.getcontrol_fsdata) + '?equipmentId=' + this.equipmentId,
-				}).then(res => {
+						method: 'POST'
-					// console.log(res, '获取折线图数据');
+					}).then(res => {
-					res.data.forEach((i, index) => {
+						// console.log(res, '获取折线图数据');
-						this.categoriesList.push(i.time);
+						res.data.forEach((i, index) => {
-						this.valuePHList.push(i.value)
+							this.categoriesList.push(i.time);
-					})
+							this.valuePHList.push(i.value)
-					this.getServerData();
-
-					this.categoriesList = this.categoriesList.map(item => {
-						return item.split(' ')[1]
-					})
-					// console.log(this.categoriesList,'this.categoriesList');
-					// console.log(this.valuePHList,'this.valuePHList');
-					for(let k=0;k<this.valuePHList.length;k++){
-						// console.log(this.valuePHList[k]);
-						this.valuePHList[k].forEach((item,index)=>{
-							if(item.name == this.titleName + this.echartName){
-								this.newValuePHList.push(item.value==undefined?'':item.value)
-							}
 						})
-					}
+						this.getServerData();
-					// console.log(this.newValuePHList, '121212212121211111111');
+					
-				})
+						this.categoriesList = this.categoriesList.map(item => {
+							return item.split(' ')[1]
+						})
+						// console.log(this.categoriesList,'this.categoriesList');
+						// console.log(this.valuePHList,'this.valuePHList');
+						for(let k=0;k<this.valuePHList.length;k++){
+							// console.log(this.valuePHList[k]);
+							this.valuePHList[k].forEach((item,index)=>{
+								if(item.name == this.titleName + this.echartName){
+									this.newValuePHList.push(item.value==undefined?'':item.value)
+								}
+							})
+						}
+						// console.log(this.newValuePHList, '121212212121211111111');
+					})
+				}else{
+					this.$http({
+						url:this.api.equip_chartdata + '?equipmentId=' + this.equipmentId,
+						method: 'POST'
+					}).then(res=>{
+						// console.log(res,'气象站折线图数据');
+						res.data.forEach((i, index) => {
+							this.categoriesList.push(i.time);
+							this.valuePHList.push(i.value)
+						})
+						this.getServerData();
+											
+						this.categoriesList = this.categoriesList.map(item => {
+							return item.split(' ')[1]
+						})
+						for(let k=0;k<this.valuePHList.length;k++){
+							// console.log(this.valuePHList[k]);
+							this.valuePHList[k].forEach((item,index)=>{
+								if(item.name == this.echartName){
+									this.newValuePHList.push(item.value==undefined?'':item.value)
+								}
+							})
+						}
+					})
+				}
+				
+			},
+			
+			// 风向判定
+			getWindDirection(number){
+				let num = Number(number)
+				if(num <= 67 && num >= 22 ){
+					return '东北'
+				}else if(num > 67 && num < 112){
+					return '东'
+				}else if(num >= 112 && num <= 157){
+					return '东南'
+				}else if(num > 157 && num < 202){
+					return '南'
+				}else if(num >= 202 && num <= 247){
+					return '西南'
+				}else if(num > 247 && num < 292){
+					return '西'
+				}else if(num >= 292 && num <= 337){
+					return '西北'
+				}else if(num < 22){
+					return '北'
+				}else if(num > 337){
+					return '北'
+				}
 			},
 
 			// 判断是否是平均或者目标,或者是1#

pages/timeEnvironment/timeEnvironment.vue

@@ -32,7 +32,7 @@
 						<text>{{item0.deviceName}}</text>
 					</view>
 					<view class="detail">
-						<view class="item" v-for="item in item0.weatherListChild" :key="item.id">
+						<view class="item" v-for="item,index in item0.weatherListChild" :key="index" @click="toTarget_water_fertilizer_PH(item.equipmentId,item.environmentData,item.environmentDataId,item.equipmentNumber,item.targetValue,getTypeList(item.formula),item.equipmentName,1)">
 							<image :src="`../../static/icon_new/icon${ item.formula }.png`" mode=""></image>
 							<view class="info">
 								<view class="">
@@ -58,7 +58,7 @@
 						<text>{{item0.deviceTypeName}}</text>
 					</view>
 					<view class="detail">
-						<view class="item" v-for="item in item0.equipmentName30ListChild" :key="item.id">
+						<view class="item" v-for="item,index in item0.equipmentName30ListChild" :key="index" @click="toTarget_water_fertilizer_PH(item.equipmentId,item.environmentData,item.environmentDataId,item.equipmentNumber,item.targetValue,getTypeList(item.formula),item.equipmentName,1)">
 							<image :src="`../../static/icon_new/icon${ item.formula }.png`" mode=""></image>
 							<view class="info">
 								<view class="">
@@ -590,11 +590,11 @@
 			
 
 			// 跳转到折线图
-			toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue, unit, equipmentName) {
+			toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue, unit, equipmentName,flag) {
 				uni.navigateTo({
 					url: '/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' +
 						data + '&name=' + name + '&equipmentNumber=' + equipmentNumber + '&targetValue=' +
-						targetValue + '&unit=' + unit + '&equipmentName=' + equipmentName
+						targetValue + '&unit=' + unit + '&equipmentName=' + equipmentName + '&flag=' + flag
 				})
 			},
 

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -12006,7 +12006,7 @@ var api = (_api = {
   sel_user: "/api/sel/user",
   //根据id查询用户信息
   getFs_rtdata: "/getFs/rtdata"
-}, (0, _defineProperty2.default)(_api, "selFs_time", "/selFs/time"), (0, _defineProperty2.default)(_api, "sel_eqbyid", "/sel/eqbyid/"), (0, _defineProperty2.default)(_api, "chart_fsdata", "/chart/fsdata"), (0, _defineProperty2.default)(_api, "user_update_pwd", "/user/update/pwd"), (0, _defineProperty2.default)(_api, "readFs_state", "/readFs/state"), (0, _defineProperty2.default)(_api, "writeFs", "/writeFs"), (0, _defineProperty2.default)(_api, "readFs_reg", "/readFs/reg"), (0, _defineProperty2.default)(_api, "readJinHuaControl_reg", "/readJinHuaControl/reg"), (0, _defineProperty2.default)(_api, "writeJinHuaControl_write", "/writeJinHuaControl/write"), (0, _defineProperty2.default)(_api, "getcontrol_rtdata", "/getcontrol/rtdata"), (0, _defineProperty2.default)(_api, "getcontrol_fsdata", "/getcontrol/fsdata"), (0, _defineProperty2.default)(_api, "getcontrol_cpermission", '/getcontrol/cpermission'), (0, _defineProperty2.default)(_api, "getControl_getState", '/readControl/getState'), (0, _defineProperty2.default)(_api, "getReadControlliShuiControl", '/readControl/liShuiControl'), (0, _defineProperty2.default)(_api, "readControl_fiveControl", '/readControl/fiveControl'), (0, _defineProperty2.default)(_api, "getcontrol_wxgetpermission", '/getcontrol/wxgetpermission'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve1", '/readControl/solenoidValve1'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve2", '/readControl/solenoidValve2'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve3", '/readControl/solenoidValve3'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve4", '/readControl/solenoidValve4'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve5", '/readControl/solenoidValve5'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve6", '/readControl/solenoidValve6'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve7", '/readControl/solenoidValve7'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve8", '/readControl/solenoidValve8'), (0, _defineProperty2.default)(_api, "readControl_readfilllight", '/readControl/readfilllight'), (0, _defineProperty2.default)(_api, "readControl_readcirculationfan", '/readControl/readcirculationfan'), (0, _defineProperty2.default)(_api, "readControl_fanwetcurtain", '/readControl/fanwetcurtain'), (0, _defineProperty2.default)(_api, "readControl_innercurtain", '/readControl/innercurtain'), (0, _defineProperty2.default)(_api, "readControl_externalsunshade", '/readControl/externalsunshade'), (0, _defineProperty2.default)(_api, "readControl_readskylight", '/readControl/readskylight'), (0, _defineProperty2.default)(_api, "camera_gethls", '/camera/gethls'), (0, _defineProperty2.default)(_api, "camera_getphonehls", '/camera/getphonehls'), (0, _defineProperty2.default)(_api, "readFs_byid", '/readFs/byid'), (0, _defineProperty2.default)(_api, "getcontrol_geteqetdata", '/getcontrol/geteqetdata'), (0, _defineProperty2.default)(_api, "getcontrol_rtDatastation", '/getcontrol/rtDatastation'), (0, _defineProperty2.default)(_api, "readControl_interiorthermalinsulation", '/readControl/interiorthermalinsulation'), (0, _defineProperty2.default)(_api, "typeList", [{
+}, (0, _defineProperty2.default)(_api, "selFs_time", "/selFs/time"), (0, _defineProperty2.default)(_api, "sel_eqbyid", "/sel/eqbyid/"), (0, _defineProperty2.default)(_api, "chart_fsdata", "/chart/fsdata"), (0, _defineProperty2.default)(_api, "user_update_pwd", "/user/update/pwd"), (0, _defineProperty2.default)(_api, "readFs_state", "/readFs/state"), (0, _defineProperty2.default)(_api, "writeFs", "/writeFs"), (0, _defineProperty2.default)(_api, "readFs_reg", "/readFs/reg"), (0, _defineProperty2.default)(_api, "readJinHuaControl_reg", "/readJinHuaControl/reg"), (0, _defineProperty2.default)(_api, "writeJinHuaControl_write", "/writeJinHuaControl/write"), (0, _defineProperty2.default)(_api, "getcontrol_rtdata", "/getcontrol/rtdata"), (0, _defineProperty2.default)(_api, "getcontrol_fsdata", "/getcontrol/fsdata"), (0, _defineProperty2.default)(_api, "getcontrol_cpermission", '/getcontrol/cpermission'), (0, _defineProperty2.default)(_api, "getControl_getState", '/readControl/getState'), (0, _defineProperty2.default)(_api, "getReadControlliShuiControl", '/readControl/liShuiControl'), (0, _defineProperty2.default)(_api, "readControl_fiveControl", '/readControl/fiveControl'), (0, _defineProperty2.default)(_api, "getcontrol_wxgetpermission", '/getcontrol/wxgetpermission'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve1", '/readControl/solenoidValve1'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve2", '/readControl/solenoidValve2'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve3", '/readControl/solenoidValve3'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve4", '/readControl/solenoidValve4'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve5", '/readControl/solenoidValve5'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve6", '/readControl/solenoidValve6'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve7", '/readControl/solenoidValve7'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve8", '/readControl/solenoidValve8'), (0, _defineProperty2.default)(_api, "readControl_readfilllight", '/readControl/readfilllight'), (0, _defineProperty2.default)(_api, "readControl_readcirculationfan", '/readControl/readcirculationfan'), (0, _defineProperty2.default)(_api, "readControl_fanwetcurtain", '/readControl/fanwetcurtain'), (0, _defineProperty2.default)(_api, "readControl_innercurtain", '/readControl/innercurtain'), (0, _defineProperty2.default)(_api, "readControl_externalsunshade", '/readControl/externalsunshade'), (0, _defineProperty2.default)(_api, "readControl_readskylight", '/readControl/readskylight'), (0, _defineProperty2.default)(_api, "camera_gethls", '/camera/gethls'), (0, _defineProperty2.default)(_api, "camera_getphonehls", '/camera/getphonehls'), (0, _defineProperty2.default)(_api, "readFs_byid", '/readFs/byid'), (0, _defineProperty2.default)(_api, "getcontrol_geteqetdata", '/getcontrol/geteqetdata'), (0, _defineProperty2.default)(_api, "getcontrol_rtDatastation", '/getcontrol/rtDatastation'), (0, _defineProperty2.default)(_api, "readControl_interiorthermalinsulation", '/readControl/interiorthermalinsulation'), (0, _defineProperty2.default)(_api, "equip_chartdata", '/equip/chartdata'), (0, _defineProperty2.default)(_api, "typeList", [{
   label: '无意义的传感器',
   value: 0,
   countType: 0,

unpackage/dist/dev/mp-weixin/pages/target_water_fertilizer_PH/target_water_fertilizer_PH.js

@@ -128,6 +128,15 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var m0 = _vm.echartName == "风向" ? _vm.getWindDirection(_vm.valuePH) : null
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        m0: m0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -257,7 +266,8 @@ var _default = {
       unit: '',
       equipmentName: '',
       titleName: '',
-      echartName: ''
+      echartName: '',
+      flag: ''
     };
   },
   onReady: function onReady() {
@@ -282,6 +292,9 @@ var _default = {
     if (option.equipmentName) {
       this.equipmentName = option.equipmentName;
     }
+    if (option.flag) {
+      this.flag = option.flag;
+    }
     this.titleName = this.getStatus(option.equipmentNumber, option.targetValue);
   },
   mounted: function mounted() {
@@ -296,7 +309,7 @@ var _default = {
         var res = {
           categories: _this.categoriesList,
           series: [{
-            name: _this.titleName + _this.echartName,
+            name: (_this.flag != 1 ? _this.titleName : '') + _this.echartName,
             data: _this.newValuePHList
           }]
         };
@@ -306,31 +319,79 @@ var _default = {
     // 获取折线图数据
     getEchartsData: function getEchartsData() {
       var _this2 = this;
-      this.$http({
+      if (this.flag != 1) {
-        url: (this.equipmentName == 1 ? this.api.chart_fsdata : this.api.getcontrol_fsdata) + '?equipmentId=' + this.equipmentId,
+        this.$http({
-        method: 'POST'
+          url: (this.equipmentName == 1 ? this.api.chart_fsdata : this.api.getcontrol_fsdata) + '?equipmentId=' + this.equipmentId,
-      }).then(function (res) {
+          method: 'POST'
-        // console.log(res, '获取折线图数据');
+        }).then(function (res) {
-        res.data.forEach(function (i, index) {
+          // console.log(res, '获取折线图数据');
-          _this2.categoriesList.push(i.time);
+          res.data.forEach(function (i, index) {
-          _this2.valuePHList.push(i.value);
+            _this2.categoriesList.push(i.time);
-        });
+            _this2.valuePHList.push(i.value);
-        _this2.getServerData();
-        _this2.categoriesList = _this2.categoriesList.map(function (item) {
-          return item.split(' ')[1];
-        });
-        // console.log(this.categoriesList,'this.categoriesList');
-        // console.log(this.valuePHList,'this.valuePHList');
-        for (var k = 0; k < _this2.valuePHList.length; k++) {
-          // console.log(this.valuePHList[k]);
-          _this2.valuePHList[k].forEach(function (item, index) {
-            if (item.name == _this2.titleName + _this2.echartName) {
-              _this2.newValuePHList.push(item.value == undefined ? '' : item.value);
-            }
           });
-        }
+          _this2.getServerData();
-        // console.log(this.newValuePHList, '121212212121211111111');
+          _this2.categoriesList = _this2.categoriesList.map(function (item) {
-      });
+            return item.split(' ')[1];
+          });
+          // console.log(this.categoriesList,'this.categoriesList');
+          // console.log(this.valuePHList,'this.valuePHList');
+          for (var k = 0; k < _this2.valuePHList.length; k++) {
+            // console.log(this.valuePHList[k]);
+            _this2.valuePHList[k].forEach(function (item, index) {
+              if (item.name == _this2.titleName + _this2.echartName) {
+                _this2.newValuePHList.push(item.value == undefined ? '' : item.value);
+              }
+            });
+          }
+          // console.log(this.newValuePHList, '121212212121211111111');
+        });
+      } else {
+        this.$http({
+          url: this.api.equip_chartdata + '?equipmentId=' + this.equipmentId,
+          method: 'POST'
+        }).then(function (res) {
+          // console.log(res,'气象站折线图数据');
+          res.data.forEach(function (i, index) {
+            _this2.categoriesList.push(i.time);
+            _this2.valuePHList.push(i.value);
+          });
+          _this2.getServerData();
+          _this2.categoriesList = _this2.categoriesList.map(function (item) {
+            return item.split(' ')[1];
+          });
+          for (var k = 0; k < _this2.valuePHList.length; k++) {
+            // console.log(this.valuePHList[k]);
+            _this2.valuePHList[k].forEach(function (item, index) {
+              if (item.name == _this2.echartName) {
+                _this2.newValuePHList.push(item.value == undefined ? '' : item.value);
+              }
+            });
+          }
+        });
+      }
+    },
+    // 风向判定
+    getWindDirection: function getWindDirection(number) {
+      var num = Number(number);
+      if (num <= 67 && num >= 22) {
+        return '东北';
+      } else if (num > 67 && num < 112) {
+        return '东';
+      } else if (num >= 112 && num <= 157) {
+        return '东南';
+      } else if (num > 157 && num < 202) {
+        return '南';
+      } else if (num >= 202 && num <= 247) {
+        return '西南';
+      } else if (num > 247 && num < 292) {
+        return '西';
+      } else if (num >= 292 && num <= 337) {
+        return '西北';
+      } else if (num < 22) {
+        return '北';
+      } else if (num > 337) {
+        return '北';
+      }
     },
     // 判断是否是平均或者目标,或者是1#
     getStatus: function getStatus(equipmentNumber, targetValue) {

unpackage/dist/dev/mp-weixin/pages/target_water_fertilizer_PH/target_water_fertilizer_PH.wxml

@@ -1 +1 @@
-<view class="target_water_fertilizer_PH data-v-3d983434"><u-navbar vue-id="454957e0-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="{{titleName+echartName}}" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-3d983434" bind:__l="__l"></u-navbar><view class="navbar data-v-3d983434"><image src="../../static/PH_bg.png" mode class="data-v-3d983434"></image></view><view class="content data-v-3d983434"><view class="number data-v-3d983434">{{''+(valuePH+unit)+''}}</view><view class="data_analysis data-v-3d983434"><image src="../../static/data_analysis.png" mode class="data-v-3d983434"></image><text class="data-v-3d983434">数据分析</text></view><view class="echart data-v-3d983434"><view class="title data-v-3d983434"><image src="../../static/icon_ph.png" mode class="data-v-3d983434"></image><text class="data-v-3d983434">{{titleName+echartName}}</text></view><view id="echart_p" class="data-v-3d983434"><qiun-data-charts vue-id="454957e0-2" type="area" opts="{{opts}}" chartData="{{chartData}}" ontouch="{{true}}" background="none" class="data-v-3d983434" bind:__l="__l"></qiun-data-charts></view></view></view></view>
+<view class="target_water_fertilizer_PH data-v-3d983434"><u-navbar vue-id="454957e0-1" 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" class="data-v-3d983434" bind:__l="__l"></u-navbar><view class="navbar data-v-3d983434"><image src="../../static/PH_bg.png" mode class="data-v-3d983434"></image></view><view class="content data-v-3d983434"><view class="number data-v-3d983434">{{''+(echartName=='风向'?$root.m0:valuePH+unit)+''}}</view><view class="data_analysis data-v-3d983434"><image src="../../static/data_analysis.png" mode class="data-v-3d983434"></image><text class="data-v-3d983434">数据分析</text></view><view class="echart data-v-3d983434"><view class="title data-v-3d983434"><image src="../../static/icon_ph.png" mode class="data-v-3d983434"></image><text class="data-v-3d983434">{{(flag!=1?titleName:'')+echartName}}</text></view><view id="echart_p" class="data-v-3d983434"><qiun-data-charts vue-id="454957e0-2" type="area" opts="{{opts}}" chartData="{{chartData}}" ontouch="{{true}}" background="none" class="data-v-3d983434" bind:__l="__l"></qiun-data-charts></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/timeEnvironment/timeEnvironment.js

@@ -127,13 +127,14 @@ var render = function () {
   var _c = _vm._self._c || _h
   var l1 = _vm.__map(_vm.weatherList, function (item0, __i0__) {
     var $orig = _vm.__get_orig(item0)
-    var l0 = _vm.__map(item0.weatherListChild, function (item, __i1__) {
+    var l0 = _vm.__map(item0.weatherListChild, function (item, index) {
       var $orig = _vm.__get_orig(item)
-      var m0 =
+      var m0 = _vm.getTypeList(item.formula)
+      var m1 =
         !(item.equipmentStart == 0) && item.formula == "12"
           ? _vm.getWindDirection(item.environmentData)
           : null
-      var m1 =
+      var m2 =
         !(item.equipmentStart == 0) && !(item.formula == "12")
           ? _vm.getTypeList(item.formula)
           : null
@@ -141,6 +142,7 @@ var render = function () {
         $orig: $orig,
         m0: m0,
         m1: m1,
+        m2: m2,
       }
     })
     var g0 = item0.weatherListChild.length
@@ -161,22 +163,24 @@ var render = function () {
       g2: g2,
     }
   })
-  var l3 = _vm.__map(_vm.equipmentName30List, function (item0, __i2__) {
+  var l3 = _vm.__map(_vm.equipmentName30List, function (item0, __i1__) {
     var $orig = _vm.__get_orig(item0)
-    var l2 = _vm.__map(item0.equipmentName30ListChild, function (item, __i3__) {
+    var l2 = _vm.__map(item0.equipmentName30ListChild, function (item, index) {
       var $orig = _vm.__get_orig(item)
-      var m2 =
+      var m3 = _vm.getTypeList(item.formula)
+      var m4 =
         !(item.equipmentStart == 0) && item.formula == "12"
           ? _vm.getWindDirection(item.environmentData)
           : null
-      var m3 =
+      var m5 =
         !(item.equipmentStart == 0) && !(item.formula == "12")
           ? _vm.getTypeList(item.formula)
           : null
       return {
         $orig: $orig,
-        m2: m2,
         m3: m3,
+        m4: m4,
+        m5: m5,
       }
     })
     var g3 = item0.equipmentName30ListChild.length
@@ -203,226 +207,226 @@ var render = function () {
       var $orig = _vm.__get_orig(item1)
       var l4 = _vm.__map(item1.childList_mubiao, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m4 = _vm.getTypeList(item2.formula)
+        var m6 = _vm.getTypeList(item2.formula)
-        var m5 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m7 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m6 = !(item2.equipmentStart == 0)
+        var m8 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m4: m4,
-          m5: m5,
           m6: m6,
+          m7: m7,
+          m8: m8,
         }
       })
       var g6 = item1.childList_mubiao.length
       var l5 = _vm.__map(item1.childList_one, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m7 = _vm.getTypeList(item2.formula)
+        var m9 = _vm.getTypeList(item2.formula)
-        var m8 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m10 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m9 = !(item2.equipmentStart == 0)
+        var m11 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m7: m7,
-          m8: m8,
           m9: m9,
+          m10: m10,
+          m11: m11,
         }
       })
       var g7 = item1.childList_one.length
       var l6 = _vm.__map(item1.childList_two, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m10 = _vm.getTypeList(item2.formula)
+        var m12 = _vm.getTypeList(item2.formula)
-        var m11 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m13 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m12 = !(item2.equipmentStart == 0)
+        var m14 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m10: m10,
-          m11: m11,
           m12: m12,
+          m13: m13,
+          m14: m14,
         }
       })
       var g8 = item1.childList_two.length
       var l7 = _vm.__map(item1.childList_three, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m13 = _vm.getTypeList(item2.formula)
+        var m15 = _vm.getTypeList(item2.formula)
-        var m14 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m16 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m15 = !(item2.equipmentStart == 0)
+        var m17 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m13: m13,
-          m14: m14,
           m15: m15,
+          m16: m16,
+          m17: m17,
         }
       })
       var g9 = item1.childList_three.length
       var l8 = _vm.__map(item1.childList_four, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m16 = _vm.getTypeList(item2.formula)
+        var m18 = _vm.getTypeList(item2.formula)
-        var m17 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m19 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m18 = !(item2.equipmentStart == 0)
+        var m20 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m16: m16,
-          m17: m17,
           m18: m18,
+          m19: m19,
+          m20: m20,
         }
       })
       var g10 = item1.childList_four.length
       var l9 = _vm.__map(item1.childList_five, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m19 = _vm.getTypeList(item2.formula)
+        var m21 = _vm.getTypeList(item2.formula)
-        var m20 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m22 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m21 = !(item2.equipmentStart == 0)
+        var m23 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m19: m19,
-          m20: m20,
           m21: m21,
+          m22: m22,
+          m23: m23,
         }
       })
       var g11 = item1.childList_five.length
       var l10 = _vm.__map(item1.childList_six, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m22 = _vm.getTypeList(item2.formula)
+        var m24 = _vm.getTypeList(item2.formula)
-        var m23 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m25 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m24 = !(item2.equipmentStart == 0)
+        var m26 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m22: m22,
-          m23: m23,
           m24: m24,
+          m25: m25,
+          m26: m26,
         }
       })
       var g12 = item1.childList_six.length
       var l11 = _vm.__map(item1.childList_seven, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m25 = _vm.getTypeList(item2.formula)
+        var m27 = _vm.getTypeList(item2.formula)
-        var m26 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m28 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m27 = !(item2.equipmentStart == 0)
+        var m29 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m25: m25,
-          m26: m26,
           m27: m27,
+          m28: m28,
+          m29: m29,
         }
       })
       var g13 = item1.childList_seven.length
       var l12 = _vm.__map(item1.childList_eight, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m28 = _vm.getTypeList(item2.formula)
+        var m30 = _vm.getTypeList(item2.formula)
-        var m29 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m31 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m30 = !(item2.equipmentStart == 0)
+        var m32 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m28: m28,
-          m29: m29,
           m30: m30,
+          m31: m31,
+          m32: m32,
         }
       })
       var g14 = item1.childList_eight.length
       var l13 = _vm.__map(item1.childList_nine, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m31 = _vm.getTypeList(item2.formula)
+        var m33 = _vm.getTypeList(item2.formula)
-        var m32 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m34 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m33 = !(item2.equipmentStart == 0)
+        var m35 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m31: m31,
-          m32: m32,
           m33: m33,
+          m34: m34,
+          m35: m35,
         }
       })
       var g15 = item1.childList_nine.length
       var l14 = _vm.__map(item1.childList_ten, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m34 = _vm.getTypeList(item2.formula)
+        var m36 = _vm.getTypeList(item2.formula)
-        var m35 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m37 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m36 = !(item2.equipmentStart == 0)
+        var m38 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m34: m34,
-          m35: m35,
           m36: m36,
+          m37: m37,
+          m38: m38,
         }
       })
       var g16 = item1.childList_ten.length
       var l15 = _vm.__map(item1.childList_eleven, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m37 = _vm.getTypeList(item2.formula)
+        var m39 = _vm.getTypeList(item2.formula)
-        var m38 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m40 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m39 = !(item2.equipmentStart == 0)
+        var m41 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m37: m37,
-          m38: m38,
           m39: m39,
+          m40: m40,
+          m41: m41,
         }
       })
       var g17 = item1.childList_eleven.length
       var l16 = _vm.__map(item1.childList_twelve, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m40 = _vm.getTypeList(item2.formula)
+        var m42 = _vm.getTypeList(item2.formula)
-        var m41 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m43 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m42 = !(item2.equipmentStart == 0)
+        var m44 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m40: m40,
-          m41: m41,
           m42: m42,
+          m43: m43,
+          m44: m44,
         }
       })
       var g18 = item1.childList_twelve.length
       var l17 = _vm.__map(item1.childList_thirteen, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m43 = _vm.getTypeList(item2.formula)
+        var m45 = _vm.getTypeList(item2.formula)
-        var m44 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m46 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m45 = !(item2.equipmentStart == 0)
+        var m47 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m43: m43,
-          m44: m44,
           m45: m45,
+          m46: m46,
+          m47: m47,
         }
       })
       var g19 = item1.childList_thirteen.length
       var l18 = _vm.__map(item1.childList_fourteen, function (item2, index2) {
         var $orig = _vm.__get_orig(item2)
-        var m46 = _vm.getTypeList(item2.formula)
+        var m48 = _vm.getTypeList(item2.formula)
-        var m47 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
+        var m49 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
-        var m48 = !(item2.equipmentStart == 0)
+        var m50 = !(item2.equipmentStart == 0)
           ? _vm.getTypeList(item2.formula)
           : null
         return {
           $orig: $orig,
-          m46: m46,
-          m47: m47,
           m48: m48,
+          m49: m49,
+          m50: m50,
         }
       })
       var g20 = item1.childList_fourteen.length
@@ -1134,9 +1138,9 @@ var _default = {
       });
     },
     // 跳转到折线图
-    toTarget_water_fertilizer_PH: function toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue, unit, equipmentName) {
+    toTarget_water_fertilizer_PH: function toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue, unit, equipmentName, flag) {
       uni.navigateTo({
-        url: '/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data + '&name=' + name + '&equipmentNumber=' + equipmentNumber + '&targetValue=' + targetValue + '&unit=' + unit + '&equipmentName=' + equipmentName
+        url: '/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data + '&name=' + name + '&equipmentNumber=' + equipmentNumber + '&targetValue=' + targetValue + '&unit=' + unit + '&equipmentName=' + equipmentName + '&flag=' + flag
       });
     },
     // 数据单位