From a18dde79b1d35bbba46d5f68512dbb617bbc4ecd Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Fri, 28 Aug 2020 16:21:35 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
index d985a0f..4dc5240 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
@@ -194,6 +194,7 @@
let $ = layui.jquery;
var counts = 0;
var noData="无权查看";
+ layer.load(2);
// 加载医院统计数据
var loadHospitalChart = function (datatype) {
admin.req("api-user/syshospital/chartHospital?datatype=" + datatype, {}, function (data) {
@@ -278,6 +279,7 @@
};
chartcontract.setOption(optionchart, true);
}
+ layer.closeAll('loading');
}
}, "get");
}
@@ -328,6 +330,7 @@
chartproducts.setOption(optionchart, true);
}
}
+ layer.closeAll('loading');
}, "get");
}
@@ -345,16 +348,16 @@
var chartreport = echarts.init(document.getElementById('report'));
admin.req(apiUrl, {}, function (data) {
if (0 === data.code) {
- var listData = data.data;
+ var listData = data.data.data;
var Xdata = new Array();
var Ydata = new Array();
if (listData != null) {
for (let index = 0; index < listData.length; index++) {
- Xdata.push(listData[index].itemName);
+ Ydata.push(listData[index].itemValue);
if (dataType == "1") {
- Ydata.push(listData[index].collectYear);
+ Xdata.push(listData[index].collectYear);
} else if (dataType == "0") {
- Ydata.push(listData[index].collectYearMonth);
+ Xdata.push(listData[index].collectYearMonth);
}
}
var optionchart = {
@@ -385,6 +388,7 @@
};
chartreport.setOption(optionchart, true);
}
+ layer.closeAll('loading');
}
}, "get");
}
@@ -403,16 +407,16 @@
var chartaiphoto = echarts.init(document.getElementById('aiphoto'));
admin.req(apiUrl, {}, function (data) {
if (0 === data.code) {
- var listData = data.data;
+ var listData = data.data.data;
var Xdata = new Array();
var Ydata = new Array();
if (listData != null) {
for (let index = 0; index < listData.length; index++) {
- Xdata.push(listData[index].itemName);
+ Ydata.push(listData[index].itemValue);
if (dataType == "1") {
- Ydata.push(listData[index].collectYear);
+ Xdata.push(listData[index].collectYear);
} else if (dataType == "0") {
- Ydata.push(listData[index].collectYearMonth);
+ Xdata.push(listData[index].collectYearMonth);
}
}
var optionchart = {
@@ -443,6 +447,7 @@
};
chartaiphoto.setOption(optionchart, true);
}
+ layer.closeAll('loading');
}
}, "get");
}
--
Gitblit v1.8.0