Browse Source

bug修改1

zhouna 3 years ago
parent
commit
34d453858f
4 changed files with 36 additions and 25 deletions
  1. 30 17
      src/css/cdss.less
  2. BIN
      src/images/icon_mark.png
  3. 3 5
      src/js/cdss.js
  4. 3 3
      src/js/staticSearch.js

+ 30 - 17
src/css/cdss.less

@@ -210,26 +210,27 @@ body{
 .pushItemBox{
     position: relative;
     display: inline-block;
-    padding-right: 18px;
 }
 .pushItemName{
     position: relative;
     display: inline-block;
     line-height: 21px;
+    padding-right: 15px;
+    &:hover{
+      .infoImg{
+        display: block;
+      }
+    }
 }
 .infoImg{
     width: 12px;
     position: absolute;
-    top: 4px;
+    top: 5px;
+    right: 3px;
     cursor: pointer;
     display: none;
-    right: 3px;
-}
-.pushItemBox:hover{
-    .infoImg{
-        display: block;
-    }
 }
+.pushItemBox
 .showMore,.showLess{
     display: inline-block;
     cursor: pointer;
@@ -277,10 +278,10 @@ body{
   border-left:4px solid @suggerColor;
 }
 .iconMark{
-    width: 4px;
+    width: 17px;
     position: absolute;
-    left: 15px;
-    top: 3px;
+    left: 10px;
+    top: 2px;
 }
 .billingPushItem{
     padding: 0 10px 0 24px;
@@ -348,9 +349,10 @@ body{
     overflow: auto;
 }
 .warning{
-    background: #FF8042;
+    background: @dangerColor;
     color: #fff;
     padding: 10px 40px;
+    box-shadow: 0px 4px -2px 0px #F9BC9F;
 }
 .warningTitImg{
     width: 20px;
@@ -424,8 +426,19 @@ body{
     float: right;
     color: #3B9ED0;
 }
-.shortStrBox,.longStrBox{
-
+.tips-cont{
+  border-radius: 8px;
+  box-shadow: 0px 5px 5px 0px @shadowColor;
+  .moduleBoxTitle{
+    border-color: #FF8042;
+  }
+  .moduleItem{
+    box-shadow: none;
+    border-bottom:1px #E6E6E6 dashed;
+    &:last-child{
+      border-bottom: none;
+    }
+  }
 }
 .longStrBox{
     display: none;
@@ -515,10 +528,10 @@ body{
     }
     .label {
       float: left;
-      border-left: 2px solid #267FD7;
+      border-left: 4px solid #267FD7;
       padding-left: 5px;
-      line-height: 12px;
-      margin-top: 4px;
+      line-height: 14px;
+      margin-top: 3px;
     }
     .val {
       margin-left: 65px;

BIN
src/images/icon_mark.png


+ 3 - 5
src/js/cdss.js

@@ -256,7 +256,6 @@ function renderPushData(){
   return getPushInfo().then(res =>{
     hasCompleteTnterface++
     if(res.data.code == "0"){
-      console.log(1)
       const result = res.data.data
       let diagPush = result.dis ||{}
       let lisPush = result.lis || []
@@ -622,11 +621,10 @@ function renderItemWrapper(list, showNum, type, hasInfo) {
 }
 
 function renderPushItem(item, type) {
-
+  const infoIcon = `${ item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : "" }`;
   str = `<span class="pushItemBox" data-name="${item.name}" data-type="${type}">`
-  str += `${item.hasScale == "0" ? `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : item.hasScale == "1" ? `<span class="pushItemName evaluationtitle">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>`}`
-  str += `${ item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : "" }`
-  str += '</span >'
+  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''}"><i>${type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}</span>`
+  str+=`</span>`;
   return str
 }
 

+ 3 - 3
src/js/staticSearch.js

@@ -46,11 +46,11 @@ $(".searchScale").css({display:'none'})
 $(".searchKnowledge").css({display:'block'})
 $(".searchKnowledge .staticSearchT").on('click','button',function() {
     var val = $(this).parents(".staticSearchT").find("input").val()
-    if(val == ''){
+    if(val.trim() == ''){
         $(".searchKnowledge .staticSearchB .inputWarning").css("display","block")
-       
+    }else{
+        getKnowledgeData(val)
     }
-    val!=''&&getKnowledgeData(val)
 })