环境监测设备详情页面展示要素不全的问题

manifest.json

@@ -2,8 +2,8 @@
     "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.5.4",
-    "versionCode" : 154,
+    "versionName" : "1.5.5",
+    "versionCode" : 155,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -66,7 +66,9 @@
                 "abiFilters" : [ "armeabi-v7a", "x86" ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "geolocation" : {

pages/environment/equipment.vue

@@ -148,8 +148,8 @@
 						}
 					}
 				}
-				console.clear()
-				console.log(this.olddata)
+				// console.clear()
+				// console.log(this.olddata)
 				// this.realtimeTF = true
 				// for (var key in this.olddata) {
 				// 	this.realtimeTF = false
@@ -162,15 +162,17 @@
 			},
 			// weather.weather.qxz_data_chart 一天的数据
 			async onehistory() { //设备列表
-				var newtime = +new Date() / 1000
-				var oldtime = newtime - 24 * 60 * 60
-
+				
+				var date = new Date()
+				var newtime = +date / 1000
+				// var oldtime = newtime - 24 * 60 * 60
+				var oldtime = Number(new Date(date.toLocaleDateString()).getTime()) / 1000;
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=weather.weather.qxz_data_chart',
 					data: {
 						device_id: this.eqinfo.item.equip_id || this.eqinfo.item.device_id,
-						begin: parseInt(oldtime),
-						end: parseInt(newtime)
+						begin: parseInt(oldtime - 24 * 60 * 60),
+						end: parseInt(newtime - 24 * 60 * 60)
 					}
 				})
 
@@ -237,8 +239,12 @@
 					var times = new Date(this.onedatas[i].time * 1000)
 					// console.log(this.onedatas[i].dat[this.olddata[key].value[2]].split("#")[0])
 					arr.unshift(Number(this.onedatas[i].dat[this.olddata[key].value[2]].split("#")[0]))
-					xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times
-						.getMinutes())
+					if(times.getMinutes().toString().length>=2){
+						xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
+					} else{
+						xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":0" + times.getMinutes())
+					}
+					
 					timearr.unshift(+new Date(times) / 1000)
 					obj.data.unshift(Number(this.onedatas[i].dat[this.olddata[key].value[2]].split("#")[0]))
 				}
@@ -263,7 +269,7 @@
 				} else {
 					this.tishiTF = false
 				}
-				// console.log(xtitle)
+				console.log(xtitle)
 				// console.log(linearr)
 				// return
 				this.showColumn("canvasColumnA", xtitle, linearr)

pages/environment/history.vue

@@ -157,12 +157,13 @@
 				} else {
 					this.canvastishiTF = true
 					for (var key in res.conf) {
-						if (res.conf[key] != "") {
+						if (res.conf[key]) {
 							this.titletext.push(res.conf[key])
 						}
 					}
 					this.conflist(res, "e1")
 				}
+				console.log(this.titletext)
 			},
 			conflist(res, eindex) {
 				var xtitle = []

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/a7f56010-172c-11ed-af7a-dfbd9fdca133
+https://ide.dcloud.net.cn/build/download/5c7bedd0-ea5e-11ed-a29d-afa624b9b080

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=E:/大数据平台app安装包/签名证书/yfzhikong.keystore
+andrCertfile=F:/bin/yfzhikong.keystore
 andrCertAlias=testalias
 andrCertPass=uecGPNMV8s+KLcdEgW/MRg==

unpackage/cache/wgt/__UNI__DBA6730/static/h52.html

@@ -115,7 +115,7 @@
 				<div class="left" ontouchstart="configCamera('move', 2)" ontouchend="stopConfigCamera()">
 
 				</div>
-				<div class="right" ontouchstart="configCamera('move', 6)" ontouchend="stopConfigCamera()">
+				<div class="right" ontouchstart="configCamera('move', 3)" ontouchend="stopConfigCamera()">
 
 				</div>
 			</div>
@@ -190,7 +190,7 @@
 		}).then((res) => {
 			console.log(res.data)
 			var data = eval("(" + res.data + ")");
-			var hlsHdSrc = data.hls;
+			var hlsHdSrc = data.hlsHd;
 			console.log(hlsHdSrc)
 			var rtmpHdSrc = data.rtmpHd;
 			var playHtml =

unpackage/cache/wgt/__UNI__DBA6730/static/js/equipState_dict.json

@@ -1,3 +1,4 @@
+
 {   
     "imei":{
         "name":"设备ID",
@@ -35,7 +36,7 @@
         "value":{
             "0":"待机",
             "1":"工作",
-            "2":"工作"
+            "2":"充电"
         },
         "desc":"工作状态、0 待机， 1 工作"
     },
@@ -362,6 +363,17 @@
         },
         "desc":"摄像头状态 0 正常, 1 异常"
     },
+    "work_sta":{
+        "name":"摄像头状态",
+        "unit":"",
+        "value":{
+            "0":"待机",
+            "1":"收集",
+            "2": "培养",
+            "3": "拍照"
+        },
+        "desc":"摄像头状态 0 待机, 1 收集, 2 培养, 3 拍照"
+    },
     "imgres":{
         "name":"图片分辨率",
         "unit":"",
@@ -520,4 +532,5 @@
         ],
         "desc":"sim卡状态"
     }
+    
 }

unpackage/dist/dev/app-plus/app-view.js

@@ -28540,7 +28540,7 @@ var render = function () {
                   _c(
                     "uni-view",
                     { staticClass: _vm._$g(32, "sc"), attrs: { _i: 32 } },
-                    _vm._l(_vm._$g(33, "f"), function (item, key, $20, $30) {
+                    _vm._l(_vm._$g(33, "f"), function (item, index, $20, $30) {
                       return _c(
                         "uni-view",
                         {