Merge branch 'uiUptate0629' of http://192.168.2.236:10080/zhouna/icssDService into uiUptate0629

src/css/cdss.less

@@ -304,8 +304,23 @@ body{
 }
 .tabList{
   margin-bottom: 8px;
+  position: relative;
   height: 100%;
   background: @bgcBlue;
+  .numPop{
+    display: none;
+    position: absolute;
+    top:0;
+    left: 2px;
+    border-radius:8px;
+    width: 15px;
+    height: 15px;
+    background: #FDBE26;
+    box-shadow: 0px 1px 1px 0px #816522;
+    font-size: 12px;
+    text-align: center;
+    color: #fff;
+  }
 }
 .tab{
   width: 10px;

src/css/common.less

@@ -153,4 +153,32 @@
     }
   }
 }
-.version{}
+.version .banner{
+  background: @bgcBlue;
+  height: 100px;
+  margin-bottom: 30px;
+  h1{
+    padding-top: 20px;
+    color: #fff;
+    text-align: left;
+    font-size: 20px;
+    margin-bottom: 8px;
+    img{
+      margin: 0 14px 0 45px;
+      vertical-align: middle;
+    }
+    span{
+      font-size: 20px;
+    }
+  }
+  .time{
+    display: inline-block;
+    margin-left: 83px;
+    padding: 0 26px 0 4px;
+    color: @bgcBlue;
+    font-size: 12px;
+    line-height: 20px;
+    background: url("../images/arr.png") #fff 76px center no-repeat;
+  }
+
+}

src/html/disclaimer.html

@@ -32,10 +32,10 @@
     }
 
     .container {
-      width: 80%;
       background: #fff;
-      margin: 0 auto;
-      padding: 0 30px 40px;
+    }
+    .content{
+      padding: 0 45px 40px;
     }
   </style>
   <script>

src/js/cdss.js

@@ -342,7 +342,7 @@ function isNeedPushWarning(list){
   }
   return false
 }
-
+let popNum = 0;//气泡显示数字
 function renderPushWarning(){
   return getPusgWarning().then(res =>{
     hasCompleteTnterface++
@@ -363,8 +363,8 @@ function renderPushWarning(){
       //moreInfo()
       $(".moduleItem.tips").wrapAll("<div class='tips-cont'></div>");
       $(titleStr('warning')).insertBefore('.tips-cont .moduleItem:first-child')
+      popNum = billMsgList.length+highRiskList.length+criticalValList.length+otherList.length;
       // renderBillingPush(dubugStr,'注意调试信息')
-     
     }
     if(hasCompleteTnterface === allInterface){
       $('.loading').css("display","none")
@@ -382,11 +382,14 @@ function renderWriteStandard(){
       const list = res.data.data || {}
       let casewritingNum = $(".moduleItem.casewriting").attr("data-num") || 5
       renderwriteStandardPage(list,casewritingNum)
+      const warnNum = popNum + Object.keys(list).length;
+      $(".tabList .numPop").text(warnNum).show()
     }
     if(hasCompleteTnterface === allInterface){
       $('.loading').css("display","none")
       if(moduleNum === 0){
         empty()
+        $(".tabList .numPop").hide()
       }
     }
   })
@@ -679,7 +682,7 @@ function renderTab(tabList){
       }
       
     }
-    tabStr += `</ul>`;
+    tabStr += `</ul><div class="numPop"></div>`;
     $(".tabList").append(tabStr)
     let tabNum = 0;
     if(isTcm=='true'){

src/js/version.js

@@ -1,5 +1,6 @@
 const {post, config} = require('./promise.js');
 const $ = require("jquery");
+require('../images/rock.png')
 
 $(function(){
   function getVersion() {
@@ -9,7 +10,7 @@ $(function(){
       const time = data.refreshTime.substr(0,10);
       let dom = '';
       $("h1 span").html(data.name);
-      $("h1 i").html(time);
+      $(".time").html(time);
       for(let i=0;i<dtl.length;i++){
         dom += '<p>'+dtl[i].title+'</p><p>'+dtl[i].description+'</p>';
       }