'update

config/settings.js

 
-var ServiceURL = 'http://192.168.26.8:9002';
+var ServiceURL = 'http://192.168.26.8:9001';
 
-window.VUE_APP_API = {ServiceURL:ServiceURL}
+window.VUE_APP_API = { ServiceURL: ServiceURL }

src/assets/js/chartTemplates.js

@@ -478,10 +478,7 @@ var Highchart = function () {
 				opacity: 1,
 				lineWidth: 3,
 			};
-			data.alarm.value.red = parseFloat(data.alarm.value.red);
-			data.alarm.value.orange = parseFloat(data.alarm.value.orange);
-			data.alarm.value.blue = parseFloat(data.alarm.value.blue);
-			data.alarm.value.yellow = parseFloat(data.alarm.value.yellow);
+
 
 			var alarmData = discernValidAlarmValue(data.alarm, data.lists, series, warningLine, option);
 			console.log(alarmData, "ala")

src/assets/js/httpApi.js

@@ -1105,8 +1105,10 @@ var reqApis = function () {
 											var chartOpts = {};
 											box.onclick = function (e) {
 												chartOpts.cache = ''
+
 												var tag = e.target || e.srcElement;
 												var divID = document.getElementById("contentbox");
+												divID.innerHTML = ""
 												if (tag.classList.contains('query')) {
 													if (box.tagBtn) {
 														box.tagBtn.classList.add('cu-btn-null');
@@ -1114,7 +1116,10 @@ var reqApis = function () {
 													};
 													that.pageApi.reqchart(query).then((res) => {
 														var body = res.body || [];
-
+														body.alarm.value.red = parseFloat(body.alarm.value.red);
+														body.alarm.value.orange = parseFloat(body.alarm.value.orange);
+														body.alarm.value.blue = parseFloat(body.alarm.value.blue);
+														body.alarm.value.yellow = parseFloat(body.alarm.value.yellow);
 														chartOpts.cache = Highchart.template.rich.call(that, chartEl, body, chartOpts);
 													})
 												} else if (tag.classList.contains('cu-btn')) {
@@ -1136,12 +1141,38 @@ var reqApis = function () {
 																return total + value;
 															}, 0);
 															num = num.toFixed(2)
-															divID.innerHTML = "降雨总量:" + num + body.danwei;
-															that.pageApi.reqchart(query).then((res) => {
-																var body = res.body || [];
+															if (query.hours == 1) {
+																divID.innerHTML = "当天降雨量:" + num + body.danwei;
+															} else {
+																divID.innerHTML = ""
+															}
+															if (query.hours == 1 || query.hours == 3 || query.hours == 6 || query.hours == 12) {
+																that.pageApi.reqchart(query).then((res) => {
+																	var body = res.body || [];
+																	body.alarm.value.red = parseFloat(body.alarm.value.red);
+																	body.alarm.value.orange = parseFloat(body.alarm.value.orange);
+																	body.alarm.value.blue = parseFloat(body.alarm.value.blue);
+																	body.alarm.value.yellow = parseFloat(body.alarm.value.yellow);
+																	delete body.alarm.value.orange;
+																	delete body.alarm.value.red;
+																	chartOpts.cache = Highchart.template.rich.call(that, chartEl, body, chartOpts);
 
-																chartOpts.cache = Highchart.template.rich.call(that, chartEl, body, chartOpts);
-															})
+																})
+															} else {
+																that.pageApi.reqchart(query).then((res) => {
+																	var body = res.body || [];
+																	body.alarm.value.red = parseFloat(body.alarm.value.red);
+																	body.alarm.value.orange = parseFloat(body.alarm.value.orange);
+																	body.alarm.value.blue = parseFloat(body.alarm.value.blue);
+																	body.alarm.value.yellow = parseFloat(body.alarm.value.yellow);
+																	chartOpts.cache = Highchart.template.rich.call(that, chartEl, body, chartOpts);
+																})
+															}
+
+															// that.pageApi.reqchart(query).then((res) => {
+															// 	var body = res.body || [];
+															// 	chartOpts.cache = Highchart.template.rich.call(that, chartEl, body, chartOpts, query.hours);
+															// })
 														} else {
 															divID.innerHTML = ''
 														}