Merge branch 'master' of ssh://114.115.147.140:22222/yf_lj/bigDataApp

manifest.json

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

pages.json

@@ -17,7 +17,7 @@
 				"navigationBarBackgroundColor": "#00B075"
 			}
 		}, {
-			"path": "pages/cb/index/index",
+			"path": "pages/cb/index/index", 
 			"style": {
 				"navigationBarTitleText": "测报系统",
 				"enablePullDownRefresh": true,

pages/cb/cbd/equip-set/imgpage.vue

@@ -31,7 +31,7 @@
 							<p class="iconfont icon-shanchu">删除</p>
 						</view>
 						<view class="icon_box" @click="shibie(item.id,item.addr)"
-							v-if="myuid == '4' || (disable==1 && device_type!=7)">
+							v-if="disable==1 && device_type!=7">
 							<p class="iconfont icon-shibie">识别</p>
 						</view>
 						<view class="icon_box" v-else-if="disable==2 && device_type!=7">

pages/environment/equipment.vue

@@ -43,18 +43,17 @@
 				<p class="realtime_title"><span>实时数据</span></p>
 				<view class="realtime_text">
 					<view class="realtime_text_item">
-						<view class="realtime_text_item_info" v-for="(item,key) in olddata" :key="key"
-							@click="oneday(key)">
-							<view class="item_info_img"
-								:style="{'background-color':olddatas[1]}">
+						<view class="realtime_text_item_info" v-for="(item,index) in olddata" :key="index"
+							@click="oneday(index,item)">
+							<view class="item_info_img" :style="{'background-color':olddatas[1]}">
 								<image
-									:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/icon_'+item[1]+'.png'"
+									:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/icon_'+item.value[1]+'.png'"
 									mode=""></image>
 							</view>
 							<view class="item_info_text">
-								<p>{{key}}</p>
+								<p>{{item.lable}}</p>
 								<p style="margin-top: 20rpx;">
-									{{parseFloat(olddata[key][0]) == -99.99 ?'N/A':parseFloat(item[0])}}
+									{{parseFloat(item.value[0]) == -99.99 ?'N/A':parseFloat(item.value[0])}}
 								</p>
 							</view>
 						</view>
@@ -97,7 +96,7 @@
 		data() {
 			return {
 				eqinfo: {},
-				olddata: {},
+				olddata: [],
 				olddatas: ["#fba825", "#53d67c", "#008cf2", "#fb504d", "#d87ffc", "#4ec5f0"],
 				city: "",
 				kongtf: false,
@@ -133,39 +132,47 @@
 					}
 				})
 				this.dataloadingtf = false
-				// this.olddata = res
-				// console.log(res)olddata
-				this.olddata = {}
+				this.olddata = []
 				for (var key in res.conf) {
 					if (res.conf[key]) {
 						if (res.conf[key].indexOf("#") != -1) {
-							this.olddata[res.conf[key].replace("#", "(") + ")"] = res.dat[key].split("#")
+							// let lable = res.conf[key].replace("#", "(") + ")"
+							console.log(res.conf[key])
+							this.olddata.push({
+								lable:res.conf[key].replace("#", "(") + ")",
+								value:res.dat[key].split('#')
+							})
+							// this.olddata[res.conf[key].replace("#", "(") + ")"] = res.dat[key].split("#")
 						} else {
-							this.olddata[res.conf[key]] = res.dat[key].split("#")
+							// this.olddata[res.conf[key]] = res.dat[key].split("#")
 						}
 					}
 				}
-				console.log(this.olddata)
-				this.realtimeTF = true
-				for (var key in this.olddata) {
-					this.realtimeTF = false
-				}
+				// console.clear()
+				// console.log(this.olddata)
+				// this.realtimeTF = true
+				// for (var key in this.olddata) {
+				// 	this.realtimeTF = false
+				// }
+				this.realtimeTF = false
 				// this.realtimeTF = arr.some(function(item){
 				// 	return item!=""
 				// })
-				console.log(this.realtimeTF)
+				// console.log(this.realtimeTF)
 			},
 			// 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)
 					}
 				})
 
@@ -214,27 +221,37 @@
 					url: "../afterSale/addafter?device_id=" + device_id + "&device_type=" + 5
 				})
 			},
-			oneday(key) {
+			oneday(key,item) {
 				// console.log(key)
 				var obj = {
-					name: key,
+					name: item.lable,
 					data: [],
 				}
 				var xtitle = []
 				var linearr = []
 				var arr = []
 				var timearr = []
+				// console.log(key)
+				// console.log(this.olddata)
+				// console.log(this.onedatas)
+				// return
 				for (var i = 0; i < this.onedatas.length; i++) {
 					var times = new Date(this.onedatas[i].time * 1000)
-					arr.unshift(Number(this.onedatas[i].dat[this.olddata[key][2]].split("#")[0]))
-					xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times
-						.getMinutes())
+					// 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]))
+					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][2]].split("#")[0]))
+					obj.data.unshift(Number(this.onedatas[i].dat[this.olddata[key].value[2]].split("#")[0]))
 				}
 				arr.sort(function(a, b) {
 					return a - b
 				})
+				// console.log(arr)
 				this.onedatasMin = arr[0]
 				this.onedatasMax = arr[arr.length - 1]
 				for (var i = 0; i < obj.data.length; i++) {
@@ -245,12 +262,16 @@
 						this.onedatasMintime = timearr[i]
 					}
 				}
+				console.log(obj)
 				linearr.push(obj)
 				if (obj.data.length == 0) {
 					this.tishiTF = true
 				} else {
 					this.tishiTF = false
 				}
+				console.log(xtitle)
+				// console.log(linearr)
+				// return
 				this.showColumn("canvasColumnA", xtitle, linearr)
 				this.show = true
 			},

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 = []

pages/my/index/index.vue

@@ -79,6 +79,17 @@
 					}
 				})
 			},
+			async getuserinfonew() {
+				const res = await this.$myRequest({
+					url: '/api/v2/theme/home/info/',
+				})
+				if(res.items && res.items.logo_url){
+					this.userinfos.image = res.items.logo_url
+				} else{
+					this.userinfos.image = ''
+				}
+				
+			},
 			async getUsermsg(user) {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=home.homes.personal_center',
@@ -86,8 +97,8 @@
 						username: user
 					}
 				})
-				console.log(res)
 				this.userinfos = res
+				this.getuserinfonew()
 			}, //user.login.logout_user
 			async getlogout() {
 				const res = await this.$myRequest({

pages/my/user-info/user-info.vue

@@ -60,6 +60,7 @@
 		},
 		methods: {
 			gainimg() { //添加图片
+				return
 				if (this.compileTF) {
 					uni.chooseImage({
 						count: 1, //默认9

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/27109590-0e4e-11ee-828d-892325c0b867

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卡状态"
     }
+    
 }