Browse Source

虫情分析

zhangsijie 2 years ago
parent
commit
e6a4b6b5ae
40 changed files with 43 additions and 33 deletions
  1. 3 3
      manifest.json
  2. 16 7
      pages/cb/cbd/equip-set/analyse.vue
  3. BIN
      static/images/waterandfernew/新建文件夹 (3)/left.png
  4. BIN
      static/images/waterandfernew/新建文件夹 (3)/midum.png
  5. BIN
      static/images/waterandfernew/新建文件夹 (3)/midum2.png
  6. BIN
      static/images/waterandfernew/新建文件夹 (3)/right.png
  7. BIN
      unpackage/cache/apk/__UNI__DBA6730_cm.apk
  8. 1 1
      unpackage/cache/apk/apkurl
  9. 1 1
      unpackage/cache/apk/cmManifestCache.json
  10. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png
  11. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png
  12. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png
  13. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png
  14. 2 2
      unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js
  15. 5 5
      unpackage/cache/wgt/__UNI__DBA6730/app-service.js
  16. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/app-view.js
  17. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/manifest.json
  18. 2 2
      unpackage/dist/build/app-plus/app-config-service.js
  19. 5 5
      unpackage/dist/build/app-plus/app-service.js
  20. 1 1
      unpackage/dist/build/app-plus/app-view.js
  21. 1 1
      unpackage/dist/build/app-plus/manifest.json
  22. BIN
      unpackage/res/icons/1024x1024.png
  23. BIN
      unpackage/res/icons/120x120.png
  24. BIN
      unpackage/res/icons/144x144.png
  25. BIN
      unpackage/res/icons/152x152.png
  26. BIN
      unpackage/res/icons/167x167.png
  27. BIN
      unpackage/res/icons/180x180.png
  28. BIN
      unpackage/res/icons/192x192.png
  29. BIN
      unpackage/res/icons/20x20.png
  30. BIN
      unpackage/res/icons/29x29.png
  31. BIN
      unpackage/res/icons/40x40.png
  32. BIN
      unpackage/res/icons/58x58.png
  33. BIN
      unpackage/res/icons/60x60.png
  34. BIN
      unpackage/res/icons/72x72.png
  35. BIN
      unpackage/res/icons/76x76.png
  36. BIN
      unpackage/res/icons/80x80.png
  37. BIN
      unpackage/res/icons/87x87.png
  38. BIN
      unpackage/res/icons/96x96.png
  39. 2 1
      util/api.js
  40. 2 2
      util/neutral.js

+ 3 - 3
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.7.1",
-    "versionCode" : 171,
+    "versionName" : "1.7.2",
+    "versionCode" : 172,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 16 - 7
pages/cb/cbd/equip-set/analyse.vue

@@ -496,13 +496,15 @@
 				var obj = []
 				if (res.at_ah_info.length != 0) {
 					var aharr = []
-					var atarr = []
+					var atHigharr = [] //高温
+					var atLowarr = [] //低温
 					var pestArr = []
 					let indentText = 0;
 					for (var i = 0; i < res.at_ah_info.length; i++) {
 						var times = new Date(res.at_ah_info[i].addtime * 1000)
 						xtitle.push(times.getMonth() + 1 + "/" + times.getDate())
-						atarr.push(res.at_ah_info[i].at == "" ? "0" : res.at_ah_info[i].at)
+						atHigharr.push(res.at_ah_info[i].at == "" ? "0" : res.at_ah_info[i].height)
+						atLowarr.push(res.at_ah_info[i].at == "" ? "0" : res.at_ah_info[i].low)
 						aharr.push(res.at_ah_info[i].ah == "" ? "0" : res.at_ah_info[i].ah)
 						if (this.checkObj(res.char_data) && res.char_data[this.wormvalue]) {
 							if (res.char_data[this.wormvalue][i - indentText] && (res.char_data[this.wormvalue][i -
@@ -529,11 +531,16 @@
 					// 			obj.push(wormobj)
 					// 		}
 					// 	}
-
+									
 					// }
-					var atobj = {
-						name: '温度',
-						data: atarr,
+					var atHighobj = {
+						name: '高温',
+						data: atHigharr,
+						color: '#ff0000'
+					}
+					var atlowobj = {
+						name: '低温',
+						data: atLowarr,
 						color: '#00E29D'
 					}
 					var ahobj = {
@@ -545,9 +552,11 @@
 						name: this.wormvalue,
 						data: pestArr,
 					}
-					obj.push(atobj)
+					obj.push(atHighobj)
+					obj.push(atlowobj)
 					obj.push(ahobj)
 					obj.push(pestObj)
+					console.log(obj)
 				}
 				this.showColumn("canvasColumnA", xtitle, obj)
 			},

BIN
static/images/waterandfernew/新建文件夹 (3)/left.png


BIN
static/images/waterandfernew/新建文件夹 (3)/midum.png


BIN
static/images/waterandfernew/新建文件夹 (3)/midum2.png


BIN
static/images/waterandfernew/新建文件夹 (3)/right.png


BIN
unpackage/cache/apk/__UNI__DBA6730_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/dc2ec810-7965-11ee-830c-05575d56160e
+https://app.liuyingyong.cn/build/download/627e9750-dd13-11ee-be14-8b5b10ad9ea9

File diff suppressed because it is too large
+ 1 - 1
unpackage/cache/apk/cmManifestCache.json


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png


File diff suppressed because it is too large
+ 2 - 2
unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/cache/wgt/__UNI__DBA6730/app-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/app-view.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/manifest.json


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/build/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/manifest.json


BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png


+ 2 - 1
util/api.js

@@ -6,7 +6,8 @@ export const myRequest = (options) => {
 	if (BASE_URL == '') {
 		// BASE_URL = 'http://114.55.0.7:8002'//测试
 		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.1.110:8003" : "http://8.136.98.49:8002"
-		BASE_URL = process.env.NODE_ENV === 'development' ? "http://114.55.0.7:8002" : "http://8.136.98.49:8002"
+		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://114.55.0.7:8002" : "http://8.136.98.49:8002"
+		BASE_URL = process.env.NODE_ENV === 'development' ? "http://8.136.98.49:8002" : "http://8.136.98.49:8002"
 		// BASE_URL = 'http://192.168.1.77:8002'
 	}
 	// BASE_URL = 'http://192.168.1.52:8003'

+ 2 - 2
util/neutral.js

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