Browse Source

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

luolei 5 years ago
parent
commit
fd4f10c8e7

+ 4 - 1
src/css/qcList.less

@@ -34,13 +34,16 @@ table{
             height: 14px;
             margin-left: 4px;
             vertical-align: middle;
-            background: url("../images/grey.png");
+            background-size: 100%;
+            background-image: url("../images/grey.png");
         }
         &.asc:after{
             background: url("../images/up_blue.png");
+            background-size: 100%;
         }
         &.desc:after{
             background: url("../images/down_blue.png");
+            background-size: 100%;
         }
     }
     td{

+ 2 - 0
src/css/qcListDept.less

@@ -38,9 +38,11 @@ table{
         }
         &.asc:after{
             background: url("../images/up_blue.png");
+            background-size: 100%;
         }
         &.desc:after{
             background: url("../images/down_blue.png");
+            background-size: 100%;
         }
     }
     td{

+ 2 - 0
src/css/qcListPerson.less

@@ -43,9 +43,11 @@ table{
         }
         &.asc:after{
             background: url("../images/up_blue.png");
+            background-size: 100%;
         }
         &.desc:after{
             background: url("../images/down_blue.png");
+            background-size: 100%;
         }
     }
     td{

+ 1 - 1
src/html/qcList.html

@@ -80,7 +80,7 @@
                     <th class="patientage textCenter" code="age">年龄</th>
                     <th class="bedNum textCenter" code="bed_code">床号</th>
                     <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
-                    <th class="outHospitalDate textCenter" code="leave_hospital_date">出院日期</th>
+                    <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
                     <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                     <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                     <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>

+ 1 - 1
src/html/qcListDept.html

@@ -79,7 +79,7 @@
                         <th class="patientage textCenter" code="age">年龄</th>
                         <th class="bedNum textCenter" code="bed_code">床号</th>
                         <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
-                        <th class="outHospitalDate textCenter" code="leave_hospital_date">出院日期</th>
+                        <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
                         <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                         <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                         <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>

+ 1 - 1
src/html/qcListPerson.html

@@ -79,7 +79,7 @@
                         <th class="patientage textCenter" code="age">年龄</th>
                         <th class="bedNum textCenter" code="bed_code">床号</th>
                         <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
-                        <th class="outHospitalDate textCenter" code="leave_hospital_date">出院日期</th>
+                        <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
                         <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                         <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                         <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>

BIN
src/images/down_blue.png


BIN
src/images/up_blue.png


+ 1 - 1
src/js/mukuaiControl.js

@@ -22,7 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     // deptName = getUrlArgObjectNew("deptName",srcUrl)||""
-    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||"2"
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
     

+ 1 - 1
src/js/qcList.js

@@ -19,7 +19,7 @@ $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  data_desc=[],data_asc=[];
+  data_desc=["leave_hospital_date"],data_asc=[];
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){

+ 1 - 1
src/js/qcListDept.js

@@ -18,7 +18,7 @@ const arrowRight = require("./../images/arrow_right.png")
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
-  behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",data_desc=[],data_asc=[];
+  behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",data_desc=["leave_hospital_date"],data_asc=[];
 //   $(".abnormalClear").click(function(){
 //     window.location.reload()
 // })

+ 1 - 1
src/js/qcListPerson.js

@@ -24,7 +24,7 @@ $('.selectDoctor').html(doctorName_global)
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
-  behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName=doctorName_global, doctorNameTemp=doctorName_global,data_desc=[],data_asc=[];
+  behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName=doctorName_global, doctorNameTemp=doctorName_global,data_desc=["leave_hospital_date"],data_asc=[];
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){

+ 1 - 1
src/js/tiaomu.js

@@ -23,7 +23,7 @@ $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptId = deptIdTemp = deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
-    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||"2"
     
     if(isReject == 1){
         $(".monthYear .mon").css({

+ 1 - 1
src/js/tiaomuControl.js

@@ -22,7 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
-    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||"2"
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷