luolei 5 years ago
parent
commit
e971d195d2
3 changed files with 4 additions and 6 deletions
  1. 2 4
      src/js/console.js
  2. 1 1
      src/js/deptConsole.js
  3. 1 1
      src/js/singleVeto.js

+ 2 - 4
src/js/console.js

@@ -1395,10 +1395,8 @@ function emptyCircle(data){
     let title = '总量';
     let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];
     let echartData = data;
-    let total = 0;
-    for(let i = 0;i < echartData.length;i++){
-        total += echartData[i].num
-    }
+    let total = echartData.length>0?echartData[0].totleNum:0;
+    
     option = {
         /*backgroundColor: bgColor,*/
         color: color,

+ 1 - 1
src/js/deptConsole.js

@@ -53,7 +53,7 @@ function tiaomu(){
     });
     $(".circleBSingle .title,.homePageNo .title").click(function(){
         focusMenuItem("YH-KSZR-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","tiaomu.html?from=2&deptName="+curDept+"&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=2&deptName="+curDept+"&shijian="+dateType)
     });
     $(".homePage .title").click(function(){
         focusMenuItem("YH-KSZR-BASYHGLZB_XQ")

+ 1 - 1
src/js/singleVeto.js

@@ -140,7 +140,7 @@ function getTabData(activePage){
         deptName: deptId, //科室名
         size: 15
     }
-    post(from == 1?api.entryGroupByEntryInnerPage:api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
+    post(from == 1?api.entryGroupByEntryInnerPage:api.entryGroupByEntryAndDeptInnerPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records
             const totalPage = res.data.data.pages