浏览代码

Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

luolei 4 年之前
父节点
当前提交
e7d7c2f140
共有 4 个文件被更改,包括 13 次插入13 次删除
  1. 3 3
      src/js/qcListDept.js
  2. 3 3
      src/js/qcListDocteam.js
  3. 3 3
      src/js/qcListPerson.js
  4. 4 4
      src/js/uncorrectedCasesStatistics.js

+ 3 - 3
src/js/qcListDept.js

@@ -323,10 +323,11 @@ function renderTab(data){
         if(!item.hasSelect){
             hasSelectAll = false
         }
+        // <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
+                `
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -587,8 +588,7 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = ` <th class="textCenter" ></th>
-    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>`
+    let str = ` <th class="textCenter" ></th>`
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){

+ 3 - 3
src/js/qcListDocteam.js

@@ -306,10 +306,11 @@ function renderTab(data){
         if(!item.hasSelect){
             hasSelectAll = false
         }
+        // <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
+                `
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -536,8 +537,7 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = ` <th class="textCenter" ></th>
-    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>`
+    let str = ` <th class="textCenter" ></th>`
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){

+ 3 - 3
src/js/qcListPerson.js

@@ -326,10 +326,11 @@ function renderTab(data){
         if(!item.hasSelect){
             hasSelectAll = false
         }
+        // <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
+                `
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -588,8 +589,7 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = ` <th class="textCenter" ></th>
-    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>`
+    let str = ` <th class="textCenter" ></th>`
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){

+ 4 - 4
src/js/uncorrectedCasesStatistics.js

@@ -12,7 +12,7 @@ const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
-let  deptName = "", behospitalCode="", deptNameTemp = "",deptId='',deptIdTemp='', behospitalCodeTemp="", data_desc="",data_asc="",columns=[]; 
+let deptName = "", behospitalCode = "", deptNameTemp = "", deptId = '', deptIdTemp = '', behospitalCodeTemp = "", data_desc = "", data_asc = "", columns = [], isfirstRenderTitle=false; 
 let srcUrl = $("#contentIframe",parent.document).attr("src")
 statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"";
 from = getUrlArgObjectNew("from",srcUrl)||""
@@ -100,7 +100,7 @@ function getTabData(activePage){
     if(res.data.code == '0'){
       const data = res.data.data||[];
       renderTab(data,data.hospitalId,activePage);
-      // renderTabTitle(data)   //渲染Table表头
+      if (isfirstRenderTitle === false) { renderTabTitle(data) }  //首次渲染渲染Table表头
       renderPagination(totalPage,Number(activePage),totalNum)
       if(totalPage > 1){
         renderPagination(totalPage,Number(activePage),totalNum)
@@ -255,11 +255,11 @@ function getPageSet(){
 
   })
 }
-getPageSet()
+// getPageSet()
 
 // 渲染table表头
 function renderTabTitle(data){
-  
+  isfirstRenderTitle = true
   data = data.columns; 
   // console.log(data,'1111111');
   let str = `