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

src/css/cdssPlan.less

@@ -20,7 +20,7 @@ body{
     z-index: 1;
 }
 .infoWrap{
-    padding-top: 54px;
+    padding-top: 84px;
     overflow-y: hidden;
 }
 .iframeWrap {

src/js/followUp.js

@@ -31,8 +31,8 @@ function renderPage(data, type) {
     let operaItemDetail = operaItem.pushPlanDetails || []
     renderName(operaItemName)
     if (type) {
-        operaItemDetail = operaItemDetail.splice(0, 1)
-        renderDetailHorizontal(operaItemDetail)
+        operaItemDetail = operaItemDetail.find((it)=>it.history===0);
+        renderDetailHorizontal([operaItemDetail])
     } else {
         renderBtn(operaItemDetail)
         renderDetail(operaItemDetail)
@@ -142,7 +142,7 @@ function renderBtn(data){
         return
     }
     const str = `<div class="btnBox" id="btnBox"><span class="btnName">显示历史计划</span></div>`
-    $(".followUpWrap").append(str)
+    $(".operaNameWrap").append(str)
     bindToggleHistory()
 
 }