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

src/css/cdss.less

@@ -5,30 +5,28 @@ body{
     background: #fff;
 }
 .bodyWrap{
-    position: fixed;
-    width: 100%;
-    height: 100%;
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  /*background: @bgcBlue;*/
 }
 .iframeWrap {
-    margin: 0 auto 50px;
-    // padding: 0 20px 20px 20px;
-    min-width: 340px;
-    overflow-y: hidden;
+
 }
 .contentWrapper{
-    position: relative;
-    overflow-y: hidden;
-    // overflow-y: auto;
+  margin-left: 40px;
+  padding:10px 12px 0;
+  overflow-y: auto;
 }
 .responsibility {
     text-align: center;
     font-size: 12px;
-    color: #979797;
+    color: #aaa;
     padding-bottom: 5px;
     position: fixed;
-    left: 0;
+    left: 40px;
     width: 100%;
-    bottom: 23px;
+    bottom: 40px;
     background-color: #fff;
     z-index: 1;
 }
@@ -36,10 +34,10 @@ body{
     height: 24px;
     width: 100%;
     line-height: 24px;
-    position: fixed;
+    position: absolute;
     bottom: 0;
     background-color: #EFF1F6;
-    left: 0;
+    left: 40px;
     z-index: 98;
     .version-tip{
         margin-left: 20px;
@@ -56,6 +54,7 @@ body{
     .version-txt,.disclaimerInfoTxt{
         font-size: 12px;
         color: #777;
+        border-bottom: 1px solid #777;
     }
     .version-txt:hover{
         border-bottom: 1px solid #000;
@@ -70,7 +69,7 @@ body{
     .disclaimerInfo {
         float: right;
         font-size: 12px;
-        margin-right: 20px;
+        margin-right: 60px;
     }
 }
 
@@ -115,34 +114,20 @@ body{
     top: 100px;
 }
 .emptyImg{
-    width: 120px;
+    width: 90px;
     position: relative;
     left: 50%;
-    margin-left: -60px;
+    margin-left: -45px;
 }
 .emptyImgSearch{
     width: 100px;
 }
 .emptyTxt{
     text-align: center;
-    color: #AAA;
-    font-size: 12px;
-    margin-top: 15px;
-}
-// .titleIcon{
-//     width: 16px;
-//     margin: 0px 12px 0 12px;
-//     position: relative;
-//     top: 2px;
-// }
-// .warningbox{
-//     .titleIcon{
-//         width: 16px;
-//         margin: 0px 12px 0 -5px;
-//         position: relative;
-//         top: 2px;
-//     }  
-// }
+    color: #999;
+    font-size: 14px;
+    margin-top: 10px;
+}
 .loading{
     position: fixed;
     width: 100%;
@@ -218,24 +203,9 @@ body{
 
 
 // CDSS6.0
-.tab{
-    color: @tabColor;
-    margin-right: 20px;
-    display: inline-block;
-  &:last-child {
-    margin-right: 0;
-  }
-}
-.moduleItem{
-    border: 1px solid #EAEDF1;
-    margin: 0 0 0px 0;
-}
-.longBox,.shortBox{
-    padding: 4px 10px;
-}
 .diag{
     .longBox,.shortBox{
-        padding: 0 10px;
+        padding: 0 10px 8px;
     }
 }
 .longBox{
@@ -249,15 +219,15 @@ body{
 .pushItemName{
     position: relative;
     display: inline-block;
-   
+    line-height: 21px;
 }
 .infoImg{
-    width: 15px;
+    width: 12px;
     position: absolute;
-    top: 2px;
+    top: 4px;
     cursor: pointer;
     display: none;
-    right: 2px;
+    right: 3px;
 }
 .pushItemBox:hover{
     .infoImg{
@@ -271,95 +241,117 @@ body{
     color: #3B9ED0;
 }
 .moduleTitle{
-    height: 30px;
-    line-height: 30px;
-    font-size: 14px;
+    height: 35px;
+    line-height: 35px;
+    font-size: 16px;
+    color: @fontClr;
     font-weight: 600;
+    border-radius: 8px 8px 0 0;
+    margin-bottom: 10px;
     .titleIcon{
-        width: 20px;
+        width: 24px;
         position: relative;
         top: 5px;
-        margin: 0 8px;
+        margin: 0 5px 0 14px;
     }
 }
 .casewriting .titleIcon{
     width:14px;
 }
 .iconArrowImg{
-    width: 14px;
+    width: 10px;
     // position: relative;
     // top: 2px;
 }
 .moduleBox{
-    padding: 5px 0;
+  padding:0 14px;
+  .longBox,.shortBox{
+    border-bottom: 1px #E6E6E6 dashed;
+  }
+  &:last-child .longBox,&:last-child  .shortBox{
+    border-bottom: none;
+  }
 }
 .moduleBoxTitle{
-    padding: 0 10px;
-    line-height: 27px;
-    font-weight: 600;
+  color: @fontClr;
+  line-height: 17px;
+  font-weight: 600;
+  padding-left: 3px;
+  margin: 6px 0;
+  border-left:4px solid @suggerColor;
 }
 .iconMark{
     width: 4px;
     position: absolute;
-    left: 20px;
+    left: 15px;
     top: 3px;
 }
 .billingPushItem{
-    padding: 0 10px 0 30px;
+    padding: 0 10px 0 24px;
     position: relative;
 }
 .moduleItem{
-    border-radius: 4px;
-    .moduleBox{
-        border-bottom: 1px solid #EAEDF1;
-    }
-    .moduleBox:last-child{
-        border-bottom: 0;
-    }
+    border-radius: 8px;
+    box-shadow: 0px 5px 5px 0px @shadowColor;
+    margin-bottom: 10px;
+    padding-bottom: 10px;
+  .longBox,.shortBox{
+    padding: 4px 0;
+  }
+  &>.longBox,&>.shortBox{
+    padding: 4px 14px;
+  }
 }
 .tabList{
-    line-height: 39px;
   margin-bottom: 8px;
-    padding: 0 20px 0 20px;
-    box-sizing: border-box;
+  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{
-    font-size:14px;
-    color: #777777;
-    position: relative;
-    cursor: pointer;
-}
+  width: 10px;
+  padding:8px 10px;
+  font-size:14px;
+  cursor: pointer;
+  color: @tabColor;
+  margin-left: 10px;
+  background: @tabBgColor;
+  border-radius: 8px 0px 0px 8px;
+  span{
+  }
+ }
 .activeTab{
-    color:#3B9ED0;
-    font-weight: 600;
-    font-size:16px;
-    .activeLine{
-        display: inline-block;
-        width: 34%;
-        height: 3px;
-        left: 32%;
-        background: #3B9ED0;
-        position: absolute;
-      bottom: 3px;
-    }
+  color:@fontClr;
+  font-weight: 600;
+  font-size:14px;
+  background: @mainBg;
 }
 .moduleWrapper{
     display: none;
 }
 .recommendWrap{
-    position: absolute;
-    box-sizing: border-box;
-    width: 100%;
-    height: 100%;
-    overflow-y: auto;
-    padding: 0 15px 50px 15px;
+
 }
 .staticSearchB ul{
     position: absolute;
     height: 480px;
     // width: 100%;
     /* right: 30px; */
-    left: 0; 
+    left: 40px;
     overflow: auto;
 }
 .warning{
@@ -378,10 +370,7 @@ body{
     margin-right: 15px;
 }
 .medicalKonwledgeWrap{
-    padding: 0 30px;
-}
-.titleIcon{
-    width: 20px;
+
 }
 .newIcon{
     width: 27px;
@@ -441,8 +430,7 @@ body{
     color: #3B9ED0;
 }
 .shortStrBox,.longStrBox{
-    position: relative;
-    padding: 4px 0;
+
 }
 .longStrBox{
     display: none;
@@ -466,19 +454,24 @@ body{
 }
 .tcm-item {
   display: none;
-  margin: 0 15px 10px;
+  margin: 0 0 10px;
   border: 1px #EEF5FD solid;
   border-radius: 8px;
+  box-shadow: 0px 5px 5px 0px #D3D8D9;
+  &.go-push .title{
+    border-radius: 8px;
+  }
   .title {
-    background: #EEF5FD;
-    height: 30px;
-    line-height: 30px;
+    background: @pushBgColor;
+    height: 35px;
+    line-height: 35px;
     padding: 0 12px;
     border-radius: 8px 8px 0px 0px;
     img {
       vertical-align: middle;
-      width: 24px;
-      height: 24px;
+      width: 20px;
+      height: 20px;
+      margin-right: 3px;
     }
     .h2 {
       font-weight: bold;
@@ -488,8 +481,8 @@ body{
     .go {
       float: right;
       margin-right: 10px;
-      font-size: 12px;
-      color: #333;
+      font-size: 14px;
+      color: @linkColor;
       text-decoration: none;
       cursor: pointer;
       img {
@@ -518,7 +511,7 @@ body{
   }
   .detail {
     margin: 0 10px;
-    border-top: 1px #E6E6E6 solid;
+    border-top: 1px #E6E6E6 dashed;
     padding-top: 5px;
     /*max-height: 134px;*/
     overflow-y: hidden;
@@ -562,8 +555,8 @@ body{
     .a-link {
       display: inline-block;
       width: 100%;
-      border: 1px #3B9ED0 solid;
-      color: #3B9ED0;
+      border: 1px @linkColor solid;
+      color: @linkColor;
       height: 30px;
       line-height: 30px;
       border-radius: 4px;
@@ -574,8 +567,10 @@ body{
     }
   }
 }
-.evaluationtitle:hover{
-    text-decoration: underline;
-    color: #0000FF;
-    cursor: pointer;
+.evaluationtitle{
+  color: @linkColor;
+  cursor: pointer;
+  &+.infoImg{
+    right: 8px;
+  }
 }

src/css/cdssPlan.less

@@ -128,9 +128,9 @@ body{
 }
 .emptyTxt{
     text-align: center;
-    color: #AAA;
-    font-size: 12px;
-    margin-top: 15px;
+    color: #999;
+    font-size: 14px;
+    margin-top: 10px;
 }
 // .titleIcon{
 //     width: 16px;

src/css/common.less

@@ -1,27 +1,53 @@
 @import './reset.css';
+@fontClr:#333;//通用字体颜色
+@txtColor:#666;//正文字体颜色
+@mainBg:#fff; //主体背景色
+@tabColor: #fff; // 左侧Tab文字颜色
+@tabBgColor: #1C6EC3; // 左侧Tab背景颜色
+@bgcBlue:#4F9FF3; //背景蓝色
+@dangerColor:#FF7F5B; //警惕
+@shadowColor:#DEDDDD; //阴影颜色
+@linkColor:#1677FF; //链接颜色
+@warnColor:#333130;   //错误提示颜色
+@suggerColor:#267FD7; //推送颜色
+@treatColor:#1ECEBD; //治疗颜色
+@pushBgColor:#E3F0FF; //推送title背景颜色
+@markFontColor:#1E1E1E; //着重色
+@hoverBg:#EEF3FF; //鼠标悬浮背景色
 @grayColor:#D1D1D1; //边框
-@bgcBlue:#ECF4FC; //背景蓝色
 @colorBlue:#267FD7;  //hover
-@bgcWaring:#FDF4EE; //病情提示
-@colorWaring:#FF545B; //警惕
-@bgcPlan:#E3FEFE; //治疗
-@bgcMay:#FAEBEC; //疑似，警惕，可能
-@bgcModal:#DFEAFE; //弹窗头
-@tabColor: #777; // 右侧大Tab文字颜色
 @staticMainColor: #2A9BD5; // 静态知识主要颜色
+@colorBlue: #267fd7; //hover
+@bgcWaring: #fdf4ee; //病情提示
+@colorWaring: #FF7836; //警惕
+@bgcPlan: #e3fefe; //治疗
+@bgcMay: #faebec; //疑似，警惕，可能
+@bgcModal: #dfeafe; //弹窗头
+@fontColor: #666;
 .disCopy {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 .ellipsis{
     white-space: nowrap;/*强制在一行显示*/
 	text-overflow:ellipsis;/*设置超出内容显示...*/
 	overflow: hidden;/*一定不能少 超出的内容进行隐藏*/
 }
+.clearfix:after {
+  content: "";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+
+.clearfix {
+  zoom: 1;
+}
 .clearfix:after{
     content: ""; 
     display: block; 
@@ -33,7 +59,12 @@
   .clearfix {
     zoom: 1; 
   }
-
+.fl{
+  float: left;
+}
+.fr{
+  float: right;
+}
 // 文本编辑器返回dom样式
 .ql-align-right {
   text-align: right;
@@ -105,3 +136,50 @@
     margin: 0 0 20px 322px;
   }
 }
+
+/*********免责声明，版本信息*********/
+.disclaimer{
+  h1{
+    background: @bgcBlue;
+    height: 100px;
+    margin-bottom: 30px;
+    span{
+      font-size: 20px;
+      color: #fff;
+      display: inline-block;
+      border-bottom: 2px solid #fff;
+      padding-bottom: 4px;
+      margin-top: 36px;
+
+    }
+  }
+}
+.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/css/followUpV.less

@@ -1,9 +1,12 @@
+@import "./common.less";
+/*******随访计划*********/
 .operaNameBox{
     background: #EFF1F6;
     line-height: 22px;
-    padding: 0px 14px;
+    padding: 5px 6px 5px 9px;
     font-size: 12px;
-    color: #777777;
+    color: @txtColor;
+    border-radius: 2px;
 }
 .operaNameBold{
     color: #1e1e1e;
@@ -12,27 +15,29 @@
 }
 .btnBox{
     text-align: center;
-    padding: 15px 0;
+    padding: 15px 0  2px;
 }
 .btnName{
     display: inline-block;
     padding: 4px 10px;
-    background:#E7F3F9;
+    background:@pushBgColor;
     font-size: 12px;    
-    color: #3B9ED0;
+    color: @linkColor;
     border-radius: 12px;
     cursor: pointer;
 }
 .infoWrap{
     overflow-y: auto;
-    padding: 0 15px;
 }
 .infoBoxTitle{
-    line-height: 40px;
-    color: #1E1E1E;
+    line-height: 32px;
+    color: @markFontColor;
+    font-weight: bold;
     font-size: 14px;
     position: relative;
     cursor: pointer;
+    margin-top: 8px;
+    text-indent: 3px;
 }
 .historyBox .infoBoxTitle{
     color: #AAAAAA;
@@ -41,57 +46,60 @@
     display: none;
 }
 .lisBox,.pacsBox{
-    padding-left: 68px;
     position: relative;
 }
+.lisBox .itemBoxTitle{
+    background: url("../images/lis.png") 4px 2px no-repeat;
+}
+.pacsBox .itemBoxTitle{
+    background: url("../images/pace.png") 4px 2px no-repeat;
+}
 .circle{
     display: inline-block;
     width: 5px;
     height: 5px;
-    background: #89C5E3;
+    background: #4B96FF;
     border-radius: 50%;
     position: absolute;
     left: 0;
     top: 6px;
 }
 .lisItem,.pacsItem{
-    padding: 0 10px;
+    padding: 0 12px;
     position: relative;
     line-height: 20px;
+    margin:0 0 3px 12px;
 }
 .pacsBox{
     margin-top: 10px;
 }
 
-/*.infoBox:hover{
-    background: #EEEEEE;
-    .title h2 {
-        background: #EEEEEE;
-    }
-}*/
+.infoBox:hover{
+    background: @hoverBg;
+}
 .itemBoxTitle{
-    position: absolute;
-    left: 0;
     display: inline-block;
-    width: 38px;
-    height: 18px;
-    border-radius: 10px;
-    border: 1px solid #3B9ED0;
-    color: #3B9ED0;
-    text-align: center;
-    line-height: 18px;
+    width: 62px;
+    height: 22px;
+    line-height: 22px;
+    text-indent: 24px;
+    border-radius: 4px;
+    border: 1px solid #0078FF;
+    color: #0078FF;
+    margin:0 0 6px 10px;
 }
 .toggleInfo{
-    width: 10px;
+    width: 16px;
     position: absolute;
     right: 10px;
-    top: 15px;
+    top: 10px;
 }
 .childrenBox{
     display: none;
+    padding-bottom: 7px;
 }
 .followUpWrap .emptyBox{
-    margin-top: 80px;
+    margin-top: 50px;
     text-align: center;
 }
 .followUpWrap .emptyImg{
@@ -99,8 +107,4 @@
     position: relative; 
     left: 0; 
     margin-left: 0;
-}
-.followUpWrap .emptyTxt{
-    color: #AAAAAA;
-    font-size: 12px;
 }

src/css/reset.css

@@ -34,7 +34,7 @@ input {
 html,
 body {
   font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
-  color: #000;
+  color: #666;
 }
 
 ol,
@@ -45,9 +45,6 @@ ul {
 li {
   list-style: none;
 }
-a {
-  color: #000;
-}
 button {
   cursor: pointer;
   outline: none;

src/css/staticSearch.css

@@ -1,3 +1,4 @@
+@import "common.less";
 html{
     background: #fff;
     font-family: '微软雅黑', '宋体';
@@ -23,8 +24,9 @@ html{
 }
 .container .ipt {
     width: 100%;
-    height: 34px;
-    padding: 5px 25px 5px 5px;
+    height: 36px;
+    padding: 6px 25px 6px 5px;
+    border-radius: 4px 0px 0px 4px;
     vertical-align: top;
     display: inline-block;
     box-sizing: border-box;
@@ -34,6 +36,7 @@ html{
     width: 100%;
     position: relative;
     top: 1px;
+    font-size: 14px;
     font-family: '微软雅黑', '宋体';
 }
 
@@ -42,13 +45,14 @@ html{
     right: 0;
     top: 10px;
     width: 80px;
-    height: 34px;
-    line-height: 34px;
+    height: 36px;
+    line-height: 36px;
     color: #fff;
-    background: #2A9BD5;
+    font-size: 14px;
+    background: @bgcBlue;
+    border-radius: 0px 4px 4px 0px;
     text-align: center;
     border: none;
-    font-family: '微软雅黑', '宋体';
 }
 .container .staticSearchT i {
     position: absolute;
@@ -74,35 +78,44 @@ html{
     position: relative;
 }
 .staticSearchB .inputWarning{
-    color: #1E1E1E;
+    color: @fontClr;
 }
 
 .staticSearchB ul {
     position: absolute;
     height: 480px;
     /* width: 100%; */
-    right: 30px;
-    left: 30px;
+    right: 18px;
+    left: 22px;
     overflow: auto;
     padding: 0 30px;
 }
 .staticSearchB ul li {
-    border-bottom: 1px #CECECE solid;
-    line-height: 30px;
+    border-bottom: 1px #EFEFEF solid;
+    line-height: 32px;
     padding-top: 5px;
     cursor: pointer;
 }
 .staticSearchB ul li:hover {
     border-bottom: 2px solid #3B9ED0;
 }
+.staticSearchB ul  p{
+    color: @fontClr;
+}
 .staticSearchB ul i {
-    font-size: 12px;
-    color: #2A9BD5;
+    font-size: 14px;
+    color: @linkColor;
 }
 .staticSearchB .tip {
-    font-size: 12px;
+    font-size: 16px;
     color: #979797;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
+    img{
+        width: 16px;
+        height: 16px;
+        vertical-align: middle;
+        margin-right: 5px;
+    }
 }
 .staticSearchB ul span {
     color: #979797;
@@ -111,12 +124,13 @@ html{
     line-height: 20px;
 }
 .searchTypeBox {
-    margin: 10px 0 0 0;
+    margin: 10px 0 5px 0;
 }
 .medicalTypeItem{
     display: inline-block;
     margin: 0 20px 10px 0;
     cursor: pointer;
+    color: @fontClr;
 }
 .medicalTypeItem img {
     vertical-align: text-bottom;

src/html/cdss.html

@@ -25,16 +25,14 @@
           <img src="../images/right.png" class="right" alt="">
         </div>
       </div> -->
-      <div class="iframeWrap">
-        <div class="tabList">
-
-        </div>
+      <div class="iframeWrap clearfix">
+        <div class="tabList fl"></div>
         <div class="contentWrapper">
           <div class="recommendWrap moduleWrapper">
             <div class="recommendBox">
               <div class="empty">
                 <img class="emptyImg" src="./images/empty2.png" alt="空">
-                <p class="emptyTxt">等待更多内容输入中</p>
+                <p class="emptyTxt">等待内容输入中…</p>
               </div>
               <div class="loading">
                 <div class="loadingMask"></div>
@@ -43,8 +41,8 @@
               </div>
               <p class="responsibility"></p>
             </div>
-            
-            
+
+
           </div>
           <div class="qcWrap moduleWrapper">
   
@@ -62,12 +60,12 @@
                   <div class="searchTypeBox"></div>
       
                   <div class="staticSearchB">
-                      <p class="tip">搜索结果</p>
+                      <p class="tip"><img src="../images/icon_search.png" alt=""/>搜索结果</p>
                       <p class="searching">正在搜索中...</p>
                       <p class="inputWarning">请输入搜索内容！</p>
                       <div class="empty">
                           <img class="emptyImgSearch" src="./images/empty3.png" alt="">
-                        <p>暂无搜索结果~</p>
+                        <p>暂无搜索结果～</p>
                       </div>
                       <ul>
                           
@@ -134,6 +132,7 @@
                         </ul>
                     </div>
                 </div>
+                <p class="responsibility"></p>
             </div>
           <div class="disclaimer clearfix">
             <span class="version-tip"><span class="version-txt">版本说明 <img class="newIcon" src="./images/new.png"></span></span>

src/html/cdssHorizontal.html

@@ -26,10 +26,11 @@
         </span>
        
       </div>
-      <div class="tabList">
-
-      </div>
+      
       <div class="contentBox">
+        <div class="tabList">
+
+        </div>
         <div class="recommendWrap moduleWrapper clearfix">
           <div class="leftWrapper">
             <div class="leftBox"></div>

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>
@@ -47,8 +47,8 @@
 </head>
 
 <body>
-  <div class="container">
-    <h1></h1>
+  <div class="container disclaimer">
+    <h1><span></span></h1>
     <div class="content">
 
     </div>

src/js/cdssHorizontal.js

@@ -10,7 +10,7 @@ const $ = require("jquery");
 require('./../css/reset.css');
 require('./../css/cdssHorizontal.less');
 require('./../css/popup.css');
-require('./../css/staticSearch.css')
+require('../css/staticSearch.less')
 require('./../js/staticSearch.js');//静态知识搜索
 require('./../images/empty2.png').replace(/^undefined/g, '')
 require('./../images/dn.png').replace(/^undefined/g, '')
@@ -140,13 +140,15 @@ function renderTab(tabList) {
   for (let i = 0; i < tabList.length; i++) {
     if (tabList[i].status == '1') {
       TabNum++
-      tabStr += `<span class="tab" style="border-bottom:${tabList.length == i + 1 ? '0' : '1px solid #3B9ED0'}" data-name="${tabList[i].code}" ><span class="tabName">${tabList[i].name}</span><span class="activeLine"></span></span>`
+      tabStr += `<span class="tab" data-name="${tabList[i].code}" ><span class="tabName">${tabList[i].name}</span><span class="activeLine"></span></span>`
     }
 
   }
   $(".tabList").append(tabStr)
   $(".tabList .tab").eq(0).addClass("activeTab")
-  $(".tabList .tab").css("height", 1 / TabNum * 100 + '%')
+  $(".tabList .tab").eq(0).addClass("activeTab")
+  $(".tabList .tab .activeLine").eq(0).css({ display: "block" })
+  // $(".tabList .tab").css("height", 1 / TabNum * 100 + '%')
   let showModuleName = $(".tabList .tab").eq(0).attr("data-name")
   getModuleShow(moduleConfig[showModuleName])
   bindTabClick()
@@ -218,7 +220,9 @@ function isNeedwriteStandardPush(list) {
 function bindTabClick() {
   $(".tabList .tab").on("click", function () {
     $(".activeTab").removeClass("activeTab")
+    $(".tabList .tab .activeLine").css({ display: "none" })
     $(this).addClass("activeTab")
+    $(this).find('.activeLine').css({ display: "block" })
     const moduleName = $(this).attr("data-name")
     getModuleShow(moduleConfig[moduleName])
   })
@@ -233,7 +237,7 @@ function setTabNameTop() {
   tabNameList = $(".tabList .tab .tabName")
   for (let i = 0; i < tabNameList.length; i++) {
     let tabNameHei = $(".tabList .tab .tabName").eq(i).height()
-    $(".tabList .tab .tabName").eq(i).css("marginTop", -tabNameHei / 2 + "px")
+    // $(".tabList .tab .tabName").eq(i).css("marginTop", -tabNameHei / 2 + "px")
   }
 }
 function renderCaseWrite() {
@@ -607,7 +611,7 @@ function bindOpenInfo() {
 
 function titleStr(type) {
   let titleStr = ''
-  titleStr += `<div class="moduleTitle"><img class="titleIcon" src=${titleConfigH[type].icon}>${titleConfigH[type].name}：</div>`
+  titleStr += `<div class="moduleTitle"><img class="titleIcon" src=${titleConfigH[type].icon}>${titleConfigH[type].name}</div>`
   return titleStr
 }
 function bindSlide() {
@@ -666,9 +670,9 @@ function moreInfo() {
     console.log(name)
     openNewWin(`staticInfo.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}&page=1&gauge=gauge`)
   })
-  
+
 }
-function pushItemName(){
+function pushItemName() {
   $('.pushItemName').off("click").click(function () {
     console.log(11)
     const name = $(this).parent().attr('data-name')

src/js/cdssPlan.js

@@ -10,7 +10,7 @@ require('./../css/reset.css');
 require('./../css/cdssPlan.less');
 require('./../css/popup.css');
 require('./../css/followUpV.less');
-require('./../css/staticSearch.css')
+require('../css/staticSearch.less')
 require('./../js/staticSearch.js')      //静态知识搜索
 require('./../images/empty.png').replace(/^undefined/g, '')
 require('./../images/empty2.png').replace(/^undefined/g, '')

src/js/disclaimer.js

@@ -11,7 +11,7 @@ $(function(){
           data = result[i]
         }
       }
-      $("h1").html('免责声明');
+      $("h1 span").html('免责声明');
       $(".content").html(data.description);
     })
   }

src/js/followUp.js

@@ -1,149 +1,162 @@
 var $ = require("jquery");
 var { post,config,getUrlArgObject,openNewWin,isIe8 ,openNewWin} = require('./promise.js');
-let showImg = require('./../images/show2.png').replace(/^undefined/g, '')
+let showImg = require('./../images/show.png').replace(/^undefined/g, '')
 let collapseImg = require('./../images/collapse2.png').replace(/^undefined/g, '')
 let emptyImg = require('./../images/empty3.png').replace(/^undefined/g, '')
-function getFollowUp(msg){
+let lisStrFrontIcon = require('./../images/lisStrFront-icon.png').replace(/^undefined/g, '')
+let pacsStrFrontIcon = require('./../images/pacsStrFront-icon.png').replace(/^undefined/g, '')
+let rightIcon = require('./../images/right-icon.png').replace(/^undefined/g, '')
+function getFollowUp(msg) {
     return post(config.followUp, msg)
 }
 let hospitalId = getUrlArgObject('hospitalId') || ''
-let mrId = getUrlArgObject('mrId') 
-function renderFollowUp(msg,type){
-    getFollowUp(msg).then(res =>{
-        if(res.data.code === "0"){
-            const result = res.data.data&&res.data.data.pushPlans || []
-            if(result.length === 0||(result[0]&&result[0].item&&JSON.stringify(result[0].item)==="{}")){
+let mrId = getUrlArgObject('mrId')
+function renderFollowUp(msg, type) {
+    getFollowUp(msg).then(res => {
+        if (res.data.code === "0") {
+            const result = res.data.data && res.data.data.pushPlans || []
+            if (result.length === 0 || (result[0] && result[0].item && JSON.stringify(result[0].item) === "{}")) {
                 followEmpty()
                 return
             }
-            renderPage(result,type)
-        }else{
+            renderPage(result, type)
+        } else {
             followEmpty()
         }
     })
 }
-function renderPage(data,type){
+function renderPage(data, type) {
     const operaItem = data[0] || {}
     const operaItemName = operaItem.item || {}
     let operaItemDetail = operaItem.pushPlanDetails || []
-    renderName(operaItemName) 
-    if(type){
-        operaItemDetail=operaItemDetail.splice(0,1)
+    renderName(operaItemName)
+    if (type) {
+        operaItemDetail = operaItemDetail.splice(0, 1)
         renderDetailHorizontal(operaItemDetail)
-    }else{
+    } else {
         renderBtn(operaItemDetail)
         renderDetail(operaItemDetail)
         checkDom()
-    }   
+    }
 }
-function renderName(data){
-      const operationTime = data.dateValue&&getTime(data.dateValue)
-      const  operationName = data.name || ""
-      const str = `<div class="operaNameWrap" id="operaNameWrap"><div class="operaNameBox">患者于<span class="operaNameBold">${operationTime}</span>进行<span class="operaNameBold">${operationName}</span>。根据临床路径要求，特制订检验检查计划如下。</div></div>`
-      $(".followUpWrap").append(str)
+function renderName(data) {
+    const operationTime = data.dateValue && getTime(data.dateValue)
+    const operationName = data.name || ""
+    const str = `<div class="operaNameWrap" id="operaNameWrap"><div class="operaNameBox">患者于<span class="operaNameBold">${operationTime}</span>进行<span class="operaNameBold">${operationName}</span>。根据临床路径要求，特制订检验检查计划如下。</div></div>`
+    $(".followUpWrap").append(str)
 }
-function renderDetailHorizontal(data){
-   let str = ``
-   for(let i = 0; i < data.length; i++){
-       const item = data[i]
-       const lisArr = item.lis || []
-       const pacsArr = item.pacs || []
-       let lisStr=``
-       let pacsStr=``
-       let title = `<p>${getTime(item.examineDate)}（${item.description&&(item.description)}）</p>`
-       for(let i = 0; i < lisArr.length; i++){
-        lisStr += `<div style="position:relative"><span class="circle"></span>${lisArr[i]}</div>`
-       }
-       for(let i = 0; i < pacsArr.length; i++){
-        pacsStr += `<div style="position:relative"><span class="circle"></span>${pacsArr[i]}</div>`
-       }
-       str += `<div class="infoBox">
+function renderDetailHorizontal(data) {
+    let str = ``
+    for (let i = 0; i < data.length; i++) {
+        const item = data[i]
+        const lisArr = item.lis || []
+        const pacsArr = item.pacs || []
+        let lisStr = ``
+        let pacsStr = ``
+        let title = `<p>${getTime(item.examineDate)}（${item.description && (item.description)}）</p>`
+        for (let i = 0; i < lisArr.length; i++) {
+            lisStr += `<div style="position:relative"><span class="circle"></span>${lisArr[i]}</div>`
+        }
+        for (let i = 0; i < pacsArr.length; i++) {
+            pacsStr += `<div style="position:relative"><span class="circle"></span>${pacsArr[i]}</div>`
+        }
+        str += `<div class="infoBox">
             ${title}
             <div class="checkFront lisBox">
-            <span class="lisStrFront">检验</span>
+            <div class="lisStrFront">
+                <img src="${lisStrFrontIcon}" alt="" />
+                <span>检验</span>
+            </div>
+            
             <div>${lisStr}</div>
            </div>
            <div class="checkFront pacsBox">
-            <span class="pacsStrFront">检查</span>
+           <div class="pacsStrFront">
+           <img src="${pacsStrFrontIcon}" alt="" />
+            <span>检查</span>
+           </div>
+            
             <div>${pacsStr}</div>
            </div>
        </div>`
-   }
-   $(".followUpWrap").append(`<div class="infoWrap">${str}<div class="readMorePlan"><a>查看更多计划</a></div></div>`)
+    }
+    $(".followUpWrap").append(`<div class="infoWrap">${str}<div class="readMorePlan"><a>查看更多计划</a>
+        <img src="${rightIcon}" alt="" />
+    </div></div>`)
     showMoreCheck()
 }
-function showMoreCheck(){
-  $(".readMorePlan a").on("click", function(){
-    openNewWin(`cdssPlan.html?mrId=${mrId}&hospitalId=${hospitalId}`)
-  })
+function showMoreCheck() {
+    $(".readMorePlan a").on("click", function () {
+        openNewWin(`cdssPlan.html?mrId=${mrId}&hospitalId=${hospitalId}`)
+    })
 }
-function renderDetail(data){
-   let historyStr = ``
-   let laterStr = ``
-   for(let i = 0; i < data.length; i++){
-       const item = data[i]
-       const lisArr = item.lis || []
-       const pacsArr = item.pacs || []
-       let lisStr=``
-       let pacsStr=``
-       let title = `<p class="infoBoxTitle">${getTime(item.examineDate)}${item.description?'('+item.description+')':''} <img class="toggleInfo" src="${showImg}"/></p>`
-       for(let i = 0; i < lisArr.length; i++){
-        lisStr += `<div class="lisItem"><span class="circle"></span>${lisArr[i]}</div>`
-       }
-       for(let i = 0; i < pacsArr.length; i++){
-        pacsStr += `<div  class="lisItem"><span class="circle"></span>${pacsArr[i]}</div>`
-       }
-       if(item.history === 1){
-        historyStr+=`<div class="infoBox historyBox" >
+function renderDetail(data) {
+    let historyStr = ``
+    let laterStr = ``
+    for (let i = 0; i < data.length; i++) {
+        const item = data[i]
+        const lisArr = item.lis || []
+        const pacsArr = item.pacs || []
+        let lisStr = ``
+        let pacsStr = ``
+        let title = `<p class="infoBoxTitle">${getTime(item.examineDate)}${item.description ? '(' + item.description + ')' : ''} <img class="toggleInfo" src="${showImg}"/></p>`
+        for (let i = 0; i < lisArr.length; i++) {
+            lisStr += `<div class="lisItem"><span class="circle"></span>${lisArr[i]}</div>`
+        }
+        for (let i = 0; i < pacsArr.length; i++) {
+            pacsStr += `<div  class="lisItem"><span class="circle"></span>${pacsArr[i]}</div>`
+        }
+        if (item.history === 1) {
+            historyStr += `<div class="infoBox historyBox" >
             ${title}
             <div class="childrenBox">
-                ${lisArr.length>0?`<div class="lisBox"><span class="itemBoxTitle">检验</span>${lisStr}</div>`:""}
-                ${pacsArr.length>0?`<div class="pacsBox"><span class="itemBoxTitle">检查</span>${pacsStr}</div>`:""}
+                ${lisArr.length > 0 ? `<div class="lisBox"><span class="itemBoxTitle">检验</span>${lisStr}</div>` : ""}
+                ${pacsArr.length > 0 ? `<div class="pacsBox"><span class="itemBoxTitle">检查</span>${pacsStr}</div>` : ""}
             </div>
         </div>`
-       }else{
-        laterStr += `<div class="infoBox">
+        } else {
+            laterStr += `<div class="infoBox">
             ${title}
             <div class="childrenBox">
-                ${lisArr.length>0?`<div class="lisBox"><span class="itemBoxTitle">检验</span>${lisStr}</div>`:""}
-                ${pacsArr.length>0?`<div class="pacsBox"><span class="itemBoxTitle">检查</span>${pacsStr}</div>`:""}
+                ${lisArr.length > 0 ? `<div class="lisBox"><span class="itemBoxTitle">检验</span>${lisStr}</div>` : ""}
+                ${pacsArr.length > 0 ? `<div class="pacsBox"><span class="itemBoxTitle">检查</span>${pacsStr}</div>` : ""}
             </div>
         </div>`
-       }
-      
-   }
-   $(".followUpWrap").append(`<div class="infoWrap" id="infoWrap">
+        }
+
+    }
+    $(".followUpWrap").append(`<div class="infoWrap" id="infoWrap">
         <div class="historyWrap">${historyStr}</div>
         <div class="laterWrap">${laterStr}</div>
     </div>`)
     // adjustHeight()
     bindToggleInfo()
-  
+
 }
 function renderBtn(data){
     const hasBtn = data[0]&&data[0].history&&data[0].history === 1
-    if(!hasBtn){
+    /*if(!hasBtn){
         return
-    }
+    }*/
     const str = `<div class="btnBox" id="btnBox"><span class="btnName">显示历史计划</span></div>`
     $(".followUpWrap").append(str)
     bindToggleHistory()
-  
+
 }
 function adjustHeight() {
     var containerHt = $(".contentWrapper").height()
     var ht1 = $(".operaNameWrap").height()
     var ht2 = $(".btnBox").height()
-    $(".followUpWrap  .infoWrap").height(containerHt -ht1- ht2-30 + "px");
+    $(".followUpWrap  .infoWrap").height(containerHt -ht1- ht2 + "px");
     $(".infoWrap").preventScroll();  
 }
-function getTime(time){
-    if(!time){
+function getTime(time) {
+    if (!time) {
         return ``
     }
-    date = time.replace('-','/')
+    date = time.replace('-', '/')
     const year = new Date(date).getFullYear()
-    const month = new Date(date).getMonth()+1
+    const month = new Date(date).getMonth() + 1
     const day = new Date(date).getDate()
     return `${year}年${month}月${day}日`
 }
@@ -156,12 +169,12 @@ function checkDom() {
     let dom2 = document.getElementById('btnBox')
     let dom3 = document.getElementById('infoWrap')
     let dom2Hei = $("#btnBox").height()
-    if(dom1Hei!==0&&(dom2&&dom2Hei!=0 || !dom2)&&dom3) {
-         //  执行dom加载完成后的操作
-    
-         adjustHeight()
+    if (dom1Hei !== 0 && (dom2 && dom2Hei != 0 || !dom2) && dom3) {
+        //  执行dom加载完成后的操作
+
+        adjustHeight()
         //  清除定时器
-        if(!cheakDomTimer) {
+        if (!cheakDomTimer) {
             clearTimeout(cheakDomTimer)
         }
     } else {
@@ -169,19 +182,19 @@ function checkDom() {
         cheakDomTimer = setTimeout(checkDom, 200)
     }
 }
-function bindToggleHistory(){
-    $(document).on("click",".btnName",function(){
+function bindToggleHistory() {
+    $(document).on("click", ".btnName", function () {
         const btnText = $(".btnName").text()
-        if(btnText==="显示历史计划"){
+        if (btnText === "显示历史计划") {
             $(".btnName").text("隐藏历史计划")
-        }else{
+        } else {
             $(".btnName").text("显示历史计划")
         }
         $(".historyWrap").slideToggle()
     })
 }
 function bindToggleInfo(){
-    $(document).on("click",".infoBoxTitle",function(){
+    $(document).off("click").on("click",".infoBoxTitle",function(){
         const img =  $(this).parents(".infoBox").find(".toggleInfo").attr("src")
         if(img === showImg){
             $(this).parents(".infoBox").find(".toggleInfo").attr("src",collapseImg)
@@ -191,22 +204,22 @@ function bindToggleInfo(){
         $(this).parents(".infoBox").find(".childrenBox").slideToggle()
     })
 }
-function followEmpty(){
+function followEmpty() {
     let str = `<div class="emptyBox">
         <img class="emptyImg" src=${emptyImg}>
-        <p class="emptyTxt">暂无随访计划</p>
+        <p class="emptyTxt">暂无随访计划～</p>
     </div>`
     $(".followUpWrap").append(str)
 }
 
-$(window).on('resize', function(){
-    if(window.location.href.indexOf('cdssHorizontal')>-1){
+$(window).on('resize', function () {
+    if (window.location.href.indexOf('cdssHorizontal') > -1) {
         return
     }
     adjustHeight()
 })
 
-module.exports ={
+module.exports = {
     renderFollowUp,
     followEmpty
 }

src/js/promise.js

@@ -19,8 +19,13 @@ let iconDiagPush2 = require('./../images/icon_diag_push2.png').replace(/^undefin
 let iconCommonTreatPush = require('./../images/icon_drug_push.png').replace(/^undefined/g, '')
 let iconCheckupPush = require('./../images/icon_checkup_push.png').replace(/^undefined/g, '')
 let iconTreat = require('./../images/zhiliao.png').replace(/^undefined/g, '')
+let writingNorms = require('./../images/writingNorms.png').replace(/^undefined/g, '')
+
 let iconTreatMedicine = require('./../images/treat_icon.png').replace(/^undefined/g, '')
 let iconCaseWrite = require('./../images/icon_case_write.png').replace(/^undefined/g, '')
+let intelligentDiagnosis = require('./../images/intelligentDiagnosis.png').replace(/^undefined/g, '')
+
+
 
 
 //重写assign方法imgR
@@ -191,65 +196,69 @@ const throttle = function (fn, threshhold) {
     }
   }
 }
-
+const colorMap={
+  warnColor:'#FF7836', //智能警示等tab颜色
+  suggerColor:'#E3F0FF', //推荐提示tab颜色
+  treatColor:'#E3FEFE',  //治疗等tab颜色
+}
 const titleConfig = {
   warning:{
-    background: "#FFE8DD",
+    background: colorMap.warnColor,
     icon: iconWarning1,
     name:"智能警示"
   },
   symptomPush:{
-    background: "#EEF5FD",
+    background: colorMap.suggerColor,
     icon: iconSymptomPush,
     name:"推荐症状"
   },
   diagPush:{
-    background: "#EEF5FD",
+    background: colorMap.suggerColor,
     icon: iconDiagPush2,
     name:"智能诊断"
   },
   checkupPush:{
-    background: "#EEF5FD",
+    background: colorMap.suggerColor,
     icon: iconCheckupPush,
     name:"推荐体格检查"
   },
   scalePush:{
-    background: "#EEF5FD",
+    background: colorMap.suggerColor,
     icon: iconScalePush,
     name:"推荐量表"
   },
   lisPush:{
-    background: "#ECF4FC",
+    background: colorMap.suggerColor,
     icon: iconLisPush,
     name:"推荐检验"
   },
   pacsPush:{
-    background: "#ECF4FC",
+    background: colorMap.suggerColor,
     icon: iconPacsPush,
     name:"推荐检查"
   },
   drugPush:{
-    background: "#E3FEFE",
+    background: colorMap.treatColor,
     icon: iconDrugPush,
     name:"推荐用药"
   },
-    nursePush: {
-        background: "#E3FEFE",
-        icon: iconNursePush,
-        name: "推荐护理"
-    },
+  nursePush: {
+    background: colorMap.treatColor,
+    icon: iconNursePush,
+    name: "推荐护理"
+  },
   operationPush:{
-    background: "#E3FEFE",
+    background: colorMap.treatColor,
     icon: iconOperationPush,
     name:"推荐手术及操作"
   },
   generaTreatPush:{
-    background: "#E3FEFE",
+    background: colorMap.treatColor,
     icon: iconTreat,
     name:"一般治疗"
   },
   casewritingPush:{
-    background: "#FFE8DD",
+    background: colorMap.warnColor,
     icon: iconCaseWrite,
     name:"病历书写规范提示"
   }
@@ -258,67 +267,67 @@ const titleConfigH = {
   warning:{
     background: "#FFE8DD",
     icon: iconWarning1,
-    name:"智能警示",
+    name:"智能警示：",
     location:"left"
   },
   symptomPush:{
     background: "#EEF5FD",
     icon: iconSymptomPush,
-    name:"推荐症状",
+    name:"推荐症状：",
     location:"left"
   },
   diagPush:{
     background: "#FAECED",
-    icon: iconDiagPush,
-    name:"智能诊断",
+    icon: intelligentDiagnosis,
+    name:"智能诊断：",
     location:"left"
   },
   checkupPush:{
     background: "#EEF5FD",
     icon: iconCheckupPush,
-    name:"体格检查",
+    name:"体格检查：",
     location:"left"
   },
   scalePush:{
     background: "#EEF5FD",
     icon: iconScalePush,
-    name:"推荐量表",
+    name:"推荐量表：",
     location:"left"
   },
   lisPush:{
     background: "#ECF4FC",
     icon: iconLisPush,
-    name:"推荐检验",
+    name:"推荐检验：",
     location:"left"
   },
   pacsPush:{
     background: "#ECF4FC",
     icon: iconPacsPush,
-    name:"推荐检查",
+    name:"推荐检查：",
     location:"left"
   },
   generaTreatPush:{
     background: "#E3FEFE",
     icon: iconTreat,
-    name:"一般治疗",
+    name:"一般治疗：",
     location:"right"
   },
   drugPush:{
     background: "#E3FEFE",
     icon: iconDrugPush,
-    name:"推荐用药",
+    name:"推荐用药：",
     location:"right"
   },
   operationPush:{
     background: "#E3FEFE",
     icon: iconOperationPush,
-    name:"手术/操作",
+    name:"手术/操作：",
     location:"right"
   },
     nursePush: {
         background: "#E3FEFE",
         icon: iconNursePush,
-        name: "推荐护理",
+        name: "推荐护理：",
         location: "right"
     },
   vigilancePush:{
@@ -333,9 +342,9 @@ const titleConfigH = {
     name:"治疗方案"
   },
   casewritingPush:{
-    background: "#E3FEFE",
-    icon: iconTreat,
-    name:"病历书写规范提示",
+    background: "#FFE8DD",
+    icon: writingNorms,
+    name:"病历书写规范提示：",
     location:"left"
   }
 }

src/js/staticInfoOut.js

@@ -16,8 +16,6 @@ const {
   openNewWin
 } = require('./promise.js');
 const $ = require("jquery");
-require("./jquery-migrate");
-const jqprint = require("../js/jquery.PrintArea")
 let printing = require('./../images/printing.png');
 let printing2 = require('./../images/printing2.png');
 let showName,noticeName,clinicalPathwayName,showLis=[],selectedDrop=0,selectedTab=0

src/js/staticSearch.js

@@ -1,10 +1,11 @@
-require('./../css/staticSearch.css');
+require('../css/staticSearch.less');
 require('./../images/del_nor.png')
 var $ = require("jquery");
 var { post,config,getUrlArgObject,openNewWin,isIe8 } = require('./promise.js');
 let checkOffImg = require('./../images/check_off.png')
 let checkOnImg = require('./../images/check_on.png')
 require('./../images/empty3.png').replace( /undefined/g, '')
+require('./../images/icon_search.png').replace( /undefined/g, '')
 
 let searchType = getUrlArgObject("searchType") || ""
 
@@ -124,7 +125,7 @@ function getKnowledgeData(value) {
                 for(var i = 0;i<knowledgeLis.length;i++){
                     var tmpPart = knowledgeLis[i]
                     var tmpLi = `<li data-name='${tmpPart.name}' data-uname='${tmpPart.uniqueName}' data-type='${tmpPart.libTypeId}' data-sign='${tmpPart.type}'>
-                        <p>${tmpPart.name}<i>${tmpPart.typeName?('( '+tmpPart.typeName+' )'):''}</i> <span>${tmpPart.code||''}</span></p>
+                        <p>${tmpPart.name}<i>${tmpPart.typeName?(' ( '+tmpPart.typeName+' )'):''}</i> <span>${tmpPart.code||''}</span></p>
                         ${tmpPart.retrievalName?('<span>• '+tmpPart.retrievalName+'</span>'):''}
                     </li>`
                     lisStr += tmpLi

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>';
       }

webpack.config.js

@@ -266,7 +266,7 @@ module.exports = {
             except: ['e']
           },
           output: {
-              beautify: true
+            beautify: true
           },
           sourceMap: false
         }
@@ -285,13 +285,13 @@ module.exports = {
       }
     }
   },
-      
+
   module: {
     rules: [
       {
-          test: /.js$/,
-          enforce: 'post', 
-          loader: 'es3ify-loader'
+        test: /.js$/,
+        enforce: 'post',
+        loader: 'es3ify-loader'
       },
       {
         test: /\.m?js$/,
@@ -299,26 +299,27 @@ module.exports = {
         use: {
           loader: 'babel-loader',
           options: {
-            presets:['@babel/preset-env']
+            presets: ['@babel/preset-env']
           }
         }
       },
       {
         test: /\.css$/,
         use: [{
-            loader: MiniCssExtractPlugin.loader
-          },
+          loader: MiniCssExtractPlugin.loader
+        },
           'css-loader'
         ]
       },
       {
         test: /\.less$/,
-        use : [
+        use: [
           MiniCssExtractPlugin.loader,
           { loader: "css-loader" },
           { loader: "less-loader" }
-      ]},
-      { 
+        ]
+      },
+      {
         test: /\.(png|jpg|jpeg|gif|svg)$/,
         use: {
           loader: 'file-loader',
@@ -336,7 +337,8 @@ module.exports = {
   devServer: {
     contentBase: "./dist", //静态文件根目录
     proxy: {
-      '*': proxyHost
+      '/sys': proxyHost,
+      '/lantone': "http://114.55.109.16:81"
     },
     hot: true,
     // openPage:'index.html?age=28&tipsName=血常规&tipsType=12&diseaseId=280&lisJson=&diagJson=急性胰腺炎&diseaseName=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常,%20报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg&hospitalCode=A001',