水肥改版

.hbuilderx/launch.json

@@ -2,6 +2,10 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"default" : 
      	{
      		"launchtype" : "local"

pages.json

@@ -881,6 +881,19 @@
 				}
 		
 			}]
+		},
+		{
+			"root": "pages/waterandfernew",
+			"pages": [{
+					"path": "details",
+					"style": {
+						"navigationBarTitleText": "水肥详情",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+		
+				}
+			]
 		}
 	],
 	"condition": { //模式配置，仅开发期间生效

pages/disease/forecastResult.vue

@@ -27,7 +27,8 @@
           </p>
           <p>预测位置：{{ this.address || "无" }}</p>
           <p>
-            最近预测时间：<span v-if="this.latest_uptime != ''">{{
+            最近预测时间：
+			<span v-if="this.latest_uptime">{{
                formetDate(this.latest_uptime)
             }}</span>
             <span v-else>暂无数据</span>

pages/equipList/index.vue

@@ -207,6 +207,20 @@ export default {
     },
     historys(item) {
       switch (this.type_id) {
+		  // 水肥新设备
+		  case 22:
+		  var obj = {};
+		  obj.d_id = item.d_id;
+		  obj.device_id = item.imei;
+		  obj.is_online = item.is_online;
+		  obj.lat = item.lat;
+		  obj.lng = item.lng;
+		  obj.equip_name = item.device_name;
+		  obj.uptime = item.addtime;
+		  uni.navigateTo({
+		    url: "../waterandfernew/details?shebei=" + JSON.stringify(obj),
+		  });
+		  break
         // 病虫害可视监测
         case 14:
           uni.navigateTo({

pages/prevention/control.vue

@@ -49,7 +49,7 @@
 					</view>
 				</view>
 				<view class="control_interval">
-					<p class="title_p">上传时间间隔(min)</p>
+					<p class="title_p">数据间隔(min)</p>
 					<view class="slider">
 						<view class="" style="width: 100%;padding-top: 18rpx;">
 							<slider value="0" v-model="condatas.dat_f" min="0" max="120" step="1" show-value block-size="18" activeColor="#57C878" @changing="changing"></slider>
@@ -57,7 +57,7 @@
 					</view>
 				</view>
 				<view class="control_timing">
-					<p class="title_p">自清虫定时(min)</p>
+					<p class="title_p">清虫间隔(min)</p>
 					<view class="slider">
 						<view class="" style="width: 100%;padding-top: 18rpx;">
 							<slider value="0" v-model="condatas.clt_t" min="0" max="120" step="1" show-value block-size="18" activeColor="#57C878" @changing="changing2"></slider>

pages/prevention/ucharts.vue

@@ -68,11 +68,12 @@
 							<td class="td">{{items.d_h_t.at==""?"--":items.d_h_t.at}}</td>
 							<td class="td">{{items.d_h_t.ah==""?"--":items.d_h_t.ah}}</td>
 							<td class="td">{{items.d_h_t.cv}}</td>
+							<td class="td">{{ items.d_h_t.vps == 0 ? '正常' :  items.d_h_t.vps == 1 ? '欠压' : items.d_h_t.vps == 2 ? '过压' : items.d_h_t.vps}}</td>
 							<td class="td">{{items.d_h_t.bv}}</td>
 							<td class="td">{{items.d_h_t.csq}}</td>
 						</tr>
 						<tr class="tr" v-if="!forbidden">
-							<td class="td" v-for="item in 13">暂无数据</td>
+							<td class="td" v-for="item in 14">暂无数据</td>
 						</tr>
 					</table>
 					<table class="table2" v-else-if="!allqingchong">
@@ -139,7 +140,7 @@
 	export default {
 		data() {
 			return {
-				thdata: ["上报时间", "设备开关", "工作状态", "雨控状态", "温控状态", "倾倒状态", "定时(h)", "电击次数", "温度(℃)", "湿度(%)", "充电电压(v)",
+				thdata: ["上报时间", "设备开关", "工作状态", "雨控状态", "温控状态", "倾倒状态", "定时(h)", "电击次数", "温度(℃)", "湿度(%)", "充电电压(v)","电压状态",
 					"电池电压(v)", "信号强度"
 				],
 				thdata2: ["上报时间", "设备开关", "工作状态", "雨控状态", "温控状态", "倾倒状态", "定时(h)", "电击次数", "温度(℃)", "湿度(%)"],