Merge remote-tracking branch 'origin/uiUptate0629' into testNew

src/css/cdss.less

@@ -223,20 +223,28 @@ body{
     position: relative;
     display: inline-block;
     line-height: 21px;
-    padding-right: 15px;
+    padding-right: 3px;
     &:hover{
+      .infoImg+.hidden-i{
+        display: none;
+      }
       .infoImg{
-        display: block;
+        display: inline;
       }
     }
 }
-.infoImg{
+.infoImg,.hidden-i{
     width: 12px;
-    position: absolute;
+    /*position: absolute;
     top: 5px;
-    right: 3px;
+    right: 3px;*/
     cursor: pointer;
     display: none;
+    vertical-align: middle;
+}
+.hidden-i{
+  display: inline-block;
+  width: 12px;
 }
 .showMore,.showLess{
     display: inline-block;
@@ -598,7 +606,7 @@ body{
     color: @linkColor;
     cursor: pointer;
   }
-  .infoImg{
-    right: 8px;
+  .infoImg,.hidden-i{
+    margin-left: -10px;
   }
 }

src/css/cdssHorizontal.less

@@ -429,6 +429,7 @@
 }
 .followUpWrap {
   position: absolute;
+  width: 100%;
   height: 202px;
   padding: 10px 20px;
   box-sizing: border-box;

src/js/cdss.js

@@ -649,7 +649,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>${item.type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}</span>`
+  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''}"><i>${item.type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}<i class="hidden-i"></i></span>`
   str+=`</span>`;
   return str
 }

src/js/cdssHorizontal.js

@@ -111,7 +111,7 @@ function renderPage(pageSet) {
                 <img class="emptyImg" src="../images/icon_admin.png" alt="空">
                 <p class="emptyTxt">功能未开启</p>
             </div>`
-      $(".recommendWrap").html(nullTxt);
+      $(".recommendWrap").html(nullTxt).show();
       return;
   }
   if (hasTcm) {
@@ -252,7 +252,7 @@ function getModuleShow(moduleClassName) {
   if ($(`.${moduleClassName}`).css("display") == "none") {
     $(".moduleWrapper").css("display", "none")
     $(`.${moduleClassName}`).css("display", "block")
-    $(".empty-box").hide();
+    empty();
   }
 }
 function setTabNameTop() {
@@ -358,7 +358,7 @@ function renderPushData() {
 }
 function empty(){   //显示空状态
   setTimeout(function(){
-      if($(".moduleItem:visible").length===0){
+      if($(".empty-right:visible").length===0&&$(".moduleItem:visible").length===0){
           $(".empty-box").hide();
           $(".empty-null").show();
       }
@@ -749,9 +749,6 @@ $(function () {//隐藏logo
         $(".versionTop .logoTxt").hide();
     }
   getVersion()
-  $(window).on("resize", function () {
-    setWidth()
-  })
   $(".versionTop").on("click", function () {
     openNewWin("disclaimer.html")
   });

src/js/followUp.js

@@ -210,7 +210,7 @@ function bindToggleInfo(){
 function followEmpty() {
     let str = `<div class="emptyBox">
         <img class="emptyImg" src=${emptyImg}>
-        <p class="emptyTxt">暂无随访计划～</p>
+        <p class="emptyTxt">暂无随访计划</p>
     </div>`
     $(".followUpWrap").append(str)
 }