气象站设备状态

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.7.3",
-    "versionCode" : 173,
+    "versionName" : "1.7.4",
+    "versionCode" : 174,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/prevention/equipmentdetails.vue

@@ -85,7 +85,7 @@
 				this.olddatas = [{
 						icon: '/image/cb/icon02.png',
 						txt: '设备开关',
-						value: Number(this.olddata.ds) == 1 ? '开机' : "关机",
+						value: this.olddata.ds,
 					},
 					{
 						icon: '/image/cb/icon05.png',
@@ -120,11 +120,11 @@
 					}, {
 						icon: '/image/prevention/101.png',
 						txt: '雨控状态',
-						value: Number(this.olddata.rps) == 1 ? "雨控" : '正常'
+						value: this.olddata.rps
 					}, {
 						icon: '/image/prevention/102.png',
 						txt: '温控状态',
-						value: Number(this.olddata.tps) == 1 ? "温控" : '正常'
+						value:this.olddata.tps
 					},
 					{
 						icon: '/image/prevention/105.png',
@@ -134,7 +134,7 @@
 					{
 						icon: '/image/prevention/106.png',
 						txt: '电池电压',
-						value: Number(this.olddata.bv)
+						value: this.olddata.bv
 					}
 				]
 			},
@@ -154,14 +154,15 @@
 				this.dataloadingtf = false
 				if (res.data.length != 0) {
 					this.olddata = res.data[0].d_h_t
-					this.newdatesTF = true
-					if (Number(this.olddata.ws) == 0) {
-						this.work = "待机"
-					} else if (Number(this.olddata.ws) == 1) {
-						this.work = "工作"
-					} else {
-						this.work = "充电"
-					}
+					this.newdatesTF = true;
+					this.work = this.olddata.ws;
+					// if (Number(this.olddata.ws) == 0) {
+					// 	this.work = "待机"
+					// } else if (Number(this.olddata.ws) == 1) {
+					// 	this.work = "工作"
+					// } else {
+					// 	this.work = "充电"
+					// }
 				} else {
 					this.newdatesTF = false
 				}

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/921d7260-ddbf-11ee-b1d4-c5470969b847
+https://app.liuyingyong.cn/build/download/d9d81b40-e766-11ee-a21b-f5d4eeaf09cc

util/neutral.js

@@ -1,4 +1,4 @@
 export default{
-	// isneutral:true//云飞智控
-	isneutral:false//智控
+	isneutral:true//云飞智控
+	// isneutral:false//智控
 }