wangjiawen 4 years ago
parent
commit
f512eff986
42 changed files with 9409 additions and 5369 deletions
  1. 25 5
      components/detail/Detail.vue
  2. 2 2
      unpackage/dist/dev/app-plus/app-config-service.js
  3. 862 412
      unpackage/dist/dev/app-plus/app-service.js
  4. 8519 4946
      unpackage/dist/dev/app-plus/app-view.js
  5. 1 1
      unpackage/dist/dev/app-plus/manifest.json
  6. BIN
      unpackage/dist/dev/app-plus/static/logo1.png
  7. BIN
      unpackage/dist/dev/app-plus/static/picture/DingWei.png
  8. BIN
      unpackage/dist/dev/app-plus/static/picture/SanJiao.png
  9. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/pic_tu_01.png
  10. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/pic_tu_02.png
  11. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/pic_tu_03.png
  12. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-10C.png
  13. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-15C.png
  14. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-20C.png
  15. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-25C.png
  16. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-30C.png
  17. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-35C.png
  18. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-40C.png
  19. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-45C.png
  20. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-50C.png
  21. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-5C.png
  22. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/0C.png
  23. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/10C.png
  24. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/15C.png
  25. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/20C.png
  26. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/25C.png
  27. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/30C.png
  28. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/35C.png
  29. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/40C.png
  30. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/45C.png
  31. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/50C.png
  32. BIN
      unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/5C.png
  33. BIN
      unpackage/dist/dev/app-plus/static/picture/weatherProphet_40/weatherCalendarCardList40/weatherCalendarCard40/blue22.png
  34. BIN
      unpackage/dist/dev/app-plus/static/picture/weatherProphet_40/weatherCalendarCardList40/weatherCalendarCard40/white22.png
  35. BIN
      unpackage/dist/dev/app-plus/static/picture/weatherProphet_40/weatherCalendarCardList40/weatherCalendarCard40/white30.png
  36. BIN
      unpackage/dist/dev/app-plus/static/picture/weatherTemperatureWindSpeedCard_7/blue22.png
  37. BIN
      unpackage/dist/dev/app-plus/static/picture/weatherTemperatureWindSpeedCard_7/iconall.png
  38. BIN
      unpackage/dist/dev/app-plus/static/picture/weatherTemperatureWindSpeedCard_7/white30.png
  39. BIN
      unpackage/dist/dev/app-plus/static/picture/weatherTemperatureWindSpeedCard_8_15/white30.png
  40. 0 1
      unpackage/dist/dev/app-plus/static/zy-search/delete.svg
  41. 0 1
      unpackage/dist/dev/app-plus/static/zy-search/search.svg
  42. 0 1
      unpackage/dist/dev/app-plus/static/zy-search/voice.svg

+ 25 - 5
components/detail/Detail.vue

@@ -93,7 +93,14 @@ export default {
 	onReady() {},
 
 	methods: {
-		targetdetail_target() {
+		async targetdetail_target() {
+			let ip;
+			uni.request({
+			    url: "http://192.168.1.104:8082/targetdetail/targetdetail_target?pointKey=HB_GD_KBF_JS_P4_L19_220_CI0136",
+			    success: (res) => {
+			        ip = res.data;
+			    }
+			});
 			let _this = this;
 			// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
 			this.socketTask_targetdetail_target = uni.connectSocket({
@@ -112,7 +119,7 @@ export default {
 				// 注:只有连接正常打开中 ,才能正常收到消息
 				this.socketTask_targetdetail_target.onMessage(res => {
 					//console.log("收到服务器内容:" + res.data);
-					_this.targetdetail.targetdetail_target = res.data;
+					_this.targetdetail.targetdetail_target =JSON.parse(res.data)[ip];
 					console.log(_this.targetdetail.targetdetail_target);
 				});
 			});
@@ -122,6 +129,13 @@ export default {
 								}) */
 		},
 		targetdetail_curve() {
+			let ip;
+			uni.request({
+			    url: "http://192.168.1.104:8082/targetdetail/targetdetail_curve?pointKey=HB_GD_KBF_JS_P4_L19_220_CI0136",
+			    success: (res) => {
+			        ip = res.data;
+			    }
+			});
 			let _this = this;
 			// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
 			this.socketTask_targetdetail_curve = uni.connectSocket({
@@ -140,7 +154,7 @@ export default {
 				// 注:只有连接正常打开中 ,才能正常收到消息
 				this.socketTask_targetdetail_curve.onMessage(res => {
 					//console.log("收到服务器内容:" + res.data);
-					_this.targetdetail.targetdetail_curve = eval(res.data);
+					_this.targetdetail.targetdetail_curve = JSON.parse(res.data)[ip];
 				});
 			});
 			// 这里仅是事件监听【如果socket关闭了会执行】
@@ -168,7 +182,13 @@ export default {
 						return fmt;
 			};
 			
-			
+			let ip;
+			uni.request({
+			    url: "http://192.168.1.104:8082/targetdetail/targetdetail_histogram?pointKey=HB_GD_KBF_JS_P4_L19_220_CI0136",
+			    success: (res) => {
+			        ip = res.data;
+			    }
+			});
 			let _this = this;
 			// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
 			this.socketTask_targetdetail_histogram = uni.connectSocket({
@@ -187,7 +207,7 @@ export default {
 				// 注:只有连接正常打开中 ,才能正常收到消息
 				this.socketTask_targetdetail_histogram.onMessage(res => {
 					//console.log("收到服务器内容:" + res.data);
-					_this.targetdetail.targetdetail_histogram = eval(res.data);
+					_this.targetdetail.targetdetail_histogram = JSON.parse(res.data)[ip];
 					
 					let Column = {
 						 "categories": ["04/11","04/12", "04/13", "04/14", "04/15", "04/16", "04/17"],

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


File diff suppressed because it is too large
+ 862 - 412
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 8519 - 4946
unpackage/dist/dev/app-plus/app-view.js


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


BIN
unpackage/dist/dev/app-plus/static/logo1.png


BIN
unpackage/dist/dev/app-plus/static/picture/DingWei.png


BIN
unpackage/dist/dev/app-plus/static/picture/SanJiao.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/pic_tu_01.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/pic_tu_02.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/pic_tu_03.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-10C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-15C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-20C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-25C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-30C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-35C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-40C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-45C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-50C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/-5C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/0C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/10C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/15C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/20C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/25C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/30C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/35C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/40C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/45C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/50C.png


BIN
unpackage/dist/dev/app-plus/static/picture/thermometerCard/thermometer/5C.png


BIN
unpackage/dist/dev/app-plus/static/picture/weatherProphet_40/weatherCalendarCardList40/weatherCalendarCard40/blue22.png


BIN
unpackage/dist/dev/app-plus/static/picture/weatherProphet_40/weatherCalendarCardList40/weatherCalendarCard40/white22.png


BIN
unpackage/dist/dev/app-plus/static/picture/weatherProphet_40/weatherCalendarCardList40/weatherCalendarCard40/white30.png


BIN
unpackage/dist/dev/app-plus/static/picture/weatherTemperatureWindSpeedCard_7/blue22.png


BIN
unpackage/dist/dev/app-plus/static/picture/weatherTemperatureWindSpeedCard_7/iconall.png


BIN
unpackage/dist/dev/app-plus/static/picture/weatherTemperatureWindSpeedCard_7/white30.png


BIN
unpackage/dist/dev/app-plus/static/picture/weatherTemperatureWindSpeedCard_8_15/white30.png


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/app-plus/static/zy-search/delete.svg


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/app-plus/static/zy-search/search.svg


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/app-plus/static/zy-search/voice.svg