luolei hace 5 años
padre
commit
9c399621ef
Se han modificado 7 ficheros con 8 adiciones y 13 borrados
  1. 1 1
      src/css/index.less
  2. 1 1
      src/js/dayDetail.js
  3. 1 1
      src/js/mukuai.js
  4. 1 4
      src/js/partDetail.js
  5. 2 4
      src/js/partDetailControl.js
  6. 1 1
      src/js/tiaomu.js
  7. 1 1
      src/js/utils.js

+ 1 - 1
src/css/index.less

@@ -280,7 +280,7 @@
   .main{
     margin-left:@menuWt;
     height: 100%;
-    overflow: auto;
+    // overflow: auto;
     /*border: 10px solid #f5f5f5;*/
     iframe {
       width: 100%;

+ 1 - 1
src/js/dayDetail.js

@@ -124,8 +124,8 @@ function renderTab(data,hisId,activePage){
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td>${item.name || "-"}</td>
-                <td >${item.averageValue}</td>
                 <td >${item.lastAverageValue}</td>
+                <td >${item.averageValue}</td>
                 <td style="display:${statisticsType==1?'block':'none'}">${item.lastYearAverageValue}</td>
             </tr>
         `

+ 1 - 1
src/js/mukuai.js

@@ -122,7 +122,7 @@ function getTabData(activePage){
         current:activePage,
         type: isReject,
         name: name, //条目名
-        deptName: deptId||deptList.length>0&&deptList[0].deptName, //科室名
+        deptName: deptId||(deptList.length>0?deptList[0].deptName:''), //科室名
         size: 15
     }
     post(from == 1?api.entryCountGroupByCasePage:api.entryCountGroupByCaseAndDeptPage,param).then(res =>{

+ 1 - 4
src/js/partDetail.js

@@ -109,10 +109,7 @@ function getTabData(activePage){
     }
     post(api.homePageLevelByDeptLimit,param).then(res =>{
         if(res.data.code == '0'){
-            const data = res.data.data;
-            tabList = data.records;
-            const totalPage = data.pages;
-            const totalNum = data.total;
+            const data = res.data.data||[];
             renderTab(data,data.hospitalId,activePage);
             renderPagination(totalPage,Number(activePage),totalNum)
             if(totalPage > 1){

+ 2 - 4
src/js/partDetailControl.js

@@ -91,10 +91,7 @@ function getTabData(activePage){
     }
     post(api.homePageLevelStatistics,param).then(res =>{
         if(res.data.code == '0'){
-            const data = res.data.data;
-            tabList = data.records;
-            const totalPage = data.pages;
-            const totalNum = data.total;
+            const data = res.data.data||[];
             renderTab(data,data.hospitalId,activePage);
             renderPagination(totalPage,Number(activePage),totalNum)
             if(totalPage > 1){
@@ -136,6 +133,7 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
+    console.log(str)
     $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){

+ 1 - 1
src/js/tiaomu.js

@@ -87,7 +87,7 @@ function getTabData(activePage){
         current:activePage,
         type: isReject,
         name: name, //条目名
-        deptName: deptId||deptList.length>0&&deptList[0].deptName, //科室名
+        deptName: deptId||(deptList.length>0?deptList[0].deptName:''), //科室名
         size: 15
     }
     // console.log(isReject)

+ 1 - 1
src/js/utils.js

@@ -1,7 +1,7 @@
 const qs = require('qs');
 const $ = require("jquery");
 var Utils = require('./rePromise');
-const baseUrl = "http://192.168.2.236:5858"
+const baseUrl = "http://192.168.2.241:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',