Explorar el Código

横版修改bug

zhouna hace 3 años
padre
commit
1dfaf0f8eb
Se han modificado 5 ficheros con 20 adiciones y 13 borrados
  1. 10 1
      src/css/cdss.less
  2. 4 5
      src/css/cdssHorizontal.less
  3. 0 1
      src/html/cdssHorizontal.html
  4. 1 1
      src/js/cdss.js
  5. 5 5
      src/js/cdssHorizontal.js

+ 10 - 1
src/css/cdss.less

@@ -221,9 +221,18 @@ body{
 }
 .pushItemName{
     position: relative;
-    display: inline-block;
+    /*display: inline;*/
     line-height: 21px;
     padding-right: 3px;
+    &.noInfo{
+      margin-right: 12px;
+      &.evaluationtitle{
+        margin-right: 3px;
+      }
+      .hidden-i{
+        display: none;
+      }
+    }
     &:hover{
       .infoImg+.hidden-i{
         display: none;

+ 4 - 5
src/css/cdssHorizontal.less

@@ -32,7 +32,6 @@
   margin: 29px 0 0 3px;
 }
 .versionNew{
-  display: inline-block;
   width: 24px;
   height: 12px;
   background: url("../images/new1.png");
@@ -234,7 +233,7 @@
 .tips-cont {
   position: relative;
   background: #fff7f2;
-  max-height: 81px;
+  max-height: 63px;
   overflow: hidden;
   .moduleTitle {
     position: absolute;
@@ -297,7 +296,7 @@
   line-height: 21px;
   color: @bgcBlue;
   right: 5px;
-  bottom: -4px;
+  bottom: -1px;
   font-size: 12px;
 }
 .longStrBox {
@@ -372,7 +371,7 @@
   // filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#333CACE4,endColorstr=#333CACE4);
   background: #fff7f2;
   margin-top: 7px;
-  max-height: 81px;
+  max-height: 63px;
   overflow-y: hidden;
   position: relative;
 }
@@ -391,7 +390,7 @@
 }
 .isOverFlow {
   overflow: hidden;
-  max-height: 88px;
+  max-height: 41px;
 }
 .showMoreGeneralTreat {
   position: absolute;

+ 0 - 1
src/html/cdssHorizontal.html

@@ -111,7 +111,6 @@
       </div>
     <div class="versionWrapper">
       <span class="versionTop"></span>
-      <span class="versionNew"></span>
       <span class="versionBottom"></span>
     </div>
   </div>

+ 1 - 1
src/js/cdss.js

@@ -644,7 +644,7 @@ function renderItemWrapper(list, showNum) {
 function renderPushItem(item) {
   const infoIcon = `${ item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : "" }`;
   str = `<span class="pushItemBox" data-name="${item.name}" data-type="${item.type}">`
-  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''}"><i class="item-name">${item.type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}<i class="hidden-i"></i></span>`
+  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''} ${item.hasInfo == "1" ? '':'noInfo'}"><i class="item-name">${item.type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}<i class="hidden-i"></i></span>`
   str+=`</span>`;
   return str
 }

+ 5 - 5
src/js/cdssHorizontal.js

@@ -270,7 +270,7 @@ function renderCaseWrite() {
       renderwriteStandardPage(caseWritePush)
       if ($(".moduleItem.casewriting")) {
         let casewritingHei = $(".moduleItem.casewriting")[0].scrollHeight
-        if (casewritingHei > 81) {
+        if (casewritingHei > 63) {
           $(".casewriting").append(`<span class="showMoreCaseWrite">更多</span>`)
           caseWriteStandradList = caseWritePush
           showMoreCaseWrite()
@@ -464,7 +464,7 @@ function rendergeneraTreatPush(list) {
 
     setTimeout(function () {
       let generaTreatHei = $(".moduleItem .generalTreatInfo")[0].scrollHeight
-      if (generaTreatHei > 81) {
+      if (generaTreatHei > 60) {
         $(".moduleItem .generalTreatInfo").append(`<span class="showMoreGeneralTreat">更多</span>`)
         bindGeneralSlide()
       }
@@ -727,11 +727,11 @@ function getVersion() {
     const data = res.data.data;
     const ver = localStorage.getItem('versionTime');
     const time = data.refreshTime;
-    if (!ver || ver === time + "=new" || time !== ver.replace("=new", "")) {       //判断版本是否更新
-      $(".versionBottom").addClass('new-icon');
+    if (!ver || (ver !== time + "=new")) {       //判断版本是否更新
+      $(".versionWrapper").append('<span class="versionNew"></span>');
       localStorage.setItem('versionTime', time + "=new");     //保存版本更新时间
     } else {
-      $(".versionBottom").removeClass("new-icon");
+      $(".versionNew").remove();
     }
   })
 }