Browse Source

6940/6936

luolei 4 years ago
parent
commit
c630bb034a

+ 2 - 2
src/css/index.less

@@ -344,8 +344,8 @@
           left: -8px;
         }
         li{
-          height: 40px;
-          line-height: 40px;
+          height: 38px;
+          line-height: 38px;
           color: #A5ADBF;
           text-indent: 30px;
           border-radius: 4px;

+ 1 - 1
src/html/keyItemFlawControl.html

@@ -11,7 +11,7 @@
 <body>
 <div class="container partDetailControl">
     <div class="partTitle">
-        <p>关键条目缺陷占比</p>
+        <p><a href="console.html">控制台 / </a>关键条目缺陷占比</p>
         <div class="dateDetail fr">
 
         </div>

+ 5 - 4
src/js/dept/qcListCopyDept.js

@@ -366,6 +366,7 @@ $(".abnormalClear").on("click", function(e){
         deptName=deptListDept[0]&&deptListDept[0].deptName;
         deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
         deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
+        $('.selectDept').html('全部').append(`<img class="arrow" src=${iconDown} alt="下拉">`);
     }
     if (from == 4 || from == 9 || from == 8){
         deptIdTemp = deptIdPram = deptIdPram
@@ -414,16 +415,16 @@ $(".abnormalClear").on("click", function(e){
         changeYear: true,
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate","");
-    if(from == 2){
-        $('.selectDept ').val(deptListDept[0].deptName)
+    if(from == 2||from==3){
+        $('.selectDept ').html(deptListDept[0].deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`);
         deptName = deptNameTemp = deptListDept[0].deptName
     } else if (from == 4 || from == 9 || from == 8){
-        $('.selectDept').val(deptNamePram)
+        $('.selectDept').html(deptNamePram).append(`<img class="arrow" src=${iconDown} alt="下拉">`);
         deptName = deptNameTemp = deptNamePram
         $('.selectDept ').attr('title',deptNamePram)
         $(".deptList").css("display", "none")
     }else{
-        $('.selectDept ').val('全部')
+        $('.selectDept ').html('全部').append(`<img class="arrow" src=${iconDown} alt="下拉">`);
     }
     $(".deptList").css("display", "none")
     // $('.selectDept ').addClass('unSelect')

+ 8 - 3
src/js/dept/uncorrectedCopyDept.js

@@ -100,11 +100,15 @@ $('.abnormalClear').click(function() {
   deptIdTemp = '';
   deptName = '';
   deptNameTemp = '';
+  casesName=casesNameTemp=""
+  deptName = deptNameTemp = deptList[0].deptName;
   setDatePicker($('#datepicker'), $('#datepicker2'), 'default');
   $('.selectDept')
     .attr({ title: '全部', 'data-id': '' })
     .val('全部');
   $('.patientNumInp').val('');
+  $('.selectModuleType ').val('全部')
+  $('.selectDept').html('全部').append(`<img class="arrow" src=${iconDown} alt="下拉">`);
   $('th[code]').removeClass('asc desc');
   //behospitalCode =behospitalCodeTemp= ""
   getTabData(1);
@@ -153,8 +157,8 @@ function getTabData(activePage) {
   const param = {
     current: activePage,
     size: 15,
-    name: deptName == '全部' ? '' : deptName || '',
-    deptName: deptIdTemp || '',
+    name: casesName == '全部' ? '' : casesName || '',
+    deptName: deptName == '全部' ? '' : deptName || '',
     doctorName: casesName == '全部' ? '' : casesName || '',
     doctorId: casesIdTemp || '',
     // "asc":data_asc,     //升序
@@ -320,6 +324,7 @@ function getDeptList(flg) {
       .find('i')
       .html(deptList[0].deptName);
     deptId = deptIdTemp = deptList[0].deptName;
+    deptName = deptNameTemp = deptList[0].deptName;
   }
 
   for (let i = 0; i < deptList.length; i++) {
@@ -581,7 +586,7 @@ $(function() {
       return;
     }
     const param = {
-      name: deptName == '全部' ? '' : deptName || '',
+      name: casesName == '全部' ? '' : casesName || '',
       deptName: deptName == '全部' ? '' : deptName || '',
       doctorName: casesName == '全部' ? '' : casesName || '',
       doctorId: casesIdTemp || '',

+ 1 - 1
src/js/qcListCopy.js

@@ -90,7 +90,7 @@ if(from==2){
     deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
     $('.selectDept').val(deptName)
 }else if(from==3){
-  $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>病历列表`)
+  $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>病历列表`)
 }else if(from==4){
     // $(".qcFiliterItem").css("display","none")
     // 控制台 / 病案首页合格率占比 / 缺陷详情