Parcourir la source

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

zhangxc il y a 5 ans
Parent
commit
7afe44cc7e
4 fichiers modifiés avec 8 ajouts et 2 suppressions
  1. 4 0
      src/css/common.less
  2. 1 0
      src/css/reset.less
  3. 1 1
      src/html/qcScore.html
  4. 2 1
      src/js/qcScore.js

+ 4 - 0
src/css/common.less

@@ -1,3 +1,4 @@
+@import './reset.less';
 // .partDetailControl {
 // .partDetailControl {
 //     .monthYear {
 //     .monthYear {
 //       border: 0 none;
 //       border: 0 none;
@@ -19,4 +20,7 @@
 .partTitle p a {
 .partTitle p a {
     color: #8592B9;
     color: #8592B9;
     opacity: 1;
     opacity: 1;
+}
+input:disabled {
+    background-color: @disColor;
 }
 }

+ 1 - 0
src/css/reset.less

@@ -138,6 +138,7 @@ textarea {
 @warnColor:#FF4D4F;  /**重点红色**/
 @warnColor:#FF4D4F;  /**重点红色**/
 @thBgColor:#EFF0F9; /**标题背景色**/
 @thBgColor:#EFF0F9; /**标题背景色**/
 @tableBorderColor:#E2E5EF;  /**表格边框**/
 @tableBorderColor:#E2E5EF;  /**表格边框**/
+@disColor:#EFF1F6;  /**背景颜色**/
 @trHeight:30px;   /**表格行高**/
 @trHeight:30px;   /**表格行高**/
 .h2{
 .h2{
   width: 100%;
   width: 100%;

+ 1 - 1
src/html/qcScore.html

@@ -165,7 +165,7 @@
     </script>
     </script>
     <script type="text/html" id="flawDropTmpl">
     <script type="text/html" id="flawDropTmpl">
         {{each(i,it) info}}
         {{each(i,it) info}}
-        <li idx="${i}" name="${it.entryName}">${it.entryName}</li>
+        <li idx="${i}" name="${it.entryName}" title="${it.entryName}">${it.entryName}</li>
         {{/each}}
         {{/each}}
     </script>
     </script>
     <script type="text/html" id="addFlawTmpl">
     <script type="text/html" id="addFlawTmpl">

+ 2 - 1
src/js/qcScore.js

@@ -338,6 +338,7 @@ function showModal(flag,code,i){
     //提示信息输入验证
     //提示信息输入验证
     $("#addQcMsg").on("input",function(){
     $("#addQcMsg").on("input",function(){
       const val=$(this).val();
       const val=$(this).val();
+      $(this).attr("title",val)
       if(val.trim()){
       if(val.trim()){
         $(".add-box .warning").hide();
         $(".add-box .warning").hide();
       }else{
       }else{
@@ -412,7 +413,7 @@ function formatFlawKeys(data){
     },300)
     },300)
   });
   });
   $("body").on("input",".add-box .flaw-drop-input",function(){
   $("body").on("input",".add-box .flaw-drop-input",function(){
-    $(this).attr("code","");
+    $(this).attr({"code":"","title":$(this).val().trim()});
     getQcCasesEntry($(this).val().trim());
     getQcCasesEntry($(this).val().trim());
   });
   });
   $("body").on("click",".add-box .drop-box li",function(){
   $("body").on("click",".add-box .drop-box li",function(){