柒零 1 an în urmă
părinte
comite
7aa65ef949
2 a modificat fișierele cu 38 adăugiri și 12 ștergeri
  1. 37 12
      pages/index/index.js
  2. 1 0
      pages/index/index.wxss

+ 37 - 12
pages/index/index.js

@@ -68,10 +68,34 @@ const options = {
 }
 
 
-var humidityValue = 0;
-var humidityMax = 0;
-var humidityMin = 0;
+var humidityValue = 40;
+var humidityMax = 100;
+var humidityMin = 40;
 var humidityMarginLeft = 110;
+let chartCircularProgressBar;//圈圈
+
+
+function updateChartCircularProgressBarOption(rscore_desc, rscore_value, that) {
+	if (chartCircularProgressBar) {
+		setOption(chartCircularProgressBar);
+	} else {
+		that.selectComponent('#mychart-dom-gauge').init((canvas, width, height, dpr) => {
+			const chart = echarts.init(canvas, null, {
+				width: width,
+				height: height,
+				devicePixelRatio: dpr // new
+			});
+			canvas.setChart(chart);
+			setOption(chart);
+
+			// 将图表实例绑定到 this 上,可以在其他成员函数(如 dispose)中访问
+			chartCircularProgressBar = chart;
+
+			// 注意这里一定要返回 chart 实例,否则会影响事件处理等
+			return chart;
+		});
+	}
+}
 
 function checkState(state) {
 	return state == 'on' || state == 'off';
@@ -132,17 +156,17 @@ function setOption(chart) {
 			},
 			detail: {
 				valueAnimation: true,
-				width: '60%',
+				width: '100%',
 				offsetCenter: [0, '20%'],
-				fontSize: 28,
+				fontSize: "28px",
 				fontWeight: 'bolder',
 				formatter: function (value) {
-					return value.toFixed(0) + '{units|%}'
+					return `${value.toFixed(0) }` + '{units|%}'
 				},
 				color: '#3E3D44',
 				rich: {
 					units: {
-						fontSize: 12,
+						fontSize: "12px",
 						padding: [10, 0, 0, 1],
 						fontWeight: 'bolder',
 						color: '#333333'
@@ -1329,7 +1353,7 @@ Page({
 			setOption(chart);
 
 			// 将图表实例绑定到 this 上,可以在其他成员函数(如 dispose)中访问
-			this.chart = chart;
+			chartCircularProgressBar = chart;
 
 			this.setData({
 				isLoaded: true,
@@ -1340,6 +1364,7 @@ Page({
 			return chart;
 		});
 	},
+	
 
 
 
@@ -3143,11 +3168,11 @@ Page({
 								sliderValueHumidifier: ''
 							})
 							if (listHumidifierTemp.length && humidityValue != humidityValueTemp) {
-								humidityValue = humidityValueTemp;
+								humidityValue = humidityValueTemp || 40;
 								humidityMin = humidityMinTemp;
 								humidityMax = humidityMaxTemp;
 								that.checkHumidityMarginLeft()
-								that.initChartHumidifier();
+								updateChartCircularProgressBarOption()
 							}
 							wx.setStorageSync('tvEntityIds', tvEntityIdsTemp);
 							// console.log('listMiotMediaPlayerTemp='+JSON.stringify(listMiotMediaPlayerTemp));
@@ -3696,7 +3721,7 @@ Page({
 								isLoading: false,
 							})
 							if (listHumidifierTemp.length && humidityValue != humidityValueTemp) {
-								humidityValue = humidityValueTemp;
+								humidityValue = humidityValueTemp || 40;
 								humidityMin = humidityMinTemp;
 								humidityMax = humidityMaxTemp;
 								that.checkHumidityMarginLeft()
@@ -3792,7 +3817,7 @@ Page({
 		// }, 6000);
 		this.data.intervalId1 = setInterval(() => {
 			that.getHAData(that, that.data.hotelcode, that.data.roomcode);
-		}, 3000);
+		}, 5000);
 
 		// 第二个定时器,每2秒执行一次  
 		this.data.intervalId2 = setInterval(() => {

+ 1 - 0
pages/index/index.wxss

@@ -307,6 +307,7 @@ page {
 
 .echarts-container_humidityDial {
   width: 300rpx;
+  display: block;
   height: 300rpx;
 }