Merge branch 'test' into byll

src/css/login.less

@@ -1,87 +1,68 @@
 body {
-  background-color: #f5f5f5;
+  background:linear-gradient(133deg,rgba(45,79,139,1) 0%,rgba(20,39,83,1) 100%);
 }
 .login {
   cursor: pointer;
+  height: 100%;
+  .bg{
+    width: 62%;
+    height: 100%;
+    text-align: center;
+    background: url("../images/loginBg2.png") center center no-repeat;
+    background-size: 84%;
+  }
   .waring {
     color: #FF4D4F;
     margin-top: 18px;
     height: 18px;
   }
-  .logoTop {
-    height:50px;
-    line-height:50px;
-    padding-left: 20px;
-    background:linear-gradient(123deg,rgba(90,142,238,1) 0%,rgba(126,171,255,1) 100%);
-    img {
-      vertical-align: middle;
-    }
-    span {
-      width: 1px;
-      height: 15px;
-      display: inline-block;
-      background-color: #fff;
-      position: relative;
-      top: 3px;
-      left: -1px;
-      margin: 0 3px;
-    }
-    i {
-      color: #fff;
-      position: relative;
-      top: 1px;
-    }
-  }
   .sureLogin {
-    width: 120px;
+    width: 300px;
     height: 40px;
     line-height: 40px;
     text-align: center;
-    background-color: #5A8EEE;
+    background-color: #00A1FF;
     color: #fff;
     border-radius:4px;
     margin: 20px auto 0;
   }
 }
-.loginForm {
-  width: 800px;
-  height: 520px;
+p.title {
+  font-size: 28px;
+  color: #fff;
+  font-weight: bold;
   position: absolute;
-  left: 50%;
-  top: 50%;
-  margin-left: -400px;
-  margin-top: -260px;
-  border-radius:20px;
-  background-color: #fff;
-  
-  p.title {
-    font-size: 28px;
-    color: #fff;
-    font-weight: bold;
-    position: absolute;
-    top: 90px;
-    left: 50px;
-  }
-  .loginBg {
-    float: left;
-    width: 400px;
-  }
+  top: 90px;
+  left: 50px;
+}
   .message {
-    float: left;
-    width: 50%;
-    padding:96px 50px;
+    width: 38%;
+    height: 100%;
+    background:linear-gradient(180deg,rgba(0,25,82,1) 0%,rgba(0,24,78,0.94) 100%);
     box-sizing: border-box;
+    position: relative;
+    .inner{
+      height: 360px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      margin-top: -180px;
+      margin-left: -150px;
+    }
     .welcome {
       font-size: 20px;
       font-weight: bold;
-      color: #333;
+      color: #fff;
       margin-bottom: 50px;
     }
   }
   .perPub {
+    width: 300px;
+    margin: auto;
     p {
       font-size: 12px;
       padding-bottom: 8px;
+      color: #fff;
     }
     img {
       vertical-align: middle;
@@ -91,7 +72,7 @@ body {
   .iptWrap {
     padding-left: 10px;
     box-sizing: border-box;
-    border: 1px solid #E2E5EF;
+    border: 1px solid #97A4BA;
     width: 300px;
     height: 40px;
     line-height: 38px;
@@ -99,6 +80,8 @@ body {
     input {
       display: inline-block;
       width: 80%;
+      color: #fff;
+      background: none;
     }
     
   }
@@ -109,7 +92,6 @@ body {
       -moz-box-shadow: #5a8eee  0px 0px 2px;
       box-shadow: #5a8eee  0px 0px 2px;
   }
-}
 
 .alertModal {
   .modalBg {

src/css/moduleManager.less

@@ -11,6 +11,7 @@ h2{
 .totalSumBox{
     margin: 0 0 20px 0;
     text-align: right;
+    padding: 0 20px 0 0;
     .totalSum{
         color: red;
     }
@@ -19,7 +20,7 @@ table{
     width: 100%;
     border:1px solid #E2E5EF;
     border-collapse: collapse;/*关键代码*/
-  
+    min-width: 800px;
     thead{
         background: #EFF0F9;
        
@@ -41,9 +42,27 @@ table{
     }
     .moduleNumber{
         text-align: center;
+        width: 15%;
+        min-width: 30px;
+    }
+    .moduleName{
+        width: 55%;
+    }
+    .moduleScore{
+        text-align: center;
+        width: 15%;
+        min-width: 30px;
+    }
+    .moduleOpera{
+        text-align: center;
+        width: 15%;
+        min-width: 30px;
     }
     
 }
+.tableTitle table{
+    background: #EFF0F9;
+}
 .moduleScore, .totalSum{
     text-align: center;
     input{
@@ -64,6 +83,9 @@ table{
     cursor: pointer;
 }
 .tableWrapper{
+   
+}
+.tableInfo{
     overflow-y: auto;
 }
 .mask {

src/css/qcScore.less

@@ -1,11 +1,10 @@
 @import './reset.less';
 .main-part{
   height: 100%;
-  margin-top: 20px;
 }
 #loading{
   text-align: center;
-  margin-top: 30px;
+  /*margin-top: 30px;*/
 }
 .waring {
   color: #FF4D4F;
@@ -13,23 +12,17 @@
   height: 18px;
 }
 .patient-info{
-  // height: 50px;
+  /*height: 50px;*/
   line-height: 50px;
-  margin-top: 10px;
+  border-bottom: 1px #E2E5EF solid;
+  text-align: center;
+  margin-bottom: 20px;
   span{
+    color: #333;
     margin-right: 40px;
     display: inline-block;
   }
 }
-#patientInfo{
-  height: 44px;
-  line-height: 44px;
-  text-align: center;
-  background:linear-gradient(123deg,#5A8EEE 0%,#7EABFF 100%);
-  span{
-    color: #fff;
-  }
-}
 .sub-menu{
   position: relative;
   width: @menuWt;
@@ -37,21 +30,37 @@
   float: left;
   overflow-y: auto;
   overflow-x: hidden;
+  background: @themeColor;
   border-right: 1px @frameBdColor solid;
+  .logo{
+    margin:5px 0 44px;
+    text-indent: 22px;
+  }
+  &>a{
+    position: absolute;
+    top: 50%;
+    right: 0;
+    z-index: 1;
+  }
+  &>ul>li{
+    color: @themeFontClr;
+  }
   .active{
     color: @activeColor;
-    background: @activeBg;
-    border-right: 3px @activeColor solid;
+    /*background: @activeBg;
+    border-right: 3px @activeColor solid;*/
   }
   .page:hover{
       color: @activeColor;
   }
   .list-1{
     position: relative;
-    p:hover{
-         color: @activeColor;
-       }
-   
+    p {
+      color: @themeFontClr;
+      &:hover {
+        color: @activeColor;
+      }
+    }
     &:after{
       content: " ";
       display: inline-block;
@@ -70,6 +79,10 @@
       display: none;
       li.page{
         text-indent: 30px;
+        color: @themeFontClr;
+        &.active{
+          color: @activeColor;
+        }
       }
     }
   }
@@ -81,12 +94,13 @@
   .copy-right{
     position: fixed;
     bottom: 0px;
-    width: @menuWt+(-18px);
+    width: @menuWt;
     text-align: center;
     font-size:12px;
-    color: #aaa;
-    background: #fff;
+    color: #F0F0F0;
+    background: @themeColor;
     padding: 10px 0 20px;
+    border-top: 1px @themeBorderClr solid;
   }
 }
 .menu-mini{
@@ -116,7 +130,7 @@
   }
 }
 .tab-container{
-  margin-left: @menuWt+10px;
+  margin-left: @menuWt;
   height: 100%;
   .content-box{
     width:78%;

src/css/reset.less

@@ -376,7 +376,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
 }
 
 .filterBox {
-  .filter {
+  /*.filter {
     display: inline-block;
     width:60px;
     height:36px;
@@ -388,7 +388,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
     position: relative;
     top: -1px;
     cursor: pointer;
-  }
+  }*/
   .filterclear{
       display: inline-block;
       width:60px;

src/html/index.html

@@ -41,16 +41,16 @@
               <div class="logo">
                   <img src="../images/lantone.png" alt="">
               </div>
-              <a href="javescript:void(0);" class="slide-hide">
+              <!--<a href="javescript:void(0);" class="slide-hide">
                   <img src="../images/down.png" alt="">
-              </a>
+              </a>-->
               <ul></ul>
               <div class="copy-right">©杭州朗通信息技术有限公司</div>
           </div>
           <div class="menu-mini fl">
-              <a href="javescript:void(0);" class="slide-show">
+              <!--<a href="javescript:void(0);" class="slide-show">
                   <img src="../images/up.png" alt="">
-              </a>
+              </a>-->
               <ul></ul>
           </div>
           <div class="main" id="mainBox">

src/html/login.html

@@ -7,36 +7,39 @@
   <title>登录页</title>
 </head>
 <body>
-  <div class="login">
-    <div class="logoTop">
+  <div class="login clearfix">
+    <!--<div class="logoTop">
       <img src="../images/lantone.png" alt="">
       <span></span>
       <i>AI病案质控平台</i>
-    </div>
-    <div class="loginForm clearfix">
-      <img src="../images/loginBg.png" class="loginBg" alt="">
+    </div>-->
+    <div class="bg fl">
       <p class="title">AI病案质控平台</p>
-      <div class="message">
-        <p class="welcome">欢迎使用！</p>
-        <div class="perPub">
-          <p>用户名</p>
-          <div class="iptWrap">
-            <img src="../images/yonghu.png" alt="">
-            <input type="text" placeholder="请输入用户名" id="username" value="" autocomplete="off">
+    </div>
+    <!--<div class="loginForm clearfix">-->
+      <div class="message fr">
+        <div class="inner">
+          <p class="welcome">欢迎使用！</p>
+          <div class="perPub">
+            <p>用户名</p>
+            <div class="iptWrap">
+              <img src="../images/yonghu.png" alt="">
+              <input type="text" placeholder="请输入用户名" id="username" value="" autocomplete="off">
+            </div>
           </div>
-        </div>
-        <br>
-        <div class="perPub">
-          <p>密码</p>
-          <div class="iptWrap">
-            <img src="../images/mima.png" alt="">
-            <input type="text" placeholder="请输入密码" id="password" value="" autocomplete="off">
+          <br>
+          <div class="perPub">
+            <p>密码</p>
+            <div class="iptWrap">
+              <img src="../images/mima.png" alt="">
+              <input type="text" placeholder="请输入密码" id="password" value="" autocomplete="off">
+            </div>
           </div>
+          <p class="waring"></p>
+          <div class="sureLogin">登录</div>
         </div>
-        <p class="waring"></p>
-        <div class="sureLogin">登录</div>
       </div>
-    </div>
+    <!--</div>-->
   </div>
 </body>
 </html>

src/html/moduleManager.html

@@ -15,17 +15,21 @@
        <div class="main-body">
            <p class="totalSumBox">当前分数合计：<span class="totalSum"></span></p>
            <div class="tableWrapper">
-                <table>
-                    <thead>
-                        <th class="moduleNumber">序号</th>
-                        <th class="moduleName">模块名称</th>
-                        <th class="moduleScore">分值</th>
-                        <th class="moduleOpera">操作</th>
-                    </thead>
-                    <tbody>
-
-                    </tbody>
-                </table>
+                <div  class="tableTitle">
+                    <table>
+                        <tr>
+                            <td class="moduleNumber">序号</td>
+                            <td class="moduleName">模块名称</td>
+                            <td class="moduleScore">分值</td>
+                            <td class="moduleOpera">操作</td>
+                        </tr>
+                    </table>
+                </div>
+                <div  class="tableInfo">
+                    <table>
+                   
+                    </table>
+                </div>
            </div>
             
             <!-- <div class="saveModuleBox">

src/html/qcList.html

@@ -39,7 +39,7 @@
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
                 <span class="filterItem typeFilter clearfix">
-                    <span class="fl">入院日期：</span>
+                    <span class="fl">出院日期：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>

src/html/qcListDept.html

@@ -39,7 +39,7 @@
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
                 <span class="filterItem typeFilter clearfix">
-                    <span class="fl">入院日期：</span>
+                    <span class="fl">出院日期：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>

src/html/qcListPerson.html

@@ -39,7 +39,7 @@
                 </span>
                
                 <span class="filterItem typeFilter clearfix">
-                    <span class="fl">入院日期：</span>
+                    <span class="fl">出院日期：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>

src/html/qcScore.html

@@ -628,23 +628,26 @@
     </script>
 </head>
 <body>
-    <div class="patient-info" id="patientInfo"></div>
-    <p id="loading">加载中，请稍候 ...</p>
     <div class="main-part clearfix">
-        <div class="sub-menu content-ht">
-            <a href="javescript:void(0);" class="slide-show">
+        <div class="sub-menu">
+            <div class="logo">
+                <img src="../images/lantone.png" alt="">
+            </div>
+            <!--<a href="javescript:void(0);" class="slide-show">
                 <img src="../images/up.png" alt="">
-            </a>
+            </a>-->
             <ul id="subMenu"></ul>
             <div class="copy-right">©杭州朗通信息技术有限公司</div>
         </div>
         <div class="menu-mini fl">
-            <a href="javescript:void(0);" class="slide-show">
+           <!-- <a href="javescript:void(0);" class="slide-show">
                 <img src="../images/down.png" alt="">
-            </a>
+            </a>-->
             <ul></ul>
         </div>
         <div class="tab-container clearfix">
+            <div class="patient-info" id="patientInfo"></div>
+            <p id="loading">加载中，请稍候 ...</p>
             <div class="flaw-table"></div>
             <div class="content-box fl" id="contentInfo"></div>
             <div class="operation fr" id="flaws">

src/js/itemManager.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp =""
+let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",size = 15
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -33,7 +33,7 @@ function getTabData(activePage){
         name: name, //条目名
         isReject: isReject, //1-单项否决 0-非
         isUsed: isUsed, //0-未启用 1-启用
-        size: 15
+        size: size
     }
     post(api.getQcCasesEntryAll,param).then(res =>{
         if(res.data.code == '0'){
@@ -117,7 +117,7 @@ function renderTab(data,activePage){
         const item = data[i]
         str += `
             <tr data-id=${item.id} data-index=${i}>
-                <td  class="textCenter">${(activePage-1)*10 + i+1}</td>
+                <td  class="textCenter">${(activePage-1)*size + i+1}</td>
                 <td>${item.casesName}</td>
                 <td>${item.name}</td>
                 <td>${item.msg}</td>

src/js/moduleManager.js

@@ -7,9 +7,14 @@ require('./modal.js');
 // const  layui = require('layui-src');
 const {api} = require('./api.js')
 const {post,getCookie} = require('./utils.js')
-$(".tableWrapper").css({
-    height:$(window).height()-180+'px'
-})
+function setTbaleInfoHei(){
+ 
+    $(".tableInfo").css({
+        height:$(window).height()-180+'px'
+    })
+}
+setTbaleInfoHei()
+
 //判断有无某一权限
 function hasData(data){
     let lis = JSON.parse(getCookie("codeLis"))
@@ -52,7 +57,12 @@ function renderTab(){
     //     <td class="totalSum"></td>
     // </tr>
     // `
-    $('table tbody').html(str)
+    $('.tableInfo table').html(str)
+    const tableInfoBox =  $(".tableInfo").height()
+    const tableInfoHei =  $(".tableInfo table").height()
+    if(tableInfoHei > tableInfoBox){
+        $(".tableTitle").css("paddingRight", 15+'px')
+    }
     // bindInput()
     bindModuleOpera()
     getTotalSum()
@@ -71,6 +81,7 @@ function bindModuleOpera(){
 }
 function getTotalSum(){
     let sum = 0
+    console.log('data', data)
     for(let i = 0; i < data.length; i++){
         if(data[i].score){
             sum += Number(data[i].score)

src/js/qcList.js

@@ -56,8 +56,8 @@ function getTabData(activePage){
         desc:data_desc,       //降序
         doctorName: doctorName,
         doctorCode: doctorNum,
-        behosDateStart: behosDateStart, //1-单项否决 0-非
-        behosDateEnd: behosDateEnd, //0-未启用 1-启用
+        leaveHosDateStart: behosDateStart, //1-单项否决 0-非
+        leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15
     }
     post(api.qcList,param).then(res =>{
@@ -145,7 +145,11 @@ $(".reset").on("click", function(e){
 })
 function renderTab(data,hisId){
     let str = ``
-    let hasSelectAll = true
+    let hasSelectAll = true;
+    if(data.length===0){
+      $('tbody').html(`<tr><td colspan='17' style="text-align: center;color: #aaa">暂无数据~</td></tr>`);
+      return;
+    }
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(!item.hasSelect){
@@ -459,13 +463,14 @@ $(function() {
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd"
-    });
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "-1m" );
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
-    });
+    }).datepicker( "setDate", new Date());
+    $(".filter").click();   //初始查询
 });
 
 //分页渲染

src/js/qcListDept.js

@@ -55,8 +55,8 @@ function getTabData(activePage){
         desc:data_desc,       //降序
         doctorName: doctorName,
         doctorCode: doctorNum,
-        behosDateStart: behosDateStart, //1-单项否决 0-非
-        behosDateEnd: behosDateEnd, //0-未启用 1-启用
+        leaveHosDateStart: behosDateStart, //1-单项否决 0-非
+        leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15
     }
     post(api.qcListByDept,param).then(res =>{
@@ -160,7 +160,11 @@ $("th[code]").on("click",function(e){
 });
 function renderTab(data){
     let str = ``
-    let hasSelectAll = true
+    let hasSelectAll = true;
+    if(data.length===0){
+      $('tbody').html(`<tr><td colspan='17' style="text-align: center;color: #aaa">暂无数据~</td></tr>`);
+      return;
+    }
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(!item.hasSelect){
@@ -458,13 +462,14 @@ $(function() {
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd"
-    });
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "-1m" );
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
-    });
+    }).datepicker( "setDate", new Date());
+    $(".filter").click();   //初始查询
 });
 
 //分页渲染

src/js/qcListPerson.js

@@ -57,8 +57,8 @@ function getTabData(activePage){
         asc:data_asc,     //升序
         desc:data_desc,       //降序
         doctorName: doctorName,
-        behosDateStart: behosDateStart, //1-单项否决 0-非
-        behosDateEnd: behosDateEnd, //0-未启用 1-启用
+        leaveHosDateStart: behosDateStart, //1-单项否决 0-非
+        leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15
     }
     post(api.qcListByPerson,param).then(res =>{
@@ -160,7 +160,11 @@ $("th[code]").on("click",function(e){
 });
 function renderTab(data){
     let str = ``
-    let hasSelectAll = true
+    let hasSelectAll = true;
+    if(data.length===0){
+        $('tbody').html(`<tr><td colspan='17' style="text-align: center;color: #aaa">暂无数据~</td></tr>`);
+        return;
+    }
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(!item.hasSelect){
@@ -453,13 +457,14 @@ $(function() {
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd"
-    });
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "-1m" );
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
-    });
+    }).datepicker( "setDate", new Date());
+    $(".filter").click();   //初始查询
 });
 
 //分页渲染

src/js/qcScore.js

@@ -374,7 +374,7 @@ function formatFlawKeys(data){
     const module=global_modules[mid].moduleDetail;
     const key = global_modules[mid].modeName.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'');
     let hml = '<div class="content-item" code="'+key+'">' +
-      '<h2 class="title">'+global_modules[mid].modeName+'</h2>' +
+      '<h2 class="title">'+global_modules[mid].modeName+'('+mid+')</h2>' +
       (n>1?'<div class="container">':'<div class="container content-ht">');
 
     for(let i in module){

src/js/utils.js

@@ -94,10 +94,11 @@ const post = function (url, data) {
   if(!token&&window.location.href.indexOf('login')==-1){
     window.location.href = "../login.html"
   }
+  let need = window.location.href.indexOf('localhost')==-1
   return new Utils((resolve, reject) => {
     $.ajax({
       method: 'post',
-      url: baseUrl+url,
+      url: url,
       async:true,
       cache: false,
       contentType: false,
@@ -168,7 +169,7 @@ $(".modal .close").click(function(){
 //计算容器高度
 function setBoxHeight(){
   const ht=window.innerHeight;
-  $(".main-part").height((ht-60)+'px');
+  //$(".main-part").height((ht-60)+'px');
   $(".content-ht").height((ht-126)+"px");
 }
 setBoxHeight();