From 07b3293fd92ee47c1db4d82de36ff3714a1da98e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 09 Oct 2020 18:33:31 +0800
Subject: [PATCH] 1.修改增加运营平台首页查看数据的角色值 2.修改部分角色的数据范围为空时的报错。

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html |   76 +++++++++++++++++++++++++++-----------
 1 files changed, 54 insertions(+), 22 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 0f9a8ef..5c497c5 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
@@ -35,7 +35,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!syshospital">
-                            <p class="big-font" id="h_hospital">无权查看</p>
+                            <p class="big-font" id="h_hospital"></p>
                         </a>
                     </div>
                 </div>
@@ -46,7 +46,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!product">
-                            <p class="big-font" id="u_product">无权查看</p>
+                            <p class="big-font" id="u_product"></p>
                         </a>
                     </div>
                 </div>
@@ -57,7 +57,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!verifyRecharge">
-                            <p class="big-font" id="t_product">无权查看</p>
+                            <p class="big-font" id="t_product"></p>
                         </a>
                     </div>
                 </div>
@@ -68,7 +68,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!feedback">
-                            <p class="big-font" id="u_feedback">无权查看</p>
+                            <p class="big-font" id="u_feedback"></p>
                         </a>
                     </div>
                 </div>
@@ -79,7 +79,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!dataneed">
-                            <p class="big-font" id="d_dataneed">无权查看</p>
+                            <p class="big-font" id="d_dataneed"></p>
                         </a>
                     </div>
                 </div>
@@ -92,7 +92,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!doctor">
-                            <p class="big-font" id="h_doctor">无权查看</p>
+                            <p class="big-font" id="h_doctor"></p>
                         </a>
                     </div>
                 </div>
@@ -103,7 +103,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!doctor">
-                            <p class="big-font" id="c_doctor">无权查看</p>
+                            <p class="big-font" id="c_doctor"></p>
                         </a>
                     </div>
                 </div>
@@ -114,7 +114,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!doctor">
-                            <p class="big-font" id="ht_doctor">无权查看</p>
+                            <p class="big-font" id="ht_doctor"></p>
                         </a>
                     </div>
                 </div>
@@ -125,7 +125,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!doctor">
-                            <p class="big-font" id="u_signing">无权查看</p>
+                            <p class="big-font" id="u_signing"></p>
                         </a>
                     </div>
                 </div>
@@ -136,7 +136,7 @@
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <a href="/#!doctor">
-                            <p class="big-font" id="d_isanswer">无权查看</p>
+                            <p class="big-font" id="d_isanswer"></p>
                         </a>
                     </div>
                 </div>
@@ -193,6 +193,8 @@
             let util = layui.util;
             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) {
@@ -277,6 +279,7 @@
                             };
                             chartcontract.setOption(optionchart, true);
                         }
+                        layer.closeAll('loading');
                     }
                 }, "get");
             }
@@ -327,6 +330,7 @@
                             chartproducts.setOption(optionchart, true);
                         }
                     }
+                        layer.closeAll('loading');
                 }, "get");
             }
 
@@ -344,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 = {
@@ -384,9 +388,11 @@
                             };
                             chartreport.setOption(optionchart, true);
                         }
+                        layer.closeAll('loading');
                     }
                 }, "get");
             }
+            
             //加载读片图表
             var loadaiphotoChart = function (dataType) {
                 var nowYear = new Date().getFullYear();
@@ -401,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 = {
@@ -441,6 +447,7 @@
                             };
                             chartaiphoto.setOption(optionchart, true);
                         }
+                        layer.closeAll('loading');
                     }
                 }, "get");
             }
@@ -455,6 +462,7 @@
                         element.code == "dev_admin" ||
                         element.code == "pc_admin" ||
                         element.code == "oprationmanager" ||
+                        element.code == "salemanager" ||
                         element.code == "dev_user" ||
                         element.code == "shop_admin" ||
                         element.code == "app_admin") {
@@ -473,7 +481,6 @@
                         //数据需求
                         loadOprationChart(2);
                         $("#d_dataneed").html(counts);
-
                         //H端医生
                         loadDoctorChart(4);
                         $("#h_doctor").html(counts);
@@ -519,10 +526,9 @@
                         loadDoctorChart(5);
                         $("#ht_doctor").html(counts);
                         loadProductChart();
+                        $("#u_product").html(noData);
+                        $("#t_product").html(noData);
                     } else if (element.code == "sale") {
-                        //正式医院
-                        loadHospitalChart(0);
-                        $("#h_hospital").html(counts);
                         //正式医院
                         loadHospitalChart(0);
                         $("#h_hospital").html(counts);
@@ -544,8 +550,13 @@
                         //签约医生
                         loadDoctorChart(1);
                         $("#u_signing").html(counts);
+                        
+                        $("#u_product").html(noData);
+                        $("#t_product").html(noData);
                         //医答医生
                         loadDoctorChart(2);
+                        $("#d_isanswer").html(counts);
+
                         loadContractChart();
                         loadProductChart();
                         loadreportChart(0);
@@ -553,6 +564,27 @@
                     }
                 }
             }
+            else
+            {
+                $("#h_hospital").html(noData);
+                //用户反馈
+                $("#u_feedback").html(noData);
+                //数据需求
+                $("#d_dataneed").html(noData);
+                //H端医生
+                $("#h_doctor").html(noData);
+                //C端医生
+                $("#c_doctor").html(noData);
+                //签约医生
+                $("#u_signing").html(noData);
+                //医答医生
+                $("#d_isanswer").html(noData);
+                //待审核医生
+                $("#ht_doctor").html(noData);
+                $("#u_product").html(noData);
+                $("#t_product").html(noData);
+                layer.closeAll('loading');
+            }
         });
     </script>
 </body>

--
Gitblit v1.8.0