Merge branch 'byll' into test

src/css/qcScore.less

@@ -2,6 +2,12 @@
 .main-part{
   height: 100%;
 }
+
+.ellipsis{
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
 #loading{
   text-align: center;
   /*margin-top: 30px;*/
@@ -43,7 +49,7 @@
     z-index: 1;
   }
   &>ul>li{
-    color: #E9EBEF;
+    color: @fstColor;
     &.menu-0{
       background: url("../images/total.png") 20px 9px no-repeat;
       &.active{
@@ -90,6 +96,9 @@
       }
     }
   }
+  .slide-up {
+    background-color: @activeBg !important;
+  }
   .active{
     color: @activeColor;
     /*background: @activeBg;
@@ -101,7 +110,7 @@
   .list-1{
     position: relative;
     p {
-      color: #E9EBEF;
+      color: @fstColor;
       &:hover {
         color: @activeColor;
       }
@@ -124,7 +133,7 @@
       display: none;
       li.page{
         text-indent: 55px;
-        color: #E9EBEF;
+        color: @fstColor;
         &.active{
           color: @activeColor;
         }
@@ -146,8 +155,7 @@
     border-top: 1px @themeBorderClr solid;
     p{
       font-size:12px;
-      color: #fff;
-      opacity: .3;
+      color: @trdColor;
     }
   }
 }
@@ -186,6 +194,8 @@
     position: relative;
     overflow-y: auto;
     border-right: 10px #EFF1F6 solid;
+    border-left: 10px #EFF1F6 solid;
+    box-sizing: border-box;
   }
   .content-item{
     display: none;
@@ -443,6 +453,14 @@
     text-indent: 10px;
     line-height: 38px;
     border-radius:2px;
+    box-sizing: border-box;
+  }
+  .flaw-drop-input {
+    padding-right: 28px;
+    box-sizing: border-box;
+  }
+  #addQcMsg {
+    padding-right: 0;
   }
   span{
     display: inline-block;

src/css/reset.less

@@ -32,7 +32,7 @@ input {
   color: #333333;
   text-decoration: none;
 }
-
+textarea,
 html,
 body {
   font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;

src/html/qcScore.html

@@ -156,9 +156,9 @@
     </script>
     <script type="text/html" id="editTmpl">
         <div class="edit-box">
-            <p><span>质控条目: </span><input disabled type="text" value="${standardMsg}" /></p>
+            <p><span>质控条目: </span><input disabled type="text" class="ellipsis" title="${standardMsg}" value="${standardMsg}" /></p>
             <!--<p><span>模块名称: </span><input type="text" value="${modelName}" /></p>-->
-            <p><span>提示信息: </span><input id="qcMsg" type="text" value="${msg}" /></p>
+            <p><span>提示信息: </span><input id="qcMsg" class="ellipsis" type="text" title="${msg}" value="${msg}" /></p>
             <p><span>分值: </span> <input id="qcScore" type="text" value="${score}" /></p>
             <p class="warning"><span></span><span class="red">支持≥0的数字输入，最多保留小数点后1位~</span></p>
         </div>
@@ -172,11 +172,11 @@
         <div class="edit-box add-box">
             <div class="drop-box">
                 <span>质控条目: </span>
-                <input type="text" class="flaw-drop-input"/>
+                <input type="text" class="flaw-drop-input ellipsis"/>
                 <ul></ul>
             </div>
             <!--<p><span>模块名称: </span><input type="text" value="${modelName}" /></p>-->
-            <p><span style="margin-right: 16px;">提示信息:</span><input id="addQcMsg" type="text" value="${msg}" /></p>
+            <p><span style="margin-right: 16px;">提示信息:</span><input title="${msg}" class="ellipsis" id="addQcMsg" type="text" value="${msg}" /></p>
             <p><span>分值:</span> <input id="addQcScore" type="text" value="${score}" /></p>
             <p class="warning"><span></span><span class="red">支持≥0的数字输入，最多保留小数点后1位~</span></p>
         </div>

src/js/console.js

@@ -1291,8 +1291,8 @@ function panDetail(data){
     $(".explainPanT .explainLi").click(function(){
         let deptName = $(this).attr("data-dept")
         let deptId = $(this).attr("dept-id")
-        focusMenuItem("YH-BLZK-ZKPF");
-        $(parent.document).find("#contentIframe").attr("src","./qcList.html?from=1&dateType="+dateType+"&deptName="+deptName+"&deptId="+deptId)
+        focusMenuItem("YH-ZKK-GKSQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?shijian"+dateType+"&deptName="+deptName)
 
     })
 }

src/js/qcScore.js

@@ -305,6 +305,7 @@ function showModal(flag,code,i){
     //提示信息输入验证
     $("#qcMsg").on("input",function(){
       const val=$(this).val();
+      $(this).attr("title",val)
       if(val.trim()){
         $(".edit-box .warning").hide();
       }else{
@@ -419,8 +420,8 @@ function formatFlawKeys(data){
       const flaw=global_flaws[n];
       const {score,msg,entryName,casesEntryId}=flaw;
       global_selectedFlaw=flaw;
-      $(".flaw-drop-input").val(entryName).attr("code",casesEntryId);
-      $("#addQcMsg").val(msg);
+      $(".flaw-drop-input").val(entryName).attr({"code":casesEntryId,"title":entryName});
+      $("#addQcMsg").val(msg).attr("title",msg);
       $("#addQcScore").val(score);
       $(".add-box .warning").hide();
       $(".add-box .drop-box").removeClass("show");

src/js/utils.js

@@ -1,7 +1,7 @@
 const qs = require('qs');
 const $ = require("jquery");
 var Utils = require('./rePromise');
-const baseUrl = "http://192.168.2.236:5858"
+const baseUrl = "http://192.168.2.241:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',