Merge branch 'master' of http://116.63.33.55/git/read_opc

reado-app/static/webview/bar-wv.html

@@ -104,6 +104,8 @@
 							show: false
 						}
 					},
+					confine: true,
+					extraCssText: 'white-space: normal; word-break: break-all;',
 					backgroundColor: 'rgba(255,255,255,0.1)', //通过设置rgba调节背景颜色与透明度
 					position: 'inside',
 					formatter: function(params) {

reado-app/static/webview/dataItem-wv.html

@@ -54,6 +54,8 @@
 							show: false
 						}
 					},
+					confine: true,
+					extraCssText: 'white-space: normal; word-break: break-all;',
 					backgroundColor: 'rgba(255,255,255,0.1)', //通过设置rgba调节背景颜色与透明度
 					position: 'inside',
 					formatter: function(params) {

reado-app/static/webview/line-wv.html

@@ -103,8 +103,10 @@
 						},
 						label: {
 							show: false
-						}
+						},
 					},
+					confine: true,
+					extraCssText: 'white-space: normal; word-break: break-all;',
 					backgroundColor: 'rgba(255,255,255,0.1)', //通过设置rgba调节背景颜色与透明度
 					position: 'inside',
 					formatter: function(params) {
@@ -155,7 +157,7 @@
 							// this.url =
 							// 	`http://192.168.0.41:8081/chart/getChartById?id=${id}&startTime=${startTime}&endTime=${endTime}`
 							this.url = window.location.origin +
-								`/chart/getChartById?id=${id}&startTime=${startTime}&endTime=${endTime}`
+								`/chart/getChartById?id=${id}&startTime=${startTime}&endTime=${endTime}` 
 							xhr.setRequestHeader("Authorization", "Bearer " +
 								token);
 							xhr.setRequestHeader("token", token);
@@ -237,9 +239,7 @@
 								beforeSend: function(xhr) {
 									// this.url =
 									// 	`http://192.168.0.41:8081/chart/getChartById?id=${id}&startTime=${lastTime}&endTime=${currentTime}`
-									this.url = window.location.origin +
-										"/chart/getChartById?id=" + id + "&startTime=" +
-										lastTime + "&endTime=" + currentTime
+									this.url=window.location.origin+"/chart/getChartById?id="+id+"&startTime="+lastTime+"&endTime="+currentTime
 									xhr.setRequestHeader("Authorization", "Bearer " +
 										token);
 									xhr.setRequestHeader("token", token);

reado-app/static/webview/pie-wv.html

@@ -85,7 +85,9 @@
 					top: 20
 				},
 				tooltip: {
-					trigger: 'item'
+					trigger: 'item',
+					confine: true,
+					extraCssText: 'white-space: normal; word-break: break-all;',
 				},
 				series: []
 			};
@@ -150,7 +152,7 @@
 						})
 
 						option.series = [{
-							'type': 'pie',
+							type: 'pie',
 							radius: '55%',
 							label: {
 								show: false