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

src/css/console.less

@@ -24,11 +24,7 @@ div.console {
     text-align: center;
     box-sizing: border-box;
   }
-  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
-    height: 28px;
-    line-height: 28px;
-    box-sizing: border-box;
-  }
+  
   .innerOuter {
     display: none;
   }
@@ -394,7 +390,7 @@ div.console {
       // overflow-y: hidden;
       overflow-y: auto;
       overflow-x: hidden;
-      height: 370px;
+      height: 375px;
     }
     /*.thead {
       td {
@@ -681,4 +677,10 @@ div.console {
   }
   .ui-state-highlight, .ui-widget-content .ui-state-highlight {
     background-color: #5B70A4 !important;
+  }
+  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    height: 28px;
+    line-height: 28px;
+    box-sizing: border-box;
+    color:@themeFontClr;
   }

src/css/deptConsole.less

@@ -4,61 +4,7 @@ div.console {
   overflow: auto;
   background-color: @themeColor;
   height: 100%;
-  .ui-widget.ui-widget-content,
-  .ui-widget-header,.ui-datepicker thead,.ui-state-default, 
-  .ui-datepicker-month,.ui-datepicker-year,
-  .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
-    background-color: @themeColor;
-    font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
-    color: @fstColor;
-  }
-  .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{
-    &:hover {
-      background-color: #142753;
-      border: 0 none;
-    }
-  }
-  .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
-    display: block;
-    position: absolute;
-    left: 50%;
-    margin-left: -8px;
-    top: 50%;
-    margin-top: -8px;
-}
-  .ui-state-active, .ui-widget-content .ui-state-active {
-    background-color: #00A0FE;
-  }
-  .ui-state-default:hover, .ui-widget-content .ui-state-default:hover, .ui-widget-header .ui-state-default:hover {
-    background-color: #142753;
-  }
-  .ui-state-hover .ui-icon {
-    background-image:"url(../images/add.png)";
-  }
-  .dataSelectDark .iconCalen {
-    top:10px;
-  }
-  .dataSelectDark input {
-    height: 28px;
-  }
-  .ui-widget-header .ui-icon {
-    background:url(../images/calendarkL.png) no-repeat;
-    background-size: 14px 14px;
-  }
-  .ui-datepicker-next .ui-icon.ui-icon-circle-triangle-e {
-    background:url(../images/calendarkR.png) no-repeat;
-    background-size: 14px 14px;
-  }
-  .ui-datepicker th span {
-    color: @fstColor;
-  }
-  .ui-datepicker-month,.ui-datepicker-year,
-  .ui-widget.ui-widget-content{
-    border-color: @themeBorderClr;
-  }
-  .ui-state-highlight, .ui-widget-content .ui-state-highlight {
-    background-color: #5B70A4 !important;
-  }
+  
 
   .sureDate {
     cursor: pointer;
@@ -76,11 +22,7 @@ div.console {
     text-align: center;
     box-sizing: border-box;
   }
-  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
-    height: 28px;
-    line-height: 28px;
-    box-sizing: border-box;
-  }
+ 
 
 
 
@@ -661,4 +603,65 @@ div.console {
   width: 100%;
   height: 300px;
   margin-top: 0;
-}
+}
+.ui-widget.ui-widget-content,
+  .ui-widget-header,.ui-datepicker thead,.ui-state-default, 
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    background-color: @themeColor;
+    font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
+    color: @fstColor;
+  }
+  .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{
+    &:hover {
+      background-color: #142753;
+      border: 0 none;
+    }
+  }
+  .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
+    display: block;
+    position: absolute;
+    left: 50%;
+    margin-left: -8px;
+    top: 50%;
+    margin-top: -8px;
+}
+  .ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: #00A0FE;
+  }
+  .ui-state-default:hover, .ui-widget-content .ui-state-default:hover, .ui-widget-header .ui-state-default:hover {
+    background-color: #142753;
+  }
+  .ui-state-hover .ui-icon {
+    background-image:"url(../images/add.png)";
+  }
+  .dataSelectDark .iconCalen {
+    top:10px;
+  }
+  .dataSelectDark input {
+    height: 28px;
+  }
+  .ui-widget-header .ui-icon {
+    background:url(../images/calendarkL.png) no-repeat;
+    background-size: 14px 14px;
+  }
+  .ui-datepicker-next .ui-icon.ui-icon-circle-triangle-e {
+    background:url(../images/calendarkR.png) no-repeat;
+    background-size: 14px 14px;
+  }
+  .ui-datepicker th span {
+    color: @fstColor;
+  }
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget.ui-widget-content{
+    border-color: @themeBorderClr;
+  }
+  .ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #5B70A4 !important;
+  }
+  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    height: 28px;
+    line-height: 28px;
+    box-sizing: border-box;
+    color:@themeFontClr;
+  }

src/css/itemManager.less

@@ -89,7 +89,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleItemInp:focus{

src/css/moduleManager.less

@@ -46,8 +46,12 @@ table{
     }
     
 }
+.tableTitle{
+    position: relative;
+}
 .tableTitle table{
     background: #EFF0F9;
+  
 }
 .moduleScore, .totalSum{
     text-align: center;
@@ -102,3 +106,15 @@ input::-webkit-inner-spin-button {
 input[type="number"] {
     -moz-appearance: textfield;
 }
+.moduleSpan{
+    background: #EFF0F9;
+    display: inline-block;
+    width: 17px;
+    height: 31px;
+    position: absolute;
+    right: 1px;
+    border: 1px solid #E2E5EF;
+    box-sizing: border-box;
+    border-left: none;
+    display: none;
+}

src/css/mukuai.less

@@ -159,7 +159,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/quexianDetail.less

@@ -206,7 +206,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/quexianDetailControl.less

@@ -205,7 +205,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/quexianDetailControlHome.less

@@ -209,7 +209,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/quexianDetailHome.less

@@ -92,6 +92,7 @@
     .main-body{
         // margin: 20px 40px;
         padding-bottom: 0px !important;
+        margin-top: 0;
     }
     table{
         width: 100%;
@@ -124,9 +125,9 @@
             }
         }
         th,td{
-            height: 40px;
+            height: 30px;
             box-sizing: border-box;
-            padding: 10px;
+            // padding: 10px;
             border:1px solid #E2E5EF;
             border-collapse: collapse;
         }
@@ -205,7 +206,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/single.less

@@ -162,7 +162,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/html/moduleManager.html

@@ -22,6 +22,7 @@
                             <td class="moduleName">模块名称</td>
                             <td class="moduleScore">分值</td>
                             <td class="moduleOpera">操作</td>
+                            <span class="moduleSpan"></span>
                         </tr>
                     </table>
                 </div>

src/html/qcScore.html

@@ -226,7 +226,7 @@
     <script type="text/html" id="appointBookTmpl">
         <div class="page-item" code="${title}">
             <h2 class="title" code="${title}">${title}</h2>
-            {{if !data}}
+            {{if !data || data&&data.length === 0}}
             <div class="empty">
                 <img src="../images/empty.png" alt="空"/>
                 <p>暂无信息～</p>

src/js/console.js

@@ -115,7 +115,7 @@ $(function(){
     $(".part02").on("mouseleave",".bingli li.sec",function(){
       $(this).find(".explainNum").css("color","#A5ADBF")
     })
-    getEveryDeptLevel()
+    // getEveryDeptLevel()
 })
 function getDetails(dateType){
     $(".pubEchartB.paymoney .title").click(function(){

src/js/keyItemFlawControl.js

@@ -86,8 +86,8 @@ function getTabData(activePage){
     "asc":data_asc,     //升序
     "desc":data_desc,       //降序
     //"type": 0, //1-本月，2-本年,0-自定义时间（现在所有都是自定义时间，都会传开始日期和结束日期）
-    "startDate":dateStatrt,
-    "endDate":dateEnd
+    "startDate":dateStatrt.replace(/\//g,'-'),
+    "endDate":dateEnd.replace(/\//g,'-')
   }
   startDateParam = dateStatrt
   endDateParam = dateEnd

src/js/moduleManager.js

@@ -63,6 +63,7 @@ function renderTab(){
     const mac = isMac()
     if(!mac&&tableInfoHei > tableInfoBox){
         $(".tableTitle").css("paddingRight", 15+'px')
+        $(".moduleSpan").css("display","block")
     }
     // bindInput()
     bindModuleOpera()

src/js/qcListCopy.js

@@ -118,8 +118,8 @@ function getTabData(activePage){
         behDeptName: deptName == "全部" ? "":deptName,
         ascs:data_asc,     //升序
         descs:data_desc,       //降序
-        startDate: behosDateStart, //出院日期--开始时间
-        endDate: behosDateEnd, //出院日期--结束时间
+        startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
+        endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
         casesEntryName: casesEntryName,
         casesEntryId:casesId,
         size: 15,
@@ -160,10 +160,10 @@ $(".filter").on("click", function(e){
         return
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+        behosDateStart = behosDateStart + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+        behosDateEnd = behosDateEnd + ' 23:59:59'
     }
 
     name = nameTemp
@@ -238,10 +238,10 @@ $(".abnormalClear").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
-        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+        behosDateStart = behosDateStart + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+        behosDateEnd = behosDateEnd + ' 23:59:59'
     }
    
     getTabData(1)
@@ -919,8 +919,8 @@ $(function($){
             behDeptName: deptName,
             ascs:data_asc,     //升序
             descs:data_desc,       //降序
-            startDate: behosDateStart, //出院日期--开始时间
-            endDate: behosDateEnd, //出院日期--结束时间
+            startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
+            endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             casesEntryName: casesEntryName,
             casesEntryId:casesId,
             isReject: isSingleReject,

src/js/utils.js

@@ -379,9 +379,11 @@ function getPickerDate(picker,mode){
   }
   let date = picker.val()
   if(mode == 1){
-    return date.replace(/\//g,'-') + ' 00:00:00'
+    return date + ' 00:00:00'
+    // return date.replace(/\//g,'-') + ' 00:00:00'
   }else if(mode == 2){
-    return date.replace(/\//g,'-') + ' 23:59:59'
+    return date + ' 23:59:59'
+    // return date.replace(/\//g,'-') + ' 23:59:59'
   }
 }
 function isMac(){