Merge branch 'referMasterNew' into his/yiwufubao

# Conflicts:
#	src/js/promise.js

src/css/cdss.less

@@ -5,41 +5,40 @@ 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;
+  text-indent: -40px;
 }
 .disclaimer {
     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;
@@ -53,13 +52,10 @@ body{
             // background-size: 27px;
         }
     }
-    .version-txt,.disclaimerInfoTxt{
+    .version-txt i,.disclaimerInfoTxt{
         font-size: 12px;
         color: #777;
-    }
-    .version-txt:hover{
-        border-bottom: 1px solid #000;
-        font-size: 12px;
+        border-bottom: 1px solid #777;
     }
     .logo {
         // float: left;
@@ -70,7 +66,7 @@ body{
     .disclaimerInfo {
         float: right;
         font-size: 12px;
-        margin-right: 20px;
+        margin-right: 60px;
     }
 }
 
@@ -109,40 +105,29 @@ body{
     background: #D1D1D1;
 }
 
-
-.empty{
+.empty-box{
     position: relative;
-    top: 100px;
+    top: 172px;
+    display: none;
+}
+.empty{
+  display: block;
 }
 .emptyImg{
-    width: 120px;
+    width: 185px;
     position: relative;
     left: 50%;
-    margin-left: -60px;
-}
-.emptyImgSearch{
-    width: 100px;
+    margin-left: -93px;
+    &.small{
+      width: 90px;
+      margin-left: -45px;
+    }
 }
 .emptyTxt{
     text-align: center;
-    color: #AAA;
+    color: #999;
     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;
-//     }  
-// }
+}
 .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{
@@ -243,129 +213,164 @@ body{
 }
 .pushItemBox{
     position: relative;
-    display: inline-block;
-    padding-right: 18px;
+    /*display: inline-block;*/
+}
+.warning .pushItemName .item-name{
+  opacity: .8;
+  filter:alpha(opacity=80);
 }
 .pushItemName{
     position: relative;
     display: inline-block;
-   
+    line-height: 21px;
+    padding-right: 3px;
+    &:hover{
+      .infoImg+.hidden-i{
+        display: none;
+      }
+      .infoImg{
+        display: inline;
+      }
+    }
 }
-.infoImg{
-    width: 15px;
-    position: absolute;
-    top: 2px;
+.infoImg,.hidden-i{
+    width: 12px;
+    /*position: absolute;
+    top: 5px;
+    right: 3px;*/
     cursor: pointer;
     display: none;
-    right: 2px;
+    vertical-align: middle;
 }
-.pushItemBox:hover{
-    .infoImg{
-        display: block;
-    }
+.hidden-i{
+  display: inline-block;
+  width: 12px;
 }
 .showMore,.showLess{
     display: inline-block;
     cursor: pointer;
-    float: right;
     color: #3B9ED0;
+    position: absolute;
+    right: 14px;
+    bottom: 5px;
 }
 .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;
+  .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 6px 14px;
+  border-left:4px solid @suggerColor;
 }
 .iconMark{
-    width: 4px;
+    width: 17px;
     position: absolute;
-    left: 20px;
-    top: 3px;
+    left: 10px;
+    top: 2px;
 }
 .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;
-    }
+    position: relative;
+    border-radius: 8px;
+    box-shadow: 0px 5px 5px 0px @shadowColor;
+    margin-bottom: 10px;
+    padding-bottom: 10px;
+  .longBox,.shortBox{
+    padding: 4px 14px;
+    position: relative;   /****bug8454***/
+  }
 }
 .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: 17px;
+    height: 17px;
+    background: url("../images/tip-bg.png") no-repeat;
+    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{
-    background: #FF8042;
+.moduleItem.warning{
+    background: @dangerColor;
     color: #fff;
     padding: 10px 40px;
+    box-shadow: 0 2px 4px 0 #F9BC9F;
 }
 .warningTitImg{
     width: 20px;
@@ -376,25 +381,24 @@ body{
 .warningTitle{
     position: relative;
     margin-right: 15px;
+  font-weight: bold;
 }
 .medicalKonwledgeWrap{
-    padding: 0 30px;
-}
-.titleIcon{
-    width: 20px;
+
 }
 .newIcon{
     width: 27px;
     position: relative;
     top: 2px;
-    display: none;
+    left: 15px;
+    visibility: hidden;
 }
 .new-icon .newIcon{
-    display: inline-block;
+    visibility: visible;
 }
 
 .generalTreatInfo{
-    padding: 0px 10px 0 10px;
+    padding: 0px 24px 0 10px;
     box-sizing: border-box;
     position: relative;
     margin-top: 4px;
@@ -426,7 +430,8 @@ body{
     right: 10px;
     bottom: -1px;
     background: #fff;
-    width: 44px;
+    width: 10px;
+    height: 10px;
     box-sizing: border-box;
     img.more {
         position: absolute;
@@ -440,9 +445,20 @@ body{
     float: right;
     color: #3B9ED0;
 }
-.shortStrBox,.longStrBox{
-    position: relative;
-    padding: 4px 0;
+.tips-cont{
+  border-radius: 8px;
+  box-shadow: 0px 5px 5px 0px @shadowColor;
+  border-bottom: 1px #D8D8D8 solid \9;
+  .moduleBoxTitle{
+    border-color: #FF8042;
+  }
+  .moduleItem{
+    box-shadow: none;
+    border-bottom:1px #E6E6E6 dashed;
+    &:last-child{
+      border-bottom: none;
+    }
+  }
 }
 .longStrBox{
     display: none;
@@ -466,19 +482,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;
@@ -487,9 +508,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,19 +538,28 @@ body{
   }
   .detail {
     margin: 0 10px;
-    border-top: 1px #E6E6E6 solid;
+    border-top: 1px #E6E6E6 dashed;
     padding-top: 5px;
     /*max-height: 134px;*/
     overflow-y: hidden;
     li {
-      margin: 0 0 6px 10px;
+      margin: 0 34px 6px 10px;
     }
     .label {
       float: left;
-      border-left: 2px solid #267FD7;
+      border-left: 4px solid #267FD7;
       padding-left: 5px;
-      line-height: 12px;
-      margin-top: 4px;
+      line-height: 14px;
+      margin-top: 3px;
+      color: #333;
+    }
+    .go {
+      float: right;
+      margin: -25px 0px 10px 0;
+      font-size: 14px;
+      color: @linkColor;
+      text-decoration: none;
+      cursor: pointer;
     }
     .val {
       margin-left: 65px;
@@ -562,8 +591,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;
@@ -573,4 +602,13 @@ body{
       text-decoration: none;
     }
   }
+}
+.evaluation{
+  .evaluationtitle{
+    color: @linkColor;
+    cursor: pointer;
+  }
+  .infoImg,.hidden-i{
+    margin-left: -10px;
+  }
 }

src/css/cdssPlan.less

@@ -1,26 +1,38 @@
 @import './common.less';
 body{
-    overflow: hidden;
     position: relative;
     background: #fff;
 }
-.bodyWrap{
+/*.bodyWrap{
     position: fixed;
     width: 100%;
     height: 100%;
+}*/
+.followUpWrap{
+    margin: 0 84px;
+    .btnBox{
+        background: #fff;
+    }
 }
 .operaNameBox {
     padding: 5px 14px;
 }
+.operaNameWrap{
+    position: fixed;
+    /*width: calc(100% - 168px);*/
+    z-index: 1;
+}
+.infoWrap{
+    padding-top: 84px;
+    overflow-y: hidden;
+}
 .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;
 }
 .responsibility {
@@ -118,19 +130,15 @@ body{
     top: 100px;
 }
 .emptyImg{
-    width: 120px;
     position: relative;
     left: 50%;
     margin-left: -60px;
 }
-.emptyImgSearch{
-    width: 100px;
-}
 .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:#FF8042;   //错误提示颜色
+@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;
@@ -60,6 +91,7 @@
     height: 100%;
     background: #000;
     opacity: .3;
+    filter:Alpha(opacity=30);
     z-index: 999;
   }
   .inner-box {
@@ -104,3 +136,81 @@
     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;
+  }
+
+}
+/* chrome & safari 浏览器 */
+/*滚动条整体部分,必须要设置*/
+/*滚动条的上下两端的按钮*/
+// .right_content::-webkit-scrollbar-button,
+// ul::-webkit-scrollbar-button {
+//   height: 0;
+//   background-color: #fff;
+// }
+::-webkit-scrollbar{
+  /*滚动条整体样式*/
+  width: 8px;
+  /*高宽分别对应横竖滚动条的尺寸*/
+  height: 8px;
+  background: #fff;
+  -webkit-box-shadow: inset 1px 0 1px rgba(0, 0, 0, 0.2);
+}
+
+::-webkit-scrollbar-thumb{
+  /*滚动条里面小方块*/
+  width: 8px;
+  height: 8px;
+  border-radius: 5px;
+  background: @bgcBlue;
+}
+
+::-webkit-scrollbar-track{
+  /*滚动条里面轨道*/
+  border-radius: 5px;
+  background: #fff;
+  opacity: .2;
+}

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,66 +46,67 @@
     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: 162px;
     text-align: center;
 }
+.bodyWrapHorizontal .followUpWrap .emptyBox{
+    margin-top: 16px;
+}
 .followUpWrap .emptyImg{
-    width: 110px;
     position: relative; 
     left: 0; 
     margin-left: 0;
-}
-.followUpWrap .emptyTxt{
-    color: #AAAAAA;
-    font-size: 12px;
 }

src/css/icssIndex.less

@@ -1,536 +0,0 @@
-@import './common.less';
-
-.iframeWrap {
-    margin: 10px auto 50px;
-    padding: 0 20px 20px 20px;
-    min-width: 340px;
-    overflow-y: auto;
-}
-
-.recommendInfoWrapper {
-    border: 1px solid #F2F2F2;
-    margin-bottom: 5px;
-
-    h4 {
-        color: #000;
-        // height: 24px;
-        line-height: 24px;
-        background-color: #FAEBEC;
-        font-size: 16px;
-        font-weight: bold;
-    }
-}
-
-.recommendInfoWrapper h4 i {
-    content: '';
-    width: 18px;
-    height: 18px;
-    float: left;
-    position: relative;
-    top: 3px;
-    margin: 0 12px;
-}
-
-.symptomRecommend,
-.physiExamRecommend,
-.labAndPacsRecommend {
-    h4 {
-        background-color: #ECF4FC;
-    }
-}
-
-.treatRecommend,.knowledgeInfo,.scaleInfo {
-    h4 {
-        background-color: #E3FEFE;
-    }
-}
-.tipsInfo {
-    h4 {
-        background-color: #E3FEFE;
-    }
-}
-
-
-.conditTips {
-    h4 {
-        background-color: #FDF4EE;
-    }
-}
-.warning{
-    background-color: #FF8D54;
-    font-size: 14px;
-    h4 {
-        background-color: #FF8D54;
-        font-size: 14px;
-        color: #fff;
-        line-height: 30px;
-        display: inline-block;
-        margin: 0 20px 0 0;
-        i{
-            margin: 0 12px 0 0;
-        }
-    }
-    .recommendInfoBox{
-        display: inline-block;
-    }
-    .recommendInfoItem{
-        display: inline-block;
-        float: none;
-        color: #fff;
-    }
-}
-
-.recommendInfoBox {
-    padding: 4px 17px;
-}
-
-.treatRecommend h4 i,.knowledgeInfo h4 i,.scaleInfo h4 i {
-    background: url(/images/zhiliao.png) center center no-repeat;
-}
-.tipsInfo h4 i {
-    background: url(/images/zhiliao.png) center center no-repeat;
-}
-
-.conditTips h4 i {
-    background: url(/images/tips.png) center center no-repeat;
-}
-
-.symptomRecommend h4 i {
-    background: url(/images/inquire.png) center center no-repeat;
-}
-
-.physiExamRecommend h4 i {
-    background: url(/images/tgjc.png) center center no-repeat;
-}
-
-.labAndPacsRecommend h4 i {
-    background: url(/images/inspect.png) center center no-repeat;
-}
-
-.warning h4 i {
-    background: url(/images/warings.png) center center no-repeat;
-}
-
-.diagRecommend h4 i {
-    background: url(/images/yszd.png) center center no-repeat;
-}
-
-.recommendInfoItem {
-    padding-right: 15px;
-    float: left;
-    line-height: 21px;
-    position: relative;
-}
-
-.infoMsg,
-.infoMsgOn {
-    position: absolute;
-    top: 4px;
-    right: 0;
-}
-
-.infoMsg,
-.infoMsgOn {
-    display: none;
-    cursor: pointer;
-}
-
-.recommendInfoItemHasInfo:hover,
-.diagNameBox:hover,
-.durgNameBox:hover {
-    color: #267FD7;
-
-    .infoMsg {
-        display: inline-block;
-        width: 14px;
-        height: 14px;
-        background: url(/images/msg1.png) center center no-repeat;
-    }
-
-    .infoMsg:hover {
-        background: url(/images/msg2.png) center center no-repeat;
-    }
-}
-
-// .diagNameBox:hover {
-//     color: #267FD7;
-//     .infoMsg {
-//         display: inline-block;
-//         width: 16px;
-//         height: 16px;
-//         background: url(/images/msg1.png) center center no-repeat;
-//     }
-//     .infoMsg:hover {
-//         background: url(/images/msg2.png) center center no-repeat;
-//     }
-// }
-.diagNameBox,
-.durgNameBox {
-    position: relative;
-    padding-right: 15px;
-    display: inline-block;
-    .infoMsg, .infoMsgOn {
-        top: 6px;
-    }
-}
-.durgName, .diagName{
-    border-bottom: 1px solid #1E1E1E;
-}
-.sriticalinfo {
-    height:30px;
-    background:#F5F5F5;
-    line-height: 30px;
-    margin: 10px 0;
-}
-.recommendInfoBox p {
-    line-height: 21px;
-}
-
-.commonTreatmentbox {
-    padding-bottom: 10px;
-    border-bottom: 1px solid #D1D1D1;
-}
-
-.drugTreatmentbox {
-    padding-top: 10px;
-}
-
-.illnessTable {
-    color: #267FD7;
-    line-height: 21px;
-    cursor: pointer;
-}
-
-.labAndPacsBox {
-    position: relative;
-    line-height: 21px;
-}
-
-.alertModal {
-    position: relative;
-
-    .mayResult {
-        color: #838383;
-        position: relative;
-    }
-
-    .mayResultSelect {
-        line-height: 21px;
-
-        .makesureResult {
-            cursor: pointer;
-            color: @colorBlue;
-        }
-
-        .sanjiao {
-            width: 18px;
-            height: 18px;
-            display: inline-block;
-            position: relative;
-            top: 3px;
-            background: url('../images/select.png') center center no-repeat;
-        }
-    }
-}
-
-.recommendInfoItemBox {
-    position: relative;
-}
-
-.recommendInfoItemBoxLimit {
-    height: 21px;
-    overflow: hidden;
-    position: relative;
-}
-
-.commonTreatmentInfoLimit {
-    height: 75px;
-    overflow: hidden;
-    position: relative;
-}
-
-.slideDown {
-    background-color: #fff;
-    position: absolute;
-    bottom: 0px;
-    right: 0px;
-    color: @colorBlue;
-    height: 21px;
-    line-height: 21px;
-    box-shadow: -2px 0px 15px 0px #fff;
-    cursor: pointer;
-
-    i {
-        width: 10px;
-        height: 7px;
-        display: inline-block;
-        position: relative;
-        // top: -2px;
-        background: url('../images/down.png') center center no-repeat;
-    }
-}
-
-.slideup {
-    background-color: #fff;
-    position: relative;
-    float: right;
-    bottom: 0px;
-    right: 0px;
-    color: @colorBlue;
-    cursor: pointer;
-    height: 21px;
-    line-height: 21px;
-    box-shadow: -2px 0px 15px 0px #fff;
-
-    i {
-        width: 10px;
-        height: 7px;
-        display: inline-block;
-        position: relative;
-        // top: -2px;
-        background: url('../images/up.png') center center no-repeat;
-    }
-}
-
-.responsibility {
-    text-align: center;
-    font-size: 12px;
-    color: #979797;
-    padding-top: 15px;
-    position: fixed;
-    width: 100%;
-    bottom: 30px;
-    background-color: #fff;
-}
-.disclaimer {
-    height: 26px;
-    width: 100%;
-    line-height: 26px;
-    position: fixed;
-    bottom: 0;
-    background-color: #fff;
-    left: 0;
-    z-index: 98;
-    .version-tip{
-        margin-left: 20px;
-        font-size: 12px;
-        padding-right: 34px;
-        cursor: pointer;
-        &.new-icon{
-            background: url(../images/new.png) 100% 0px no-repeat;
-        }
-    }
-    .logo {
-        // float: left;
-        font-size: 12px;
-        margin-left: 15px;
-    }
-    .disclaimerInfo {
-        float: right;
-        font-size: 12px;
-        margin-right: 15px;
-    }
-}
-
-.labAndPacsTitle {
-    border-right: 2px solid #ADADAD;
-    padding-right:5px; 
-    margin-right: 5px;
-}
-.labAndPacsItem {
-    display: inline-block;
-    padding-right: 15px;
-}
-
-.recommendNull,.TipsInfoNull {
-    color: #ADADAD;
-}
-.treatItemTitle {
-    font-weight: bold;
-    padding-bottom: 5px;
-}
-.disclaimerInfo {
-    cursor: pointer;
-}
-.moreInfo {
-    display: inline-block;
-    width:42px;
-    height:20px;
-    border-radius:4px;
-    border:1px solid #267FD7;
-    line-height:20px;
-    color: #267FD7;
-    text-align: center;
-    margin-left: 20px;
-    cursor: pointer;
-}
-.durgNameBox {
-    .medicineWaring {
-        background-color: #f4c051;
-        color: #000;
-        font-size: 12px;
-        border-radius: 4px;
-        border: 1px solid #fff;
-        line-height: 18px;
-      }
-      .medicineWaringDisMsg {
-        background-color: #fff;
-        color: @grayColor;
-        font-size: 12px;
-        border-radius: 4px;
-        line-height: 18px;
-        border: 1px solid @grayColor;
-      }
-      .medicineWaringDisMsg {
-        color: @grayColor;
-      }
-}
-.medicineWaringDis {
-    color: @grayColor;
-    .durgName{
-        border-bottom: 1px solid @grayColor;
-    }
-  }
-.medicineWaringDis:hover {
-    color: @grayColor;
-}
-
-.staticWin {
-    color: #040428;
-    text-decoration: underline;
-    cursor: pointer;
-}
-.line {
-    width: 100%;
-    height: 1px;
-    background: #D1D1D1;
-}
-.diagTitle {
-    color: #3b9ed0;
-    position: relative;
-    margin: 0 0 10px;
-    font-weight: 500;
-    i {
-        position: relative;
-        display: inline-block;
-        width: 4px;
-        height: 4px;
-        background: #3b9ed0;
-        border-radius: 50%;
-        top: -4px;
-        margin-right: 6px;
-    }
-}
-.diagDescription{
-    color: #333;
-    font-weight: 600;
-    margin: 5px 0 10px;
-}
-.treatItemTitle {
-    position: relative;
-    .slideDown {
-        font-weight: normal;
-        bottom: 5px;
-    }
-}
-.empty{
-    position: relative;
-    top: 200px;
-}
-.emptyImg{
-    width: 100px;
-    position: relative;
-    left: 50%;
-    margin-left: -50px;
-}
-.emptyTxt{
-    text-align: center;
-    color: #AAA;
-    font-size: 12px;
-}
-.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;
-    }  
-}
-.loading{
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    left: 0;
-    top: 0;
-    z-index: 100;
-    display: none;
-}
-.loadingMask{
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    background-color: #fff;
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=50);";
-}
-.loadingImg{
-    width: 40px;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    margin: -20px 0 0 -20px;
-}
-.emergency {
-    position: fixed;
-    right: 20px;
-    top: 0;
-    .disPub {
-        width: 40px;
-        height: 40px;
-        line-height: 40px;
-        position: absolute;
-        left: 0;
-        text-align: center;
-        border-radius: 50%;
-        color: #fff;
-        background-color: #f93333;
-    }
-    .singleDis {
-        left: -25px;
-        display: none;
-    }
-    .allDis {
-        display: none;
-        z-index: 10;
-        moz-user-select: -moz-none;
-        -moz-user-select: none;
-        -o-user-select: none;
-        -webkit-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-        position: fixed;
-        top: 0;
-        right: 5px;
-        width: auto;
-        height: 40px;
-        line-height: 40px;
-        border-radius: 22px;
-        border: 2px solid #f93333;
-        background-color: #fff;
-        padding-left: 50px;
-        padding-right: 30px;
-        cursor: pointer;
-        .right {
-            position: absolute;
-            right: 5px;
-            top: 9px;
-        }
-    }
-}

src/css/index.css

@@ -1,314 +0,0 @@
-.iframeWrap {
-  margin: 10px auto 50px;
-  padding: 20px;
-  min-width: 340px;
-}
-.iframeWrap .conditionHintPub {
-  border: 1px solid #F2F2F2;
-  margin-bottom: 15px;
-}
-.iframeWrap .conditionHintPub li {
-  padding-right: 18px;
-  float: left;
-  line-height: 25px;
-}
-.iframeWrap .conditionHintPub .conditionMain {
-  padding: 17px;
-}
-.iframeWrap .conditionHintPub .alertModal {
-  position: relative;
-}
-.iframeWrap .conditionHintPub .alertModal .mayResult {
-  color: #838383;
-  position: relative;
-}
-.iframeWrap .conditionHintPub .alertModal .mayResultSelect {
-  line-height: 28px;
-}
-.iframeWrap .conditionHintPub .alertModal .mayResultSelect .makesureResult {
-  cursor: pointer;
-  color: #267FD7;
-}
-.iframeWrap .conditionHintPub .alertModal .mayResultSelect .sanjiao {
-  width: 18px;
-  height: 18px;
-  display: inline-block;
-  position: relative;
-  top: 3px;
-  background: url('../images/select.png') center center no-repeat;
-}
-.iframeWrap .conditionHintPub .treatPlan {
-  font-weight: bold;
-  padding-bottom: 5px;
-}
-.iframeWrap .conditionHintPub .treatPlanWrap {
-  padding-bottom: 10px;
-  border-bottom: 1px solid #D1D1D1;
-}
-.iframeWrap .conditionHintPub .treatMedicine {
-  padding-top: 10px;
-}
-.iframeWrap .conditionHintPub .treatMedicine .medicinePart {
-  margin: 8px 0;
-  position: relative;
-}
-.iframeWrap .conditionHintPub .treatMedicine .medicine {
-  border-bottom: 1px solid #D1D1D1;
-  position: relative;
-}
-.iframeWrap .conditionHintPub .treatMedicine .medicine:hover {
-  color: #267FD7;
-}
-.iframeWrap .conditionHintPub .treatMedicine .medicine:hover a {
-  display: inline-block;
-  right: -20px;
-  background-color: #fff;
-}
-.iframeWrap .conditionHintPub .treatMedicine .medicineDis {
-  color: #D1D1D1;
-  border-bottom: 1px solid #D1D1D1;
-}
-.iframeWrap .conditionHintPub .treatMedicine .medicineWaring {
-  background-color: #f4c051;
-  color: #000;
-  font-size: 12px;
-  border-radius: 4px;
-  border: 1px solid #fff;
-  line-height: 18px;
-}
-.iframeWrap .conditionHintPub .treatMedicine .medicineWaringDis {
-  background-color: #fff;
-  color: #D1D1D1;
-  font-size: 12px;
-  border-radius: 4px;
-  line-height: 18px;
-  border: 1px solid #D1D1D1;
-}
-.iframeWrap .conditionHintPub .treatMedicine .medicineWaringDisMsg {
-  color: #D1D1D1;
-}
-.iframeWrap .conditionHintPub p {
-  line-height: 24px;
-}
-.iframeWrap .conditionHintPub p span {
-  display: inline-block;
-}
-.iframeWrap .conditionHintWz h4 {
-  background-color: #ECF4FC;
-}
-.iframeWrap .conditionHintWz h4 i {
-  background: url("../images/inquire.png") center center no-repeat;
-}
-.iframeWrap .conditionHintTg h4 {
-  background-color: #ECF4FC;
-}
-.iframeWrap .conditionHintTg h4 i {
-  background: url("../images/tgjc.png") center center no-repeat;
-}
-.iframeWrap .conditionHintInspect h4 {
-  background-color: #ECF4FC;
-}
-.iframeWrap .conditionHintInspect h4 i {
-  background: url("../images/inspect.png") center center no-repeat;
-}
-.iframeWrap .conditionHintMay h4 {
-  background-color: #FAEBEC;
-}
-.iframeWrap .conditionHintMay h4 i {
-  background: url("../images/yszd.png") center center no-repeat;
-}
-.iframeWrap .conditionHintWarings {
-  display: none;
-}
-.iframeWrap .conditionHintWarings h4 {
-  color: #FF545B;
-}
-.iframeWrap .conditionHintWarings h4 i {
-  background: url("../images/warings.png") center center no-repeat;
-}
-.iframeWrap .conditionHintWarings li {
-  float: left;
-  line-height: 24px;
-}
-.iframeWrap .conditionHintWarings li:hover {
-  color: #267FD7;
-}
-.iframeWrap .conditionHintKnzd {
-  display: none;
-}
-.iframeWrap .conditionHintKnzd h4 i {
-  background: url("../images/knzd.png") center center no-repeat;
-}
-.iframeWrap .conditionHintKnzd ul li {
-  float: left;
-  line-height: 24px;
-}
-.iframeWrap .conditionHintKnzd ul li:hover {
-  color: #267FD7;
-}
-.iframeWrap .conditionHintZhiliao h4 {
-  background-color: #E3FEFE;
-}
-.iframeWrap .conditionHintZhiliao h4 i {
-  background: url("../images/zhiliao.png") center center no-repeat;
-}
-.iframeWrap .conditionHintTips .mayIllness {
-  padding-bottom: 5px;
-}
-.iframeWrap .conditionHintTips .mayIllness span {
-  position: relative;
-  border-bottom: 1px solid #D1D1D1;
-}
-.iframeWrap .conditionHintTips .mayIllness span .infoMsg {
-  position: relative;
-  border-bottom: 0;
-  float: right;
-}
-.iframeWrap .conditionHintTips .mayIllness span:hover .infoMsg {
-  display: inline-block;
-}
-.iframeWrap .conditionHintTips .mayIllness a {
-  border-bottom: 1px solid #D1D1D1;
-}
-.iframeWrap .conditionHintTips h4 {
-  background-color: #FDF4EE;
-}
-.iframeWrap .conditionHintTips h4 i {
-  background: url("../images/tips.png") center center no-repeat;
-}
-.iframeWrap .illnessTable {
-  color: #267FD7;
-  line-height: 28px;
-  cursor: pointer;
-}
-.iframeWrap h4 {
-  color: #000;
-  height: 40px;
-  line-height: 40px;
-  background-color: #FAEBEC;
-  font-size: 16px;
-  font-weight: bold;
-}
-.iframeWrap h4 i {
-  content: '';
-  width: 40px;
-  height: 40px;
-  float: left;
-}
-.commonTreat,
-.conditionHintKnzdLis,
-.conditionHintWaringsLis,
-.conditionHintWzLis,
-.conditionHintTgLis,
-.conditionHintInspectLis,
-.conditionHintAssistLis {
-  position: relative;
-}
-.conditionHintInspectNull {
-  border-bottom: 1px solid #D1D1D1;
-  padding-bottom: 5px;
-  margin-bottom: 5px;
-}
-.conditionHintZhiliaoNull {
-  display: none;
-}
-.conditionHintAssistLis,
-.conditionHintInspectLis {
-  padding: 5px 0;
-}
-.conditionHintAssistLis .slideDown,
-.conditionHintInspectLis .slideDown {
-  padding: 5px 0 5px 0px;
-}
-.conditionHintAssistLis li:first-child,
-.conditionHintInspectLis li:first-child {
-  padding-right: 5px;
-}
-.pushEmpty {
-  color: #ADADAD;
-}
-.medicinePartLimitHeight {
-  height: 25px;
-  overflow: hidden;
-  position: relative;
-}
-.medicinePartLimitHeightSpec {
-  height: 75px;
-  overflow: hidden;
-  position: relative;
-}
-.slideDown {
-  background-color: #fff;
-  position: absolute;
-  bottom: 0px;
-  right: 0px;
-  color: #267FD7;
-  height: 25px;
-  line-height: 25px;
-  box-shadow: -2px 0px 15px 0px #fff;
-  cursor: pointer;
-}
-.slideDown i {
-  width: 10px;
-  height: 7px;
-  display: inline-block;
-  position: relative;
-  top: -2px;
-  background: url('../images/down.png') center center no-repeat;
-}
-.slideup {
-  background-color: #fff;
-  position: relative;
-  float: right;
-  bottom: 0px;
-  right: 0px;
-  color: #267FD7;
-  cursor: pointer;
-}
-.slideup i {
-  width: 10px;
-  height: 7px;
-  display: inline-block;
-  position: relative;
-  top: -2px;
-  background: url('../images/up.png') center center no-repeat;
-}
-.disclaimer {
-  height: 40px;
-  width: 100%;
-  line-height: 40px;
-  text-align: center;
-  position: fixed;
-  bottom: 0;
-  background-color: #ececec;
-  left: 0;
-  z-index: 98;
-}
-.disclaimer a {
-  display: block;
-}
-.infoMsg {
-  width: 20px;
-  height: 20px;
-  position: absolute;
-  top: 2px;
-  right: 0px;
-  display: none;
-  cursor: pointer;
-  background: url('../images/msg1.png') center center no-repeat;
-}
-.infoMsg:hover {
-  background: url('../images/msg2.png') center center no-repeat;
-}
-.infoMsgParent {
-  position: relative;
-}
-.infoMsgParent:hover .infoMsg {
-  display: block;
-}
-.responsibility {
-  text-align: center;
-  font-size: 12px;
-  color: #979797;
-  padding-top: 15px;
-}

src/css/index.less

@@ -1,2 +0,0 @@
-@import './common.less';
-

src/css/indexHorizontal.less

@@ -1,443 +0,0 @@
-@import './common.less';
- .push .recommendInfoWrapper {
-    line-height: 25px;
-    h4 {
-        float: left;
-    }
-    .showTopTitle {
-        float: none;
-    }
-}
-
-.recommendInfoBox  {
-    margin-left: 100px;
-    position: relative;
-}
-.showTopInfo{
-    margin-left: 100px;
-}
-.topSmallTitle {
-    position: absolute;
-    left: -60px;
-}
-.recommendWrap {
-    height: 250px;
-}
-.labAndPacsWrapper{
-    line-height: 25px;
-}
-.labAndPacsItemBox {
-    float: left;
-}
-.push {
-    margin-top: 10px;
-    width: 52%;
-    float: left;
-    position: relative;
-    padding-right: 2%;
-    border-right: 1px solid #f0efef;
-    box-sizing: border-box;
-}
-.infomationBox {
-    margin-top: 10px;
-    width: 38%;
-    float: left;
-    position: relative;
-    margin-left: 2%;
-}
-.disclaimer {
-    width: 5%;
-    min-width: 40px;
-    float: left;
-    color: #9C9C9C;
-    text-align: center;
-    border-right: 1px solid #f4f3f3;
-    box-sizing: border-box;
-    display: table;
-    p{
-        width:14px;
-        display: table-cell;
-        word-break: break-all;
-        vertical-align: middle;
-        font-size: 12px;
-    }
-    .version{
-        font-size: 12px;
-        line-height: 15px;
-        span{
-            color: #267FD7;
-            line-height: 14px;
-        }
-        &.new-icon i{
-            display: inline-block;
-            width: 100%;
-            height: 26px;
-            background: url("../images/newv.png") -3px -4px no-repeat;
-        }
-    }
-}
-
-.warning, .diagRecommend {
-    h4 {
-        color: #FF545B;
-    }
-}
-.symptomRecommend, .physiExamRecommend, .labAndPacsRecommend {
-    h4 {
-        color: #157FD5;
-    }
-}
-.conditTips {
-    h4 {
-        color: #E66225;
-    }
-}
-.treatRecommend  {
-    h4 {
-        color: #1AB3A9;
-    }
-}
-.treatRecommend  {
-    position: relative;
-}
-.icon{
-    display: block;
-    width: 20px;
-    float: left;
-    position: relative;
-    top: 3px;
-}
-.labAndPacsBox, .treatItemBox {
-    position: relative;
-}
-.itemAllBox {
-    background: #fff;
-    border: 1px solid #3A73E1;
-    border-radius: 4px;
-    box-sizing: border-box;
-}
-.slideDown {
-    background-color: #fff;
-    position: absolute;
-    bottom: 0px;
-    right: 0px;
-    height: 20px;
-    line-height: 20px;
-    box-shadow: -2px 0px 15px 0px #fff;
-    cursor: pointer;
-
-    img {
-        display: inline-block;
-        position: relative;
-        top: 0px;
-    }
-}
-
-.slideup {
-    position: absolute;
-    float: right;
-    top: 0px;
-    right: 0px;
-    cursor: pointer;
-    line-height: 20px;
-    box-shadow: -2px 0px 15px 0px #fff;
-    img {
-        display: inline-block;
-        position: relative;
-        top: 0px;
-    }
-}
-.itemAllBox{
-    position: absolute;
-    width: 96%;
-    height: auto;
-    max-height: 230px;
-    display: none;
-    background: #fff;
-    z-index: 2;
-    left: 0;
-    top: 0;
-}
-.ellipse{
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-.conditTipsbox .conditionMain {
-    height: 25px;
-    .mayIllness{
-        float: left;
-        position: relative;
-        top: -2px;
-    }
-}
-.recommendInfoItem,.diagNameBox {
-    .infoMsg,
-    .infoMsgOn {
-        top: 2px;
-    }
-}
-.infoMsg,
-.infoMsgOn {
-    top: 2px;
-}
-.infoMsg,
-.infoMsgOn {
-    position: relative;
-    right: 0px;
-    display: none;
-    cursor: pointer;
-}
-.durgNameBox {
-    position: relative;
-    padding-right: 15px;
-    display: inline-block;
-}
-.recommendInfoItemHasInfo:hover,
-.diagNameBox:hover,
-.durgNameBox:hover {
-    color: #267FD7;
-    padding-right: 0;
-    .infoMsg {
-        display: inline-block;
-        width: 14px;
-        height: 14px;
-        background: url(/images/msg1.png) center center no-repeat;
-    }
-
-    .infoMsg:hover {
-        background: url(/images/msg2.png) center center no-repeat;
-    }
-}
-
-.diagNameBox {
-    position: relative;
-    padding-right: 15px;
-}
- .more {
-    display: inline-block;
-    background-color: #fff;
-    position: absolute;
-    right: 0px;
-    color: #267FD7;
-    height: 20px;
-    line-height: 24px;
-    box-shadow: -2px 0px 15px 0px #fff;
-    cursor: pointer;
-}
-.conditTipsbox .more {
-    top: 0px;
-}
-.push .conditTips {
-    height: 100%;
-    max-height: 40px;
-}
-.diagName {
-    color: #040428;
-}
-.treatItemTitle, .tipsTitle {
-    // font-weight: bold;
-    font-size: 14px;
-    color: #000000;
-    float: left;
-    width: 60px;
-    height: 20px;
-    line-height: 20px;
-    float: left;
-}
-.tipsTitle {
-    margin-top: 10px;
-}
-.infomationBox .recommendInfoBox {
-    margin-left: 0px;
-}
-.infomationBox .treatTextBox {
-    margin-left: 80px;
-    line-height: 20px;
-    max-height: 60px;
-    overflow:hidden;
-    // text-overflow:ellipsis; 
-    // display: -webkit-box;
-    // -webkit-box-orient: vertical;
-    // -webkit-line-clamp: 3;
-}
-.infomationBox .treatDrugBox {
-    margin-left: 80px;
-    line-height: 20px;
-    max-height: 120px;
-    overflow: hidden;
-}
-.tipsInfoBox {
-    margin: 10px 0 0 0px;
-    line-height: 20px;
-    height: 211px; 
-    overflow-y: auto;
-    img {
-        display: none;
-    }
-}
-.diagName {
-    height: 30px;
-    line-height: 30px;
-}
-.drugTreatmentInfoItemBox {
-    .ellipse;
-    height: 20px;
-}
-.infomationBox .treatRecommend {
-    margin-top: 10px;
-}
-.labAndPacsRecommend  .labAndPacsTitle {
-    padding: 0 5px; 
-    margin-right: 5px;
-    background: #e2eaf2;
-    border-radius: 4px;
-    height: 22px;
-    line-height: 22px;
-    top: 1px;
-}
-.pacsRecommendwrapper {
-    // margin-top: 10px;
-}
-.labAndPacsItem {
-    display: inline-block;
-    padding-right: 15px;
-}
-
-.treatItemBox .more{
-    bottom: 0;
-    height: 20px;
-    line-height: 20px;
-}
-.itemAllBox h4{
-    float: left;
-    margin-right: 10px;
-}
-.recommendInfoItem {
-    position: relative;
-    display: inline-block;
-}
-.itemAll{
-    max-height: 230px;
-    overflow-y: auto;
-    margin-right: 20px;
-}
-.recommendInfoItem {
-    position: relative;
-    padding-right: 18px;
-}
-.recommendNull {
-    color: #ADADAD;
-}
-.disclaimer, .illnessTable {
-    cursor: pointer;
-}
-.illnessTable {
-    color: #267FD7;
-
-}
-.tipsInfoWrapper  {
-    position: relative;
-    margin: 10px 0 0 0;
-}
-.infoTab {
-    margin-right: 15px;
-    cursor: pointer;
-}
-.activeTab {
-    color: #267FD7;
-    border-bottom: 2px solid #267FD7;
-}
-.moreInfo {
-    display: inline-block;
-    width:42px;
-    height:20px;
-    border-radius:4px;
-    border:1px solid #267FD7;
-    line-height:20px;
-    color: #267FD7;
-    text-align: center;
-    margin-left: 20px;
-    cursor: pointer;
-}
-.durgNameBox {
-    .medicineWaring {
-        background-color: #f4c051;
-        color: #000;
-        font-size: 12px;
-        border-radius: 4px;
-        border: 1px solid #fff;
-        line-height: 18px;
-      }
-      .medicineWaringDisMsg {
-        background-color: #fff;
-        color: @grayColor;
-        font-size: 12px;
-        border-radius: 4px;
-        line-height: 18px;
-        border: 1px solid @grayColor;
-      }
-      .medicineWaringDisMsg {
-        color: @grayColor;
-      }
-}
-.medicineWaringDis {
-    color: @grayColor;
-  }
-.medicineWaringDis:hover {
-color: @grayColor;
-}
-
-.staticWin {
-    text-decoration: underline;
-    cursor: pointer;
-    position: relative;
-    margin: 10px 0 0 0;
-}
-.tipsInfoItem{
-    position: relative;
-    // max-height: 60px;
-    overflow: hidden;
-}
-.hasMore:after{
-    content: "..."; 
-    position: absolute; 
-    bottom: 0; 
-    right: 0; 
-    padding-left: 20px;
-    background: -webkit-linear-gradient(left, transparent, #fff 55%);
-    background: -moz-linear-gradient(left, transparent, #fff 55%);
-    background: -o-linear-gradient(left, transparent, #fff 55%);
-    background: linear-gradient(to right, transparent, #fff 55%);
-}
-.boldFont {
-    font-weight: bold;
-}
-.diagTitle {
-    color: #3b9ed0;
-    position: relative;
-    margin: 0 0 10px;
-    font-weight: 500;
-    i {
-        position: relative;
-        display: inline-block;
-        width: 4px;
-        height: 4px;
-        background: #3b9ed0;
-        border-radius: 50%;
-        top: -4px;
-        margin-right: 6px;
-    }
-}
-.diagDescription{
-    color: #333;
-    font-weight: 600;
-    margin: 5px 0 10px;
-}
-.treatItemTitle {
-    .more {
-        background: #fff;
-        top: 0;
-        z-index: 2;
-    }
-}

src/css/indexVert.less

@@ -1,410 +0,0 @@
-@import './common.less';
-
-.iframeWrap {
-    margin: 10px auto 50px;
-    padding: 20px;
-    min-width: 340px;
-}
-
-.recommendInfoWrapper {
-    border: 1px solid #F2F2F2;
-    margin-bottom: 15px;
-
-    h4 {
-        color: #000;
-        height: 40px;
-        line-height: 40px;
-        background-color: #FAEBEC;
-        font-size: 16px;
-        font-weight: bold;
-    }
-}
-
-.recommendInfoWrapper h4 i {
-    content: '';
-    width: 40px;
-    height: 40px;
-    float: left;
-}
-
-.symptomRecommend,
-.physiExamRecommend,
-.labAndPacsRecommend {
-    h4 {
-        background-color: #ECF4FC;
-    }
-}
-
-.treatRecommend,.knowledgeInfo,.scaleInfo {
-    h4 {
-        background-color: #E3FEFE;
-    }
-}
-.tipsInfo {
-    h4 {
-        background-color: #E3FEFE;
-    }
-}
-
-
-.conditTips {
-    h4 {
-        background-color: #FDF4EE;
-    }
-}
-
-.recommendInfoBox {
-    padding: 4px 17px;
-}
-
-.treatRecommend h4 i,.knowledgeInfo h4 i,.scaleInfo h4 i {
-    background: url(/images/zhiliao.png) center center no-repeat;
-}
-.tipsInfo h4 i {
-    background: url(/images/zhiliao.png) center center no-repeat;
-}
-
-.conditTips h4 i {
-    background: url(/images/tips.png) center center no-repeat;
-}
-
-.symptomRecommend h4 i {
-    background: url(/images/inquire.png) center center no-repeat;
-}
-
-.physiExamRecommend h4 i {
-    background: url(/images/tgjc.png) center center no-repeat;
-}
-
-.labAndPacsRecommend h4 i {
-    background: url(/images/inspect.png) center center no-repeat;
-}
-
-.warning h4 i {
-    background: url(/images/warings.png) center center no-repeat;
-}
-
-.diagRecommend h4 i {
-    background: url(/images/yszd.png) center center no-repeat;
-}
-
-.recommendInfoItem {
-    padding-right: 15px;
-    float: left;
-    line-height: 25px;
-    position: relative;
-}
-
-.infoMsg,
-.infoMsgOn {
-    position: absolute;
-    top: 6px;
-    right: 0;
-}
-
-.infoMsg,
-.infoMsgOn {
-    display: none;
-    cursor: pointer;
-}
-
-.recommendInfoItemHasInfo:hover,
-.diagNameBox:hover,
-.durgNameBox:hover {
-    color: #267FD7;
-
-    .infoMsg {
-        display: inline-block;
-        width: 14px;
-        height: 14px;
-        background: url(/images/msg1.png) center center no-repeat;
-    }
-
-    .infoMsg:hover {
-        background: url(/images/msg2.png) center center no-repeat;
-    }
-}
-
-// .diagNameBox:hover {
-//     color: #267FD7;
-//     .infoMsg {
-//         display: inline-block;
-//         width: 16px;
-//         height: 16px;
-//         background: url(/images/msg1.png) center center no-repeat;
-//     }
-//     .infoMsg:hover {
-//         background: url(/images/msg2.png) center center no-repeat;
-//     }
-// }
-.diagNameBox,
-.durgNameBox {
-    position: relative;
-    padding-right: 15px;
-    display: inline-block;
-    .infoMsg, .infoMsgOn {
-        top: 6px;
-    }
-}
-.durgName, .diagName{
-    border-bottom: 1px solid #1E1E1E;
-}
-.sriticalinfo {
-    height:30px;
-    background:#F5F5F5;
-    line-height: 30px;
-    margin: 10px 0;
-}
-.recommendInfoBox p {
-    line-height: 25px;
-}
-
-.commonTreatmentbox {
-    padding-bottom: 10px;
-    border-bottom: 1px solid #D1D1D1;
-}
-
-.drugTreatmentbox {
-    padding-top: 10px;
-}
-
-.illnessTable {
-    color: #267FD7;
-    line-height: 28px;
-    cursor: pointer;
-}
-
-.labAndPacsBox {
-    position: relative;
-    line-height: 25px;
-}
-
-.alertModal {
-    position: relative;
-
-    .mayResult {
-        color: #838383;
-        position: relative;
-    }
-
-    .mayResultSelect {
-        line-height: 28px;
-
-        .makesureResult {
-            cursor: pointer;
-            color: @colorBlue;
-        }
-
-        .sanjiao {
-            width: 18px;
-            height: 18px;
-            display: inline-block;
-            position: relative;
-            top: 3px;
-            background: url('../images/select.png') center center no-repeat;
-        }
-    }
-}
-
-.recommendInfoItemBox {
-    position: relative;
-}
-
-.recommendInfoItemBoxLimit {
-    height: 25px;
-    overflow: hidden;
-    position: relative;
-}
-
-.commonTreatmentInfoLimit {
-    height: 75px;
-    overflow: hidden;
-    position: relative;
-}
-
-.slideDown {
-    background-color: #fff;
-    position: absolute;
-    bottom: 0px;
-    right: 0px;
-    color: @colorBlue;
-    height: 25px;
-    line-height: 25px;
-    box-shadow: -2px 0px 15px 0px #fff;
-    cursor: pointer;
-
-    i {
-        width: 10px;
-        height: 7px;
-        display: inline-block;
-        position: relative;
-        top: -2px;
-        background: url('../images/down.png') center center no-repeat;
-    }
-}
-
-.slideup {
-    background-color: #fff;
-    position: relative;
-    float: right;
-    bottom: 0px;
-    right: 0px;
-    color: @colorBlue;
-    cursor: pointer;
-    height: 25px;
-    line-height: 25px;
-    box-shadow: -2px 0px 15px 0px #fff;
-
-    i {
-        width: 10px;
-        height: 7px;
-        display: inline-block;
-        position: relative;
-        top: -2px;
-        background: url('../images/up.png') center center no-repeat;
-    }
-}
-
-.responsibility {
-    font-size: 12px;
-    color: #979797;
-    padding: 10px 0;
-    position: fixed;
-    bottom: 22px;
-    background: #fff;
-    z-index: 99;
-}
-.disclaimer {
-    padding:10px 0;
-    width: 100%;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    z-index: 98;
-    font-size: 12px;
-    height: 14px;
-    background: #fff;
-    .version-tip{
-        margin-left: 20px;
-        font-size: 12px;
-        a{
-            font-size: 12px;
-            text-decoration: none;
-        }
-        &.new-icon{
-            background: url(../images/new.png) 100% 0px no-repeat;
-        }
-    }
-    .logo {
-        font-size: 12px;
-        margin-left: 8px;
-        color: #797979;
-    }
-    .disclaimerInfo {
-        float: right;
-        font-size: 12px;
-        margin-right: 20px;
-    }
-}
-
-.labAndPacsTitle {
-    border-right: 2px solid #ADADAD;
-    padding-right:5px; 
-    margin-right: 5px;
-}
-.labAndPacsItem {
-    display: inline-block;
-    padding-right: 15px;
-}
-
-.recommendNull,.TipsInfoNull {
-    color: #ADADAD;
-}
-.treatItemTitle {
-    font-weight: bold;
-    padding-bottom: 5px;
-}
-.disclaimerInfo {
-    cursor: pointer;
-}
-.moreInfo {
-    display: inline-block;
-    width:42px;
-    height:20px;
-    border-radius:4px;
-    border:1px solid #267FD7;
-    line-height:20px;
-    color: #267FD7;
-    text-align: center;
-    margin-left: 20px;
-    cursor: pointer;
-}
-.durgNameBox {
-    .medicineWaring {
-        background-color: #f4c051;
-        color: #000;
-        font-size: 12px;
-        border-radius: 4px;
-        border: 1px solid #fff;
-        line-height: 18px;
-      }
-      .medicineWaringDisMsg {
-        background-color: #fff;
-        color: @grayColor;
-        font-size: 12px;
-        border-radius: 4px;
-        line-height: 18px;
-        border: 1px solid @grayColor;
-      }
-      .medicineWaringDisMsg {
-        color: @grayColor;
-      }
-}
-.medicineWaringDis {
-    color: @grayColor;
-    .durgName{
-        border-bottom: 1px solid @grayColor;
-    }
-  }
-.medicineWaringDis:hover {
-    color: @grayColor;
-}
-
-.staticWin {
-    color: #040428;
-    text-decoration: underline;
-    cursor: pointer;
-}
-.line {
-    width: 100%;
-    height: 1px;
-    background: #D1D1D1;
-}
-.diagTitle {
-    color: #3b9ed0;
-    position: relative;
-    margin: 0 0 10px;
-    font-weight: 500;
-    i {
-        position: relative;
-        display: inline-block;
-        width: 4px;
-        height: 4px;
-        background: #3b9ed0;
-        border-radius: 50%;
-        top: -4px;
-        margin-right: 6px;
-    }
-}
-.diagDescription{
-    color: #333;
-    font-weight: 600;
-    margin: 5px 0 10px;
-}
-.treatItemTitle {
-    position: relative;
-    .slideDown {
-        font-weight: normal;
-        bottom: 5px;
-    }
-}

src/css/information.less

@@ -191,7 +191,7 @@
     border-radius: 0;
     border: none;
     background-color: #F5F6F7;
-    background: url('../images/icon_current.png') center center no-repeat;
+    background: url('../images/icon_current.png') centercenterno-repeat;
   }
 
   a:visited {

src/css/informationOut.css

@@ -0,0 +1,101 @@
+
+@media print {
+  body{
+    background: #ffffff;
+    overflow-y: hidden;
+  }
+  #Print{
+    overflow-y: hidden;
+    background: #fff;
+  }
+
+  .scaletitle{
+    display: block;
+  }
+  .info_left{
+    width: 527px;
+    margin:30px auto;
+    display: block;
+    overflow: hidden;
+    border:1px solid #D8D8D8;
+  }
+  .contentList{
+    max-width: 100%;
+    border-bottom: 1PX solid #F3F3F3;
+    margin-bottom: 6px;
+  }
+  .item-list{
+    padding: 0 21px;
+  }
+  .item-title,.item-titles{
+    font-size: 14px;
+    font-weight: 400;
+    color: #333333;
+    line-height: 20px;
+    margin-top: 14px;
+  }
+  .item-content{
+    margin: 10px 0;
+    display: flex;
+    flex-flow: wrap;
+  }
+  .radio {
+    display: flex;
+    margin: 5px;
+    margin-right: 25px;
+  } 
+  label{
+    font-weight: 400;
+    color: #666666;
+    line-height: 20px;
+  }
+  label> input{
+    margin-right: 6px;
+  }
+  .num{
+    margin-left: 10px;
+  }
+  .recommend{
+    width: 18px;
+    height: 18px;
+  }
+  .result{
+    background: #EDFAFF;
+    border-radius: 10px;
+    font-size: 14px;
+    font-weight: 500;
+    color: #333333;
+    display: none;
+    margin: 0;
+    text-align: center;
+  }
+  .result_box{
+    margin:0;
+    display: inline-block;
+  }
+  .result_left{
+    display: flex;
+  }
+  .result_left>span{
+    display: block;
+    width: 250px;
+  }
+  .hel{
+    width: 21px;
+    height: 21px;
+    background: #2C96E5;
+    border-radius: 50%;
+    color: #fff;
+    font-size: 12px;
+    vertical-align: middle;
+    margin-right: 9px;
+    float: left;
+    display: none;
+  }
+  .name,.card{
+    border-top: none;
+  }
+  .name,.age,.sex,.cards{
+    border-left: none;
+  }
+}

src/css/informationOut.less

@@ -1,19 +1,19 @@
-* {
-    margin: 0;
-    padding: 0;
-  }
-
+@import './common.less';
   ul,
   li {
     list-style: none;
   }
 
+div,li,span,i,p,h1,h2,h3,h4,h5,pre{
+  font-family: '微软雅黑', '宋体';
+}
   table {
     border-collapse: collapse;
     border-spacing: 0;
   }
 
   body {
+    /*min-width: 650px;*/
     font-size: 14px;
     overflow-y: hidden;
     font-family: '微软雅黑', '宋体';
@@ -24,18 +24,21 @@
   }
 
   h1 {
-    margin: 0 0px 5px 0px !important;
+    margin: 0 0px 15px 0px !important;
     font-size: 18px !important;
     /*line-height: 37px;*/
     padding: 0 0 0 40px;
   }
 
   .titleH2 {
-    font-size: 16px;
+    font-size: 18px;
     position: relative;
+    line-height: 17px;
     background: #fff;
     padding-right: 6px;
-    /*line-height: 30px;*/
+    padding-left: 15px;
+    font-weight: bold;
+    border-left: 4px solid @staticMainColor;
   }
 
   .content {
@@ -43,9 +46,11 @@
     height: 550px;
   }
   .infoBox {
-    border-left: 1px solid #969C9F;
-    padding: 0 0 0 33px;
-    margin: 0 0 4px 0;
+    .contentWrapper{
+      pre{
+        margin: 0 0 6px;
+      }
+    }
   }
   .infoWrapper {
     padding: 0 0 0 40px;
@@ -72,13 +77,22 @@
   .infos {
     height: 100%;
     overflow-y: auto;
-    padding: 0 60px 0 0;
+    overflow-x:hidden
+    /*padding: 0 60px 0 0;
+    width: calc(100% - 195px);*/
   }
 
   .infos>div {
-    margin-right: 160px;
+    margin-right: 6.5%;
+    .contentWrapper img{
+      max-width: 100%;
+    }
   }
 
+.infoBox {
+  border-bottom: 1px #E6E6E6 solid;
+  margin-bottom: 10px;
+}
   .title {
     position: relative;
     line-height: 24px;
@@ -118,84 +132,115 @@
         }
     }
   }
-  .anchors {
-    width: 200px;
-    position: absolute;
-    right:15px;
-    top: 0;
-    margin-right: 14px;
-    overflow: auto;
-    height: 100%;
-  }
-
-  .anchors ul {
-    padding: 15px 0px 15px 20px;
-    border-radius: 4px;
-    border: 1px solid #F5F6F7;
-    background-color: #F5F6F7;
-    line-height: 19px;
-  }
-
-  .anchors li {
-    position: relative;
-    border-left: 2px solid #E0E2E3;
-  }
+.anchors {
+  width: 155px;
+  position: absolute;
+  right:15px;
+  top: 0;
+  margin-right: 14px;
+  overflow-y: auto;
+  background-color: #EDFAFF;
+  padding: 20px 0;
+  height: calc(100% - 50px);
+  overflow-x: hidden;
+}
 
-  .anchors .anchor-line {
-    height: 20px;
-    width: 0;
-    border-left: 2px solid #E0E2E3;
-  }
+.anchors ul {
+  margin-left: 21px;
+  padding: 15px 0px 15px 10px;
+  border-radius: 4px;
+  border: 1px solid #EDFAFF;
+  /*background-color: #EDFAFF;*/
+  line-height: 19px;
+}
 
-  .anchors .anchor-line:last-child {
-    display: none;
-  }
+.anchors li {
+  position: relative;
+  border-left: 1px solid #8DD1EE;
+}
+.anchors li:first-child {
+  padding-top:20px
+}
 
-  .anchors i {
-    position: absolute;
-    display: inline-block;
-    width: 8px;
-    height: 8px;
-    border-radius: 5px;
-    border: 1px solid #E0E2E3;
-    background-color: #E0E2E3;
-    left: -6px;
-    top: 5px;
-  }
+.anchors .anchor-line {
+  height: 20px;
+  width: 0;
+  border-left: 1px solid #8DD1EE;
+}
 
-  .anchors a {
-    display: inline-block;
-    position: relative;
-    top: 0;
-    left: 0;
-    width: 132px;
-    padding: 0 0px 0 20px;
-    text-decoration: none;
-    font-size: 14px;
-    font-weight: 400;
-    color: #777;
-    word-wrap: break-word;
-  }
+.anchors .a-circle{
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  top: 28px;
+  left: 27px;
+  z-index: 1;
+  background: url('../images/icon-circular2.png');
+  background-repeat: no-repeat;
+  background-position-x: center;
+  background-position-y: center;
+  background-size: 10px 10px;
+  background: none\9;
+  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/icon-circular2.png',sizingMethod='scale');
 
-  .anchors .active a {
-    color: #3B9ED0 !important;
-    font-weight: 700 !important;
-  }
+}
+.anchors .a-circle-2{
+  position: relative;
+  margin-top: -16px;
+  top: 0;
+}
+.anchors i {
+  position: absolute;
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  left: -6px;
+  top: 8px;
+  z-index: 1;
+  background: url('../images/icon-circular.png');
+  background-repeat: no-repeat;
+  background-position-x: center;
+  background-position-y: center;
+  background-size: 10px 10px;
+  background: none\9;
+  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/icon-circular.png',sizingMethod='scale');
+}
+.anchors li:first-child i{
+  top:29px;
+}
+.anchors a {
+  display: inline-block;
+  position: relative;
+  top: 4px;
+  left: 0;
+  width: 90px;
+  padding: 0 0px 0 20px;
+  text-decoration: none;
+  font-size: 14px;
+  font-weight: 400;
+  word-wrap: break-word;
+  color: #000;
+}
 
-  .anchors .active i {
-    width: 16px;
-    height: 16px;
-    top: 1px;
-    left: -8px;
-    border-radius: 0;
-    border: none;
-    background-color: #F5F6F7;
-    background: url('../images/icon_current.png') center center no-repeat;
-  }
+.anchors .active a {
+  /*color: #3B9ED0 !important;
+  font-weight: 700 !important;*/
+}
 
-  a:visited {
-    color: #777;
-  }
+.anchors .active i {
+  width: 18px;
+  height: 9px;
+  top: 10px;
+  left: -6px;
+  border: none;
+  background: url('../images/icon_current.png');
+  background-repeat: no-repeat;
+  background-position-x: center;
+  background-position-y: center;
+  background-size: 18px 9px;
+  background: none\9;
+  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/icon_current.png',sizingMethod='scale');
+}
   .disCopy {
     -webkit-touch-callout: none;
     -webkit-user-select: none;
@@ -207,43 +252,31 @@
   .tabBox{
     position: relative;
     background: #fff;
-    height: 38px;
-    border-bottom: 1px solid #E6E6E6;
-    padding: 0 40px;
+    padding: 0 40px 0;
   }
   .showWhich {
-    width: 94px;
+    width: 187px;
     text-align: center;
-    padding-top: 16px;
-    position: absolute;
-    z-index: 20;
-    bottom: -6px;
-    img {
-      width: 8px;
-      position: absolute;
-      top: 29px;
-      left: 76px;
-    }
+    padding: 20px 0 10px;
+    position: relative;
     .showWhichSelect {
-      border-radius: 4px 4px 0px 0px;;
-      background: #E2F1F8;
-      height: 30px;
-      line-height: 30px;
       display: inline-block;
+      color: @staticMainColor;
+      background: url("../images/d1.png") 200px 9px #EAFCFF no-repeat;
+      font-size: 16px;
+      padding:1px 24px 2px 10px;
       width: 100%;
-      padding-right: 20px;
-      padding-left: 10px;
-      box-sizing: border-box;
       cursor: pointer;
+      text-align: left;
     }
     ul {
       display: none;
       position: absolute;
-      left: -9px;
-      top: 48px;
+      left: 0;
+      top: 52px;
       z-index: 10;
       background-color: #fff;
-      width: 110px;
+      width: 220px;
       box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.18);
       border-radius: 4px;
       border: 1px solid #E6E6E6;
@@ -261,25 +294,35 @@
       }
     }
   }
-  .tabList{
-    position: absolute;
-    bottom: 0;
-    left: 186px;
-  }
-  .tab{
-    display: inline-block;
-    padding: 4px 18px 5px;
-    margin-right: 5px;
-    background: #EEEEEE;
-    border-radius:6px 6px 0px 0px;
-    cursor: pointer;
-    font-size: 14px;
-    color: #333;
-  }
-  .activeTab{
-    background: #3B9ED0;
-    color: #fff;
+  .titleCont{
+    background: #fff;
+    padding-left: 35px;
+    /*padding-bottom: 20px;*/
   }
+.titleCont .title{
+  font-size: 20px;
+  font-weight: bold;
+  margin-right: 33px;
+}
+.tabList{
+  display: inline-block;
+}
+.tab{
+  display: inline-block;
+  padding: 0 5px;
+  margin-right: 20px;
+  background: #fff;
+  border-radius:2px;
+  cursor: pointer;
+  font-size: 11px;
+  color: #2A9BD5;
+  border:1px #2A9BD5 solid;
+  vertical-align: text-bottom;
+}
+.activeTab{
+  background: #2A9BD5;
+  color: #fff;
+}
   .ql-align-right{
     text-align: right;
   }
@@ -294,7 +337,7 @@
 }
 .empty{
   text-align: center;
-  margin-top: 32vh;
+  padding-top: 32vh;
   img{
     width: 140px;
     height: 75px;
@@ -307,12 +350,234 @@
 }
 .open-win{
   position: absolute;
-  right: 15px;
-  bottom: 8px;
+  right: 38px;
+  bottom: 28px;
   cursor: pointer;
   color: #3B9ED0;
   font-size: 14px;
   padding-left: 30px;
-  background: url("../images/link.png") 0 -2px no-repeat;
-  background-size: 25px 25px;
+  background: url("../images/link.png") 4px 0 no-repeat;
+  background-size: 23px 23px;
+}
+.footer{
+  width: 100%;
+  height: 52px;
+  background: #172238;
+  padding-top: 8px;
+  position: absolute;
+  bottom: 0;
+  z-index: 1;
+  p{
+    color:#fff;
+    text-align: center;
+    font-size: 12px;
+    white-space: nowrap;
+  }
+}
+
+.scaletitle{
+  font-size: 20px;
+  font-weight: 500;
+  color: #333333;
+  line-height: 28px;
+  margin: 30px 0 8px 0;
+  text-align: center;
+  display: none;
+}
+.scaleBox{
+  border-bottom: none;
+}
+.contentList{
+  max-width: 100%;
+  border-bottom: 1PX solid #F3F3F3;
+  margin-bottom: 6px;
+  .item-list{
+    padding: 0 21px;
+    color: #666666;
+    .item-title,.item-titles{
+      font-size: 14px;
+      font-weight: 400;
+      color: #333333;
+      line-height: 20px;
+      margin-top: 14px;
+    }
+    .item-content{
+      margin: 10px 0;
+      display: flex;
+      flex-flow: wrap;
+      .radio {
+        display: flex;
+        margin: 5px;
+        margin-right: 25px;
+        label{
+          font-weight: 400;
+          color: #666666;
+          line-height: 20px;
+          & input{
+            margin-right: 6px;
+          }
+          .num{
+            margin-left: 10px;
+          }
+        }
+        .recommend{
+          width: 18px;
+          height: 18px;
+        }
+      } 
+    }
+  }
+}
+.scalebot{
+  margin-bottom: 44px;
+  text-align: right;
+  overflow: hidden;
+  .but{
+    width: 94px;
+    height: 34px;
+    background: #FFFFFF;
+    border-radius: 8px;
+    border: 1px solid #2A9BD5;
+    font-size: 16px;
+    font-weight: 400;
+    color: #2A9BD5;
+    margin-right: 9px;
+    float: right;
+  }
+  .score{
+    font-size: 16px;
+    font-weight: 400;
+    color: #333333;
+    margin-right: 30px;
+    display: none;
+    float: right;
+    line-height: 34px;
+  }
+}
+.result{
+  background: #EDFAFF;
+  border-radius: 10px;
+  font-size: 14px;
+  font-weight: 500;
+  color: #333333;
+  display: none;
+  margin: 0 75px;
+  text-align: center;
+  .result_box{
+    padding:25px 56px;
+    display: inline-block;
+    .result_left{
+      display: flex;
+      & span{
+        display: block;
+        width: 42px;
+      }
+      .hel{
+        width: 21px;
+        height: 21px;
+        background: #2C96E5;
+        border-radius: 50%;
+        color: #fff;
+        font-size: 12px;
+        vertical-align: middle;
+        margin-right: 9px;
+        float: left;
+      }
+      
+    }
+  }
+  
+}
+
+.foot{
+  margin-bottom: 20px;
+  margin-top: 40px;
+  display: none;
+  overflow: hidden;
+  .foot_box{
+    width: 300px;
+    margin: auto;
+    .printing{
+      float: left;
+      width: 94px;
+      height: 32px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      border: 1px solid #333333;
+      cursor: pointer;
+      line-height: 32px;
+      & img{
+        margin: 0 12px 0 14px;
+        vertical-align: middle;
+      }
+    }
+    .printing:hover{
+      background: #2C96E5;
+      color: #fff;
+      border:1px solid #2C96E5;
+    }
+    .copy{
+      width: 132px;
+      height: 32px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      float: left;
+      border: 1px solid #333333;
+      text-align: center;
+      line-height: 32px;
+      margin-left: 38px;
+      cursor: pointer;
+    }
+    .copy:hover{
+      background: #2C96E5;
+      color: #fff;
+      border:1px solid #2C96E5;
+    }
+  }
+  
+}
+#inputs{
+  position: absolute;top: 0;left: 0;opacity: 0;z-index: -10
+}
+#Print{
+  width: 100%!important;
+  overflow-x: hidden;
+}
+.scale{
+  .infos-box{
+    margin: 0 71px 20px 38px;
+    .infoWrapper {
+      padding: 0 75px;
+    }
+    .scalebot{
+      padding-right: 75px;
+    }
+  }
+}
+.chColor{
+  color: red!important;
+}
+.info_left {
+  width: 527px;
+  margin:30px auto;
+  display: none;
+  overflow: hidden;
+  border:1px solid #D8D8D8;
+  li {
+    width: 50%;
+    height: 30px;
+    padding: 0 10px;
+    box-sizing: border-box;
+    border: 1px solid #bbbfc1;
+    border-right: none;
+    font-size: 14px;
+    float: left;
+    border-bottom: none;
+  }
+  .name,.card{
+    border-top: none;
+  }
+  .name,.age,.sex,.cards{
+    border-left: none;
+  }
 }

src/css/page.css

@@ -1,9 +0,0 @@
-p {
-  color: blueviolet;
-}
-.iframeContainer {
-  width: 500px;
-  height: 800px;
-  margin: 0 auto;
-  border: 1px solid #ccc;
-}

src/css/print.css

@@ -0,0 +1,101 @@
+
+@media print {
+  body{
+    background: #ffffff;
+    overflow-y: hidden;
+  }
+  #Print{
+    overflow-y: hidden;
+    background: #fff;
+  }
+
+  .scaletitle{
+    display: block;
+  }
+  .info_left{
+    width: 527px;
+    margin:30px auto;
+    display: block;
+    overflow: hidden;
+    border:1px solid #D8D8D8;
+  }
+  .contentList{
+    max-width: 100%;
+    border-bottom: 1PX solid #F3F3F3;
+    margin-bottom: 6px;
+  }
+  .item-list{
+    padding: 0 21px;
+  }
+  .item-title,.item-titles{
+    font-size: 14px;
+    font-weight: 400;
+    color: #333333;
+    line-height: 20px;
+    margin-top: 14px;
+  }
+  .item-content{
+    margin: 10px 0;
+    display: flex;
+    flex-flow: wrap;
+  }
+  .radio {
+    display: flex;
+    margin: 5px;
+    margin-right: 25px;
+  } 
+  label{
+    font-weight: 400;
+    color: #666666;
+    line-height: 20px;
+  }
+  label> input{
+    margin-right: 6px;
+  }
+  .num{
+    margin-left: 10px;
+  }
+  .recommend{
+    width: 18px;
+    height: 18px;
+  }
+  .result{
+    background: #EDFAFF;
+    border-radius: 10px;
+    font-size: 14px;
+    font-weight: 500;
+    color: #333333;
+    display: none;
+    margin: 0;
+    text-align: center;
+  }
+  .result_box{
+    margin:0;
+    display: inline-block;
+  }
+  .result_left{
+    display: flex;
+  }
+  .result_left>span{
+    display: block;
+    width: 250px;
+  }
+  .hel{
+    width: 21px;
+    height: 21px;
+    background: #2C96E5;
+    border-radius: 50%;
+    color: #fff;
+    font-size: 12px;
+    vertical-align: middle;
+    margin-right: 9px;
+    float: left;
+    display: none;
+  }
+  .name,.card{
+    border-top: none;
+  }
+  .name,.age,.sex,.cards{
+    border-left: none;
+  }
+}

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/searchStaticList.less

@@ -43,6 +43,7 @@
     background-color: #fff;
     ul {
       text-align: left;
+      max-width: 750px;
     }
     li {
       float: left;

src/css/staticInfo.less

@@ -49,9 +49,10 @@
     background: #fff;
     padding-right: 6px;
     padding-left: 15px;
-    font-weight: bold;
+    font-weight: 600;
     border-left: 4px solid @staticMainColor;
     /*line-height: 30px;*/
+    color: #333333;
   }
 
   .content {
@@ -91,8 +92,7 @@
   .infos {
     height: 100%;
     overflow-y: auto;
-    /*padding: 0 60px 0 0;*/
-    width: calc(100% - 250px);
+    border-top: 1px solid #E6E6E6;
   }
 
   .infos>div {
@@ -106,7 +106,7 @@
     position: relative;
     line-height: 24px;
     
-    margin: 0 0 4px;
+    margin: 18px 0 4px;
   }
 
   .line {
@@ -150,7 +150,7 @@
     overflow-y: auto;
     background-color: #EDFAFF;
     padding: 25px 0;
-    height: calc(100% - 50px);
+    // height: calc(100% - 50px);
     overflow-x: hidden;
   }
 
@@ -178,18 +178,18 @@
   }
 
 .anchors .a-circle{
-  border:2px #8DD1EE solid;
   width: 16px;
   height: 16px;
-  background: #fff;
-  border-radius: 16px;
   position: absolute;
-  left: 41px;
+  left: 43px;
   z-index: 1;
+  background: url('../images/icon-circular2.png');
+  background-repeat: no-repeat;
+  background-position-x: center;
+  background-position-y: center;
 }
-.anchors .a-circle:last-child{
-  position: unset;
-  margin-left: 41px;
+.anchors .a-circle-2{
+  margin-left: 0;
   margin-top: -16px;
 }
   .anchors i {
@@ -197,15 +197,16 @@
     display: inline-block;
     width: 16px;
     height: 16px;
-    border-radius: 8px;
-    border: 1px solid @staticMainColor;
-    background-color: @staticMainColor;
-    left: -10px;
+    left: -9px;
     top: 5px;
     z-index: 1;
+    background: url('../images/icon-circular.png');
+    background-repeat: no-repeat;
+    background-position-x: center;
+    background-position-y: center;
   }
 .anchors li:first-child i{
-  top:35px;
+  top:37px;
 }
   .anchors a {
     display: inline-block;
@@ -218,6 +219,7 @@
     font-size: 16px;
     font-weight: 400;
     word-wrap: break-word;
+    color: #000;
   }
 
   .anchors .active a {
@@ -226,14 +228,17 @@
   }
 
   .anchors .active i {
-    width: 26px;
-    height: 16px;
+    width: 30px;
+    height: 15px;
     top: 6px;
-    left: -14px;
+    left: -15px;
     border-radius: 0;
     border: none;
     background-color: #F5F6F7;
-    background: url('../images/icon_current.svg') center center no-repeat;
+    background: url('../images/icon_current2.png');
+    background-repeat: no-repeat;
+    background-position-x: center;
+    background-position-y: center;
   }
   .disCopy {
     -webkit-touch-callout: none;
@@ -246,35 +251,36 @@
   .tabBox{
     position: relative;
     background: #fff;
-    height: 58px;
     padding: 0 38px;
     margin: 60px 20px 0;
+    overflow: hidden;
   }
 .tabBox .title{
+  display: block;
   font-size: 20px;
-  color: #333;
   font-weight: bold;
-  line-height: 58px;
-  margin-right: 23px;
+  color: rgba(0, 0, 0, 0.85);
+  line-height: 28px;
+  margin: 26px 0 14px 0;
 }
   .tabList{
     display: inline-block;
   }
   .tab{
     display: inline-block;
-    padding: 0 5px;
-    margin-right: 20px;
-    background: #fff;
-    border-radius:2px;
+    padding: 5px 14px;
+    margin-right: 5px;
+    background: #EEEEEE;
     cursor: pointer;
-    font-size: 11px;
-    color: @staticMainColor;
-    border:1px @staticMainColor solid;
-    vertical-align: text-bottom;
+    font-size: 14px;
+    color: #333333;
+    border-radius: 6px 6px 0px 0px;
+
   }
   .activeTab{
     background: @staticMainColor;
     color: #fff;
+    font-size: 16px;
   }
   .ql-align-right{
     text-align: right;
@@ -308,27 +314,209 @@
   z-index: 20;
   background-color: #fff;
 }
-
-.infos::-webkit-scrollbar, .anchors::-webkit-scrollbar {
-  /*滚动条整体样式*/
-  width: 6px;
-  height: 100px;
-  /*高宽分别对应横竖滚动条的尺寸*/
-  background: #ebeef5;
-  -webkit-box-shadow: inset 1px 0 1px rgba(0, 0, 0, 0.2);
+.scaletitle{
+  font-size: 20px;
+  font-weight: 500;
+  color: #333333;
+  line-height: 28px;
+  margin: 30px 0 8px 0;
+  text-align: center;
+  display: none;
 }
-
-.infos::-webkit-scrollbar-thumb, .anchors::-webkit-scrollbar-thumb {
-  /*滚动条里面小方块*/
-  width: 6px;
-  border-radius: 5px;
-  background: @staticMainColor;
-  height: 100px;
+.scaleBox{
+  border-bottom: none;
+}
+.contentList{
+  max-width: 100%;
+  border-bottom: 1PX solid #F3F3F3;
+  margin-bottom: 6px;
+  .item-list{
+    padding: 0 21px;
+    color: #666666;
+    .item-title,.item-titles{
+      font-size: 14px;
+      font-weight: 400;
+      color: #333333;
+      line-height: 20px;
+      margin-top: 14px;
+    }
+    .item-content{
+      margin: 10px 0;
+      display: flex;
+      flex-flow: wrap;
+      .radio {
+        display: flex;
+        margin: 5px;
+        margin-right: 25px;
+        label{
+          font-weight: 400;
+          color: #666666;
+          line-height: 20px;
+          & input{
+            margin-right: 6px;
+          }
+          .num{
+            margin-left: 10px;
+          }
+        }
+        .recommend{
+          width: 18px;
+          height: 18px;
+        }
+      } 
+    }
+  }
+}
+.scalebot{
+  margin-bottom: 44px;
+  text-align: right;
+  overflow: hidden;
+  .but{
+    width: 94px;
+    height: 34px;
+    background: #FFFFFF;
+    border-radius: 8px;
+    border: 1px solid #2A9BD5;
+    font-size: 16px;
+    font-weight: 400;
+    color: #2A9BD5;
+    margin-right: 9px;
+    float: right;
+  }
+  .score{
+    font-size: 16px;
+    font-weight: 400;
+    color: #333333;
+    margin-right: 30px;
+    display: none;
+    float: right;
+    line-height: 34px;
+  }
+}
+.result{
+  background: #EDFAFF;
+  border-radius: 10px;
+  font-size: 14px;
+  font-weight: 500;
+  color: #333333;
+  display: none;
+  margin: 0 75px;
+  text-align: center;
+  .result_box{
+    padding:25px 56px;
+    display: inline-block;
+    .result_left{
+      display: flex;
+      & span{
+        display: block;
+        width: 42px;
+      }
+      .hel{
+        width: 21px;
+        height: 21px;
+        background: #2C96E5;
+        border-radius: 50%;
+        color: #fff;
+        font-size: 12px;
+        vertical-align: middle;
+        margin-right: 9px;
+        float: left;
+      }
+      
+    }
+  }
+  
 }
 
-.infos::-webkit-scrollbar-track, .anchors::-webkit-scrollbar-track {
-  /*滚动条里面轨道*/
-  border-radius: 2px;
-  background: #f0f2f5;
-  opacity: .2;
+.foot{
+  margin-bottom: 20px;
+  margin-top: 40px;
+  display: none;
+  overflow: hidden;
+  .foot_box{
+    width: 300px;
+    margin: auto;
+    .printing{
+      float: left;
+      width: 94px;
+      height: 32px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      border: 1px solid #333333;
+      cursor: pointer;
+      line-height: 32px;
+      & img{
+        margin: 0 12px 0 14px;
+        vertical-align: middle;
+      }
+    }
+    .printing:hover{
+      background: #2C96E5;
+      color: #fff;
+      border:1px solid #2C96E5;
+    }
+    .copy{
+      width: 132px;
+      height: 32px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      float: left;
+      border: 1px solid #333333;
+      text-align: center;
+      line-height: 32px;
+      margin-left: 38px;
+      cursor: pointer;
+    }
+    .copy:hover{
+      background: #2C96E5;
+      color: #fff;
+      border:1px solid #2C96E5;
+    }
+  }
+  
+}
+#inputs{
+  position: absolute;top: 0;left: 0;opacity: 0;z-index: -10
 }
+#Print{
+  width: 100%!important;
+  overflow-x: hidden;
+}
+.scale{
+  .infos-box{
+    margin: 0 71px 20px 38px;
+    .infoWrapper {
+      padding: 0 75px;
+    }
+    .scalebot{
+      padding-right: 75px;
+    }
+  }
+}
+.chColor{
+  color: red!important;
+}
+.info_left {
+  width: 527px;
+  margin:30px auto;
+  display: none;
+  overflow: hidden;
+  border:1px solid #D8D8D8;
+  li {
+    width: 50%;
+    height: 30px;
+    padding: 0 10px;
+    box-sizing: border-box;
+    border: 1px solid #bbbfc1;
+    border-right: none;
+    font-size: 14px;
+    float: left;
+    border-bottom: none;
+  }
+  .name,.card{
+    border-top: none;
+  }
+  .name,.age,.sex,.cards{
+    border-left: none;
+  }
+}

src/css/staticInfoOut.less

@@ -352,26 +352,173 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   }
 }
 
-.infos::-webkit-scrollbar, .anchors::-webkit-scrollbar {
-  /*滚动条整体样式*/
-  width: 6px;
-  height: 100px;
-  /*高宽分别对应横竖滚动条的尺寸*/
-  background: #ebeef5;
-  -webkit-box-shadow: inset 1px 0 1px rgba(0, 0, 0, 0.2);
+.scaletitle{
+  font-size: 20px;
+  font-weight: 500;
+  color: #333333;
+  line-height: 28px;
+  margin: 30px 0 8px 0;
+  text-align: center;
 }
-
-.infos::-webkit-scrollbar-thumb, .anchors::-webkit-scrollbar-thumb {
-  /*滚动条里面小方块*/
-  width: 6px;
-  border-radius: 5px;
-  background: @staticMainColor;
-  height: 100px;
+.scaleBox{
+  border-bottom: none;
 }
-
-.infos::-webkit-scrollbar-track, .anchors::-webkit-scrollbar-track {
-  /*滚动条里面轨道*/
-  border-radius: 2px;
-  background: #f0f2f5;
-  opacity: .2;
+.contentList{
+  max-width: 100%;
+  border-bottom: 1PX solid #F3F3F3;
+  margin-bottom: 6px;
+  .item-list{
+    padding: 0 21px;
+    .item-title{
+      font-size: 14px;
+      font-weight: 400;
+      color: #333333;
+      line-height: 20px;
+      margin-top: 14px;
+    }
+    .item-content{
+      margin: 10px 0;
+      display: flex;
+      flex-flow: wrap;
+      .radio {
+        display: flex;
+        margin: 5px;
+        margin-right: 25px;
+        label{
+          display: flex;
+          align-items: center;
+          font-weight: 400;
+          color: #666666;
+          line-height: 20px;
+          & input{
+            margin-right: 6px;
+          }
+          .num{
+            margin-left: 10px;
+          }
+        }
+        .recommend{
+          width: 18px;
+          height: 18px;
+        }
+      } 
+    }
+  }
+}
+.scalebot{
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  margin-bottom: 44px;
+  .but{
+    width: 94px;
+    height: 34px;
+    background: #FFFFFF;
+    border-radius: 8px;
+    border: 1px solid #2A9BD5;
+    font-size: 16px;
+    font-weight: 400;
+    color: #2A9BD5;
+    margin-right: 9px;
+  }
+  .score{
+    font-size: 16px;
+    font-weight: 400;
+    color: #333333;
+    margin-right: 30px;
+    display: none;
+  }
+}
+.result{
+  background: #EDFAFF;
+  border-radius: 10px;
+  font-size: 14px;
+  font-weight: 500;
+  color: #333333;
+  display: none;
+  margin: 0 75px;
+  .result_box{
+    display: flex;
+    justify-content: center;
+    padding: 25px 56px;
+    .hel{
+      width: 21px;
+      height: 21px;
+      background: #2C96E5;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #fff;
+      margin-right: 9px;
+      font-size: 12px;
+    }
+  }
+  
+}
+.result_title{
+  max-width: 85%;
+}
+.foot{
+  margin-bottom: 20px;
+  margin-top: 40px;
+  display: none;
+  .foot_box{
+    display: flex;
+    justify-content: center;
+    .printing{
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      width: 94px;
+      height: 32px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      border: 1px solid #333333;
+      cursor: pointer;
+    }
+    .printing:hover{
+      background: #2C96E5;
+      color: #fff;
+      border:1px solid #2C96E5;
+    }
+    .copy{
+      width: 132px;
+      height: 32px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      border: 1px solid #333333;
+      text-align: center;
+      line-height: 32px;
+      margin-left: 38px;
+      cursor: pointer;
+    }
+    .copy:hover{
+      background: #2C96E5;
+      color: #fff;
+      border:1px solid #2C96E5;
+    }
+  }
+  
+}
+#inputs{
+  position: absolute;top: 0;left: 0;opacity: 0;z-index: -10;
+}
+#Print{
+  overflow-x: hidden;
+}
+.scale{
+  .infos-box{
+    border: 1px solid #E6E6E6;
+    margin: 0 71px 20px 38px;
+    .infoWrapper {
+      padding: 0 75px;
+    }
+    .scalebot{
+      padding-right: 75px;
+    }
+  }
 }
+.chColor{
+  color: red!important;
+}

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;
@@ -68,41 +72,49 @@ html{
 .staticSearchB .empty, .staticSearchB .searching,.staticSearchB .inputWarning{
     color: #979797;
     text-align: center;
-    line-height: 40px;
-    margin-top: 10px;
+    /*line-height: 40px;*/      /**bug8689*/
     top: 70px;
     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,17 +123,15 @@ 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;
     margin: 0  3px 2px 0;
-}
-.emptyImg{
-    width: 100px;
 }

src/html/caseWriteStandard.html

@@ -25,27 +25,24 @@
       color: #505050;
       line-height: 28px;
     }
-
-    h1 {
-      text-align: center;
-      padding: 80px 0 60px;
-    }
     .titleH1{
-      padding: 20px 0;
-      color: #1E1E1E;
+      text-align: center;
+      color: #fff;
       font-size: 18px;
+      background: #FF7F5B;
+      height: 60px;
+      line-height: 60px;
     }
-    .contentTitle{
-      font-size: 14px;
-      color: #1E1E1E;
-      font-weight: 600;
+    .content{
+      padding:20px 0 0 60px;
+    }
+    .content>div{
+      background: url("../images/dot.png") 0 10px no-repeat;
+      text-indent: 10px;
     }
-
     .container {
-      width: 80%;
       background: #fff;
       margin: 0 auto;
-      padding: 0 30px 40px;
     }
   </style>
   <script>

src/html/cdss.html

@@ -25,26 +25,32 @@
           <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>
+              <div class="empty-box empty">
+                <img class="emptyImg small" src="../images/empty2.png" alt="空">
+                <p class="emptyTxt">等待内容输入中…</p>
+              </div>
+              <div class="empty-box empty-right">
+                  <img class="emptyImg" src="../images/icon_admin.png" alt="空">
+                  <p class="emptyTxt">功能未开启</p>
+              </div>
+              <div class="empty-box empty-null">
+                  <img class="emptyImg" src="../images/empty.png" alt="空">
+                  <p class="emptyTxt">暂无推送内容</p>
               </div>
-              <div class="loading">
+              <div class="empty-box loading">
                 <div class="loadingMask"></div>
-                <img class="loadingImg" src="./images/loading.gif" alt="loading">
+                <img class="loadingImg" src="../images/loading.gif" alt="loading">
                 <!-- <p class="loadingTxt">loading~</p> -->
               </div>
               <p class="responsibility"></p>
             </div>
-            
-            
+
+
           </div>
           <div class="qcWrap moduleWrapper">
   
@@ -62,12 +68,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>
+                          <img class="emptyImgSearch" src="./images/icon_no.png" alt="">
+                        <p>暂无搜索结果～</p>
                       </div>
                       <ul>
                           
@@ -92,7 +98,6 @@
                     <p class="title">
                         <img class="icon" src="./images/t2.png" alt="">
                         <span class="h2">中医处方推荐</span>
-                        <a class="go" id="goTreat">更多 <img class="icon" src="./images/g1.png" alt=""></a>
                     </p>
                     <div class="content">
                         <ul class="infos clearfix">
@@ -113,6 +118,7 @@
                             <ul>
 
                             </ul>
+                            <a class="go" id="goTreat">更多</a>
                         </div>
                     </div>
                 </div>
@@ -134,9 +140,10 @@
                         </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>
+            <span class="version-tip"><span class="version-txt"><i>版本说明</i><img class="newIcon" src="./images/new.png"></span></span>
             <span class="logo">&copy; 朗通医疗</span>
             <span class="disclaimerInfo"><span class="disclaimerInfoTxt">免责声明</span></span>
           </div>

src/html/cdssHorizontal.html

@@ -14,7 +14,7 @@
 </head>
 
 <body>
-  <div class="bodyWrap">
+  <div class="bodyWrap bodyWrapHorizontal clearfix">
       <div class="versionWrapper">
         <span class="versionTop">
           <span class="pushDisclaimer">智能推送仅供参考 </span>
@@ -26,11 +26,25 @@
         </span>
        
       </div>
-      <div class="tabList">
-
-      </div>
+      
       <div class="contentBox">
+        <div class="tabList">
+
+        </div>
         <div class="recommendWrap moduleWrapper clearfix">
+          <div class="empty-box empty-right">
+            <img class="emptyImg" src="../images/icon_admin.png" alt="空">
+            <p class="emptyTxt">功能未开启</p>
+          </div>
+          <div class="empty-box empty-null">
+            <img class="emptyImg" src="../images/empty.png" alt="空">
+            <p class="emptyTxt">暂无推送内容</p>
+          </div>
+          <div class="empty-box loading">
+          <div class="loadingMask"></div>
+          <img class="loadingImg" src="../images/loading.gif" alt="loading">
+          <!-- <p class="loadingTxt">loading~</p> -->
+        </div>
           <div class="leftWrapper">
             <div class="leftBox"></div>
           </div>

src/html/check.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Document</title>
-</head>
-<body>
-  <div class="">
-
-  </div>
-</body>
-</html>

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/html/smartAlert.html

@@ -25,34 +25,47 @@
       color: #505050;
       line-height: 28px;
     }
-
-    h1 {
-      text-align: center;
-      padding: 80px 0 60px;
-    
-    }
     .titleH1{
-      padding: 20px 0;
-      color: #1E1E1E;
+      text-align: center;
+      color: #fff;
       font-size: 18px;
+      background: #FF7F5B;
+      height: 60px;
+      line-height: 60px;
+    }
+    .content{
+      padding:20px 0 0 60px;
     }
     .contentTitle{
-      font-size: 14px;
-      color: #1E1E1E;
-      font-weight: 600;
+      margin-bottom: 7px;
+    }
+    .contentTitle span{
+      display: inline-block;
+      padding: 0 8px;
+      border:1px solid #FF7F5B;
+      color: #FF7F5B;
     }
+    .contentBox{
+      margin-bottom: 12px;
+    }
+    .contentBox li{
+      line-height: 20px;
+      color: #333;
+    }
+    .contentBox>li{
+      background: url("../images/dot.png") 0 10px no-repeat;
+      text-indent: 10px;
+    }
+    /*.contentBox li:before{
+      content: "·";
+      color: #FF7F5B;
+      font-size: 38px;
+      vertical-align: text-bottom;
+      margin-right: 3px;
+    }*/
     .container {
-      width: 80%;
       background: #fff;
       margin: 0 auto;
-      padding: 0 30px 40px;
-    }
-    .contentBox .contentItem{
-      list-style: disc;
-    }
-    .contentBox{
-      padding: 0 0 0 20px;
-      margin: 0 0 15px 0;
     }
   </style>
   <script>

src/html/staticInfoOut.html

@@ -57,6 +57,18 @@
         </div>
     </div>
   </div>
+  <div class=" container disCopy scale">
+    <div class="content">
+      <div class="infos" id="Print">
+        <div class="infos-box"></div>
+      </div>
+      <div class="anchors">
+        <div class="a-circle"></div>
+        <ul></ul>
+        <div class="a-circle"></div>
+      </div>
+    </div>
+  </div>
 <div class="footer">
     <p>免责声明：本知识库提供的医学静态知识仅供医生学习参考。</p>
     <p>版权所有：杭州朗通信息技术有限公司      浙ICP备：16000400号-2</p>

src/images/icon_current.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="26px" height="16px" viewBox="0 0 26 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 61 (89581) - https://sketch.com -->
-    <title>矩形</title>
-    <desc>Created with Sketch.</desc>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="疾病详情-临床路径页" transform="translate(-1121.000000, -304.000000)" fill="#2A9BD5">
-            <g id="编组-3" transform="translate(1079.000000, 126.000000)">
-                <polygon id="矩形" points="42 178 63.6239567 178 68 186.189897 63.6239567 194 42 194"></polygon>
-            </g>
-        </g>
-    </g>
-</svg>

src/js/caseWriteStandard.js

@@ -1,5 +1,6 @@
 const $ = require("jquery");
 const {getUrlArgObject} = require('./promise.js');
+require('./../images/dot.png').replace(/^undefined/g, '')
 
 $(function(){
   let caseWriteStandradList = JSON.parse(getUrlArgObject("caseWriteStandradList")) || {}

src/js/cdss.js

@@ -10,11 +10,13 @@ require('./../css/reset.css');
 require('./../css/cdss.less');
 require('./../css/popup.css');
 require('./../css/followUpV.less');
-require('./../css/staticSearch.css')
-require('./../js/staticSearch.js')
+require('../css/staticSearch.less')
+require('./../js/staticSearch.js');//静态知识搜索
 require('./../images/empty.png').replace(/^undefined/g, '')
+require('./../images/icon_admin.png').replace(/^undefined/g, '')
 require('./../images/empty2.png').replace(/^undefined/g, '')
 require('./../images/empty3.png').replace(/^undefined/g, '')
+require('./../images/icon_no.png').replace(/^undefined/g, '')
 require('./../images/loading.gif').replace(/^undefined/g, '')
 require('./../images/right.png').replace(/^undefined/g, '')
 require('./../images/new.png').replace(/^undefined/g, '')
@@ -66,7 +68,7 @@ let treatDisName;
 function getMRInfo() {
    return post(config.getMr2,{mrId:mrId})
 }
-$('.empty').css("display","none")
+let ifInputParam;   //是否有入参，显示输入空状态用
 if(mrId){
   Promise.all([getConf(),getMRInfo()]).then(([res1,res2])=>{
     const data = res1.data.data&&res1.data.data[0]
@@ -89,7 +91,25 @@ if(mrId){
   followEmpty()
 }
 
-
+function hasInputParam(){
+  const checkKeys = ["chief","diag","diseaseName","drug","drugOrder","lis","lisOrder",'marital','menstrual',"operation","operationOrder","otherIndex","otherOrder","pacs","pacsOrder","pasts","personal","symptom","transfusion","transfusionOrder","vital"];
+  let res = false;
+  let val;
+  checkKeys.map((it)=>{
+    val = msg[it];
+    if(typeof val==='string'){
+      if(val!==''){
+          res=true;
+      }
+    }else{
+      const str = JSON.stringify(val);
+      if(!(str==='{}'||str==='[]')){
+          res=true;
+      }
+    }
+  });
+  return res;
+}
 
 function getConf() {
   var msg = window.msg 
@@ -176,11 +196,16 @@ $(document).on('click',".allDis .right,.allDis .secDis",function(){
 
 
 function moreInfo() {
-  $('.infoImg').off("click").click(function(){
-    const name = $(this).parent().attr('data-name')
-    const type = $(this).parent().attr('data-type')
-    openNewWin(`staticInfo.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}`)
-  })
+    $('.infoImg').off("click").click(function(){
+        const name = $(this).parents(".pushItemBox").attr('data-name')
+        const type = $(this).parents(".pushItemBox").attr('data-type')
+        openNewWin(`staticInfo.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}&mrId=${encodeURIComponent(mrId)}`)
+    })
+    $('.evaluationtitle .item-name').off("click").click(function () {
+        const name = $(this).parents(".pushItemBox").attr('data-name')
+        const type = $(this).parents(".pushItemBox").attr('data-type')
+        openNewWin(`staticInfo.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}&page=1&mrId=${encodeURIComponent(mrId)}&gauge=gauge`)
+    })
 }
 
 function getVersion() {
@@ -206,29 +231,50 @@ function getDisclaimer() {
 }
 
 function renderPage(pageSet){
-  if(!pageSet || !pageSet.sysSetInfo){
+  const setInfo = pageSet.sysSetInfo;
+  if(!pageSet || !setInfo){
     return
   }
-  renderTab(pageSet.sysSetInfo)
+  renderTab(setInfo)
   adjustHei()
-  const hasAuxiliary = hasTab("辅助信息",pageSet.sysSetInfo)
-  const hasMedical = hasTab("医学知识",pageSet.sysSetInfo)
-  const hasFollowUp = hasTab("随访计划",pageSet.sysSetInfo)
-  const hasTcm = hasTab("中医辅助", pageSet.sysSetInfo);
-
+  const hasAuxiliary = hasTab("辅助信息",setInfo);
+  const hasMedical = hasTab("医学知识",setInfo)
+  const hasFollowUp = hasTab("随访计划",setInfo)
+  const hasTcm = hasTab("中医辅助", setInfo);
+  console.log(hasFollowUp)
+  //所有模块都未开启配置，显示功能未开启（无tab)
+  if(hasAuxiliary.status===0&&hasMedical.status===0&&hasFollowUp.status===0&&hasTcm.status===0){
+    const nullTxt = `<div class="empty-box" style="left: -20px;display: block;">
+                  <img class="emptyImg" src="../images/icon_admin.png" alt="空">
+                  <p class="emptyTxt">功能未开启</p>
+              </div>`
+    $(".contentWrapper").html(nullTxt);
+    return;
+  }
   if (hasTcm) {
       getTcmMr(mrId, hasTcm);
   }
   if(!mrId){
-    empty()
     return
   }
+  if(hasFollowUp){
+      renderFollowUp(msg)
+  }
+  const planDetail = hasAuxiliary.planDetails;
+  const configs = planDetail.filter((it)=>it.status!==0)||[];
+  if(!configs[0]){         //没有开启辅助信息各项配置
+      $('.empty-box').hide();
+      $('.recommendBox .empty-right').show();
+      return;
+  }
   if(hasAuxiliary){
-    renderModuleWrapper(hasAuxiliary.planDetails)
-    let needPush = isNeedPush(hasAuxiliary.planDetails)
-    let needPushWarning = isNeedPushWarning(hasAuxiliary.planDetails)
-    let needWriteStandardPush = isNeedwriteStandardPush(hasAuxiliary.planDetails)
-    if(needPush || needPushWarning){
+    $('.empty-box').hide();
+    $(".loading").show();
+    renderModuleWrapper(planDetail)
+    let needPush = isNeedPush(planDetail)
+    let needPushWarning = isNeedPushWarning(planDetail)
+    let needWriteStandardPush = isNeedwriteStandardPush(planDetail);
+    if(needPush){
       renderPushData()
       allInterface++
     }
@@ -241,16 +287,13 @@ function renderPage(pageSet){
       allInterface++
     }
   }
-  if(hasFollowUp){
-    renderFollowUp(msg)
-  }
 }
 
 function renderPushData(){
   return getPushInfo().then(res =>{
+    $(".loading").hide();
     hasCompleteTnterface++
     if(res.data.code == "0"){
-      console.log(1)
       const result = res.data.data
       let diagPush = result.dis ||{}
       let lisPush = result.lis || []
@@ -277,69 +320,68 @@ function renderPushData(){
         let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
      
 
-      renderLis(lisPush,lisNum,3,true)
-      renderScale(scalePush,scaleNum,8,true)
-      renderPacs(pacsPush,pacsNum,5,true)
-      renderCheckup(checkupPush,checkupNum,null,true)
-      renderSymptomPush(symptomPush,symptomNum,null,true)
+      renderLis(lisPush,lisNum)
+      renderScale(scalePush,scaleNum)
+      renderPacs(pacsPush,pacsNum)
+      renderCheckup(checkupPush,checkupNum)
+      renderSymptomPush(symptomPush,symptomNum)
       renderDiag(diagPush)
-      renderMedicinesPush(medicinesPush,medicinesNum,2,true)
-      renderOperationPush(operationsPush,operationsNum,6,true)
+      renderMedicinesPush(medicinesPush,medicinesNum)
+      renderOperationPush(operationsPush,operationsNum)
       rendergeneraTreatPush(generaTreatPush)
-        renderNurse(nursePush, nurseNum, 9, true)
-      if(hasCompleteTnterface === allInterface){
-        $('.loading').css("display","none")
-        if(moduleNum === 0){
-          empty()
-        }
-      }
+      renderNurse(nursePush, nurseNum)
       bindOpenInfo()
       moreInfo()
       bindSlide()
+      empty();  //判断是否显示空状态
     }
   })
 }
 function adjustHei(){
   const iframeHei = $(".bodyWrap").height()
-  const tabHei = $(".tabList").height()
-  $(".contentWrapper").css("height",iframeHei-tabHei-20-30+3+19+'px')
+  $(".contentWrapper").css("height",iframeHei-20-30-60+3+19+'px')
+  $(".tabList").css("height",iframeHei+'px')
 }
 function isNeedPush(list){
-  let pushCode = ["diag","lis","pacs","symptom","vital","treat","medicines"]
+  let pass = false;
+  let pushCode = ['critical',"diag","lis","pacs","symptom","vital","treat","medicines",'evaluation','general','medicine','operation','nurse']
   for(let i = 0; i < list.length; i++){
     if(pushCode.indexOf(list[i].code)>-1){
       if(list[i].status == "1"){
-        return true
+        pass = true
       }
     }
   }
-  return false
+  return pass;
 }
 function isNeedwriteStandardPush(list){
+    let pass = false;
   let pushCode = ["casewriting"]
   for(let i = 0; i < list.length; i++){
     if(pushCode.indexOf(list[i].code)>-1){
       if(list[i].status == "1"){
-        return true
+          pass = true
       }
     }
   }
-  return false
+  return pass
 }
 function isNeedPushWarning(list){
-    let pushCode = ["crivalue", "rationali", "highrisk", "otherremind"]
+    let pushCode = ["crivalue", "rationali", "highrisk", "otherremind"];
+    let pass = false;
   for(let i = 0; i < list.length; i++){
-    if(pushCode.indexOf(list[i].code)>-1){
-      if(list[i].status == "1"){
-        return true
+    if(pushCode.indexOf(list[i].code.trim())>-1){
+      if(+list[i].status === 1){
+          pass=true
       }
     }
   }
-  return false
+  return pass
 }
-
+//let popNum = 0;//气泡显示数字
 function renderPushWarning(){
   return getPusgWarning().then(res =>{
+      $(".loading").hide();
     hasCompleteTnterface++
     if(res.data.code == '0'){
       const result = res.data.data
@@ -357,35 +399,24 @@ function renderPushWarning(){
       renderBillingPush(otherList,'其他提醒','otherremind')
       //moreInfo()
       $(".moduleItem.tips").wrapAll("<div class='tips-cont'></div>");
+        updatePopNum();
       $(titleStr('warning')).insertBefore('.tips-cont .moduleItem:first-child')
-      // renderBillingPush(dubugStr,'注意调试信息')
-     
+      empty();
     }
-    if(hasCompleteTnterface === allInterface){
-      $('.loading').css("display","none")
-      if(moduleNum === 0){
-        empty()
-      }
-    }
-    
   })
 }
 function renderWriteStandard(){
   return getWriteStandardPush().then(res =>{
+      $(".loading").hide();
     hasCompleteTnterface++
     if(res.data.code == '0'){
       const list = res.data.data || {}
       let casewritingNum = $(".moduleItem.casewriting").attr("data-num") || 5
       renderwriteStandardPage(list,casewritingNum)
     }
-    if(hasCompleteTnterface === allInterface){
-      $('.loading').css("display","none")
-      if(moduleNum === 0){
-        empty()
-      }
-    }
   })
 }
+
 function  renderwriteStandardPage(list,casewritingNum){
   let arr = Object.keys(list)
   if(arr.length > 0 &&  $(".moduleItem.casewriting").length > 0){
@@ -405,14 +436,16 @@ function  renderwriteStandardPage(list,casewritingNum){
     $(".moduleItem.casewriting").append(allStr)
     $(".casewritingWrapper").append(shortStrBox)
     if( arr.length>casewritingNum){
-      $(".shortStrBox .billingPushItem").eq( $(".shortStrBox .billingPushItem").length -1).append(`<span class="showMoreCaseWriting">更多<img class="iconArrowImg" src="${iconArrowDown}"></span>`)
+      $(".shortStrBox .billingPushItem").eq( $(".shortStrBox .billingPushItem").length -1).append(`<span class="showMoreCaseWriting"><img class="iconArrowImg" src="${iconArrowDown}"></span>`)
       
       // $(".moduleItem .generalTreatInfo").append(`<span class="showLessGeneralTreat">收起<img class="iconArrowImg" src="${iconArrowUp}"></span>`)
       $(".casewritingWrapper").append(longStrBox)
-      $(".longStrBox .billingPushItem").eq( $(".longStrBox .billingPushItem").length -1).append(`<span class="showLessCaseWriting">收起<img class="iconArrowImg" src="${iconArrowUp}"></span>`)
+      $(".longStrBox .billingPushItem").eq( $(".longStrBox .billingPushItem").length -1).append(`<span class="showLessCaseWriting"><img class="iconArrowImg" src="${iconArrowUp}"></span>`)
     }
     $('.moduleItem.casewriting').css("display","block")
+    updatePopNum();
     bindSlideCaseWriting()
+    empty();
   }
 }
 function renderBillingPush(list,name,code){
@@ -431,9 +464,19 @@ function renderBillingPush(list,name,code){
       </div>`
     $("."+code).append(boxStr)
     $('.moduleItem.'+code).addClass("tips").css("display", "block")
-}
 
+}
 
+//更新消息个数
+function updatePopNum(){
+    const writeNum  = $(".casewriting .longStrBox").length?$(".casewriting  .longStrBox .billingPushItem").length:$(".casewriting  .shortStrBox .billingPushItem").length;
+    const warnNum = $(".tips-cont .billingPushItem").length+writeNum; //病例书写规范有隐藏元素
+    if(warnNum===0){
+        $(".tabList .numPop").hide();
+        return;
+    }
+    $(".tabList .numPop").text(warnNum).show()
+}
 function renderDiag(diagPush){
   let possibleDiagPush = diagPush["可能诊断"] || []
   let previousDiagPush = diagPush["既往诊断"] || []
@@ -461,7 +504,7 @@ function renderDiagItem(list,name,number){
   }
   moduleNum++
   let titleStr = titleStr2(name)
-  let {shortStr, longStr} = renderItemWrapper(list,number,1,true)
+  let {shortStr, longStr} = renderItemWrapper(list,number)
   let boxStr = `<div class="moduleBox">
         ${titleStr}
         ${shortStr}
@@ -483,60 +526,60 @@ function renderWarningDiag(list,name,number){
   }
 }
 
-function renderLis(list,showNum,type,hasInfo){
+function renderLis(list,showNum){
   if(list.length > 0 &&  $(".moduleItem.lis").length > 0){
     moduleNum++
     $('.moduleItem.lis').append(titleStr("lisPush"))
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $('.moduleItem.lis').append(shortStr).append(longStr)
     $('.moduleItem.lis').css("display","block")
   }
  
 }
-function renderScale(list,showNum,type,hasInfo){
+function renderScale(list,showNum){
   if(list.length > 0 &&  $(".moduleItem.evaluation").length > 0){
     moduleNum++
     $('.moduleItem.evaluation').append(titleStr("scalePush"))
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $('.moduleItem.evaluation').append(shortStr).append(longStr)
-    $('.moduleItem.evaluation').css("display","block")
+    $('.moduleItem.evaluation').css("display", "block")
   }
 }
 
-function renderNurse(list, showNum, type, hasInfo) {
+function renderNurse(list, showNum) {
     if (list.length > 0 && $(".moduleItem.nurse").length > 0) {
         moduleNum++
         $('.moduleItem.nurse').append(titleStr("nursePush"))
-        let {shortStr, longStr} = renderItemWrapper(list, showNum, type, hasInfo)
+        let {shortStr, longStr} = renderItemWrapper(list, showNum)
         $('.moduleItem.nurse').append(shortStr).append(longStr);
         $('.moduleItem.nurse').css("display", "block")
     }
 }
-function renderPacs(list,showNum,type,hasInfo){
+function renderPacs(list,showNum){
   if(list.length > 0 &&  $(".moduleItem.pacs").length > 0){
     moduleNum++
     $(".moduleItem.pacs").append(titleStr("pacsPush"))
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.pacs").append(shortStr).append(longStr)
     $('.moduleItem.pacs').css("display","block")
   }
  
 }
-function renderCheckup(list,showNum,type,hasInfo){
+function renderCheckup(list,showNum){
   if(list.length > 0 &&  $(".moduleItem.vital").length > 0){
     moduleNum++
     $(".moduleItem.vital").append(titleStr("checkupPush"))
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.vital").append(shortStr).append(longStr)
     $('.moduleItem.vital').css("display","block")
   }
 }
-function renderSymptomPush(list,showNum,type,hasInfo){
+function renderSymptomPush(list,showNum){
   $(".moduleItem.symptom").append(titleStr('symptomPush'))
 
   if(list.length > 0 &&  $(".moduleItem.symptom").length > 0){
     moduleNum++
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.symptom").append(shortStr).append(longStr)
     $(".moduleItem.symptom").css("display","block")
   }
@@ -551,29 +594,29 @@ function rendergeneraTreatPush(list){
     $(".moduleItem.general").css("display","block")
     let generaTreatHei = $(".moduleItem .generalTreatInfo")[0].scrollHeight
     if(generaTreatHei > 50){
-      $(".moduleItem .generalTreatInfo").append(`<span class="showMoreGeneralTreat">更多<img class="iconArrowImg more" src="${iconArrowDown}"></span>`)
-      $(".moduleItem .generalTreatInfo").append(`<span class="showLessGeneralTreat">收起<img class="iconArrowImg" src="${iconArrowUp}"></span>`)
+      $(".moduleItem .generalTreatInfo").append(`<span class="showMoreGeneralTreat"><img class="iconArrowImg more" src="${iconArrowDown}"></span>`)
+      $(".moduleItem .generalTreatInfo").append(`<span class="showLessGeneralTreat"><img class="iconArrowImg" src="${iconArrowUp}"></span>`)
       bindGeneralSlide()
     }
   }
 }
-function renderMedicinesPush(list,showNum,type,hasInfo){
+function renderMedicinesPush(list,showNum){
   $(".moduleItem.medicine").append(titleStr('drugPush'))
 
   if(list.length > 0 &&  $(".moduleItem.medicine").length > 0){
     moduleNum++
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.medicine").append(shortStr).append(longStr)
     $(".moduleItem.medicine").css("display","block")
   }
  
 }
-function renderOperationPush(list,showNum,type,hasInfo){
+function renderOperationPush(list,showNum){
   $(".moduleItem.operation").append(titleStr('operationPush'))
 
   if(list.length > 0 &&  $(".moduleItem.operation").length > 0){
     moduleNum++
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.operation").append(shortStr).append(longStr)
     $(".moduleItem.operation").css("display","block")
   }
@@ -581,35 +624,35 @@ function renderOperationPush(list,showNum,type,hasInfo){
 }
 
 
-function renderItemWrapper(list, showNum, type, hasInfo) {
-    //console.log(33, type)
+function renderItemWrapper(list, showNum) {
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
-
   for(let i = 0; i < list.length; i++){
     if(i <= showNum1-1){
-      shortStr += renderPushItem(list[i],type)
+      shortStr += renderPushItem(list[i])
     }
-    longStr += renderPushItem(list[i],type)
+    longStr += renderPushItem(list[i])
   }
-
   if(showNum1 >= list.length){
     return {
       shortStr:`<div class="shortBox">${shortStr}</div>`,
       longStr:''
     }
   }else{
-    shortStr += `<span class="showMore">更多 <img class="iconArrowImg" src="${iconArrowDown}"></span>`
-    longStr += `<span class="showLess">收起 <img class="iconArrowImg"  src="${iconArrowUp}"></span>`
+    shortStr += `<span class="showMore"><img class="iconArrowImg" src="${iconArrowDown}"></span>`
+    longStr += `<span class="showLess"><img class="iconArrowImg"  src="${iconArrowUp}"></span>`
     return {
-      shortStr:`<div class="shortBox clearfix">${shortStr}</div>`,
-      longStr:`<div class="longBox clearfix">${longStr}</div>`
+      shortStr:`<div class="shortBox">${shortStr}</div>`,
+      longStr:`<div class="longBox">${longStr}</div>`
     }
   }
 }
 
-function renderPushItem(item,type){
-    str= `<span class="pushItemBox" data-name="${item.name}" data-type="${type}"><span class="pushItemName">${type==8?('【'+item.name+'】'):item.name}</span>${item.hasInfo=="1"?`<img class="infoImg" src="${infoImg}">`:""}</span>`
+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>`;
   return str
 }
 
@@ -622,11 +665,11 @@ function bindOpenInfo(){
 }
 
 function bindSlide(){
-  $(".showMore").on("click", function(){
+  $(".showMore").off("click").on("click", function(){
     $(this).parent().parent().find(".longBox").css("display","block")
     $(this).parent().parent().find(".shortBox").css("display","none")
   })
-  $(".showLess").on("click", function(){
+  $(".showLess").off("click").on("click", function(){
     $(this).parent().parent().find(".longBox").css("display","none")
     $(this).parent().parent().find(".shortBox").css("display","block")
   })
@@ -648,7 +691,7 @@ function renderModuleWrapper(moduleList){
     }
    
   }
-  // console.log(moduleList,moduleStr)
+  //console.log(moduleList,moduleStr)
 
   $(".recommendWrap").append(moduleStr)
 }
@@ -665,13 +708,14 @@ function hasTab(tabName,tabList){
   return false
 }
 function renderTab(tabList){
-    let tabStr = ''
+    let tabStr = '<ul>'
     for(let i = 0; i < tabList.length; i++){
       if(tabList[i].status == '1'){
-        tabStr += `<span class="tab" data-name="${tabList[i].code}" >${tabList[i].name}<span class="activeLine"></span></span>`
+        tabStr += `<li class="tab" data-name="${tabList[i].code}" ><span>${tabList[i].name}</span></li>`
       }
-      
+
     }
+    tabStr += `</ul><div class="numPop"></div>`;
     $(".tabList").append(tabStr)
     let tabNum = 0;
     if(isTcm=='true'){
@@ -695,14 +739,14 @@ function titleStr2(name){
 }
 
 function bindTabClick(){
-  $(".tabList .tab").on("click", function(){
+  $(".tabList .tab").off("click").on("click", function(){
     $(".activeTab").removeClass("activeTab")
     $(this).addClass("activeTab")
     const moduleName = $(this).attr("data-name")
     getModuleShow(moduleConfig[moduleName])
     if(moduleName == "medical"){
       $(".staticSearchT .ipt").find("input").focus()
-      $(".contentWrapper").css("overflowY","hidden")
+      //$(".contentWrapper").css("overflowY","hidden")
     }else if(moduleName == 'followup'){
       
       // $(".contentWrapper").css("overflowY","auto")
@@ -717,41 +761,53 @@ function getModuleShow(moduleClassName){
   }
 }
 function bindGeneralSlide(){
-  $(".showMoreGeneralTreat").on("click",function(){
+  $(".showMoreGeneralTreat").off("click").on("click",function(){
     $(".generalTreatInfo").toggleClass("isOverFlow")
     $(".showMoreGeneralTreat").toggle()
   })
-  $(".showLessGeneralTreat").on("click",function(){
+  $(".showLessGeneralTreat").off("click").on("click",function(){
     $(".generalTreatInfo").toggleClass("isOverFlow")
     $(".showMoreGeneralTreat").toggle()
   })
   
 }
  function bindSlideCaseWriting(){
-  $(".showMoreCaseWriting").on("click",function(){
+  $(".showMoreCaseWriting").off("click").on("click",function(){
     $(this).parents(".casewritingWrapper ").find(".shortStrBox").css("display","none")
     $(this).parents(".casewritingWrapper ").find(".longStrBox").css("display","block")
   })
-  $(".showLessCaseWriting").on("click",function(){
+  $(".showLessCaseWriting").off("click").on("click",function(){
     $(this).parents(".casewritingWrapper ").find(".shortStrBox").css("display","block")
     $(this).parents(".casewritingWrapper ").find(".longStrBox").css("display","none")
   })
  
  }
 
+//显示空状态
 function empty(){
-  // $(".responsibility").css("display","none")
-  $('.recommendWrap .empty').css("display","block")
+    setTimeout(function(){
+        ifInputParam = hasInputParam();
+        if(!ifInputParam){    //没有输入数据时
+            $(".recommendBox .empty-box").hide();
+            $(".recommendBox .empty").show();
+            return;
+        }
+        const emptyShownBox = $('.recommendWrap .empty-box:visible').length;
+        const configShownBox = $('.recommendWrap .moduleItem:visible').length;
+        if(configShownBox===0&&emptyShownBox===0){       //有配置但没数据
+            $('.empty-box').hide();
+            $('.recommendBox .empty-null').show();
+            return;
+        }
+        $(".empty-box").hide();
+    },200);
 }
 
-
-
-
-
-
-
-
 $(function(){
+  //隐藏logo
+  if(getUrlArgObject("hideLg")){
+    $(".disclaimer .logo").hide();
+  }
   getDisclaimer(); //获取免责声明
   getVersion();   //获取版本信息
   $(".disclaimerInfo").on("click", function(){
@@ -781,19 +837,8 @@ $(function(){
             }  
         })    
     }  
-  });  
-  // $(".iframeWrap").preventScroll();  
-    $(".iframeWrap").preventScroll();
-    $(".recommendWrap").preventScroll();
-    $(".tcmWarp").preventScroll();
-    $(".infoWrap").preventScroll();
-  $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll();  
+  });
   $(window).on("resize", function(){
-    $(".iframeWrap").preventScroll();  
-    $(".recommendWrap").preventScroll();
-      $(".tcmWarp").preventScroll();
- 
-    $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll(); 
     adjustHei() 
   })
 });

src/js/cdssPlan.js

@@ -10,8 +10,8 @@ require('./../css/reset.css');
 require('./../css/cdssPlan.less');
 require('./../css/popup.css');
 require('./../css/followUpV.less');
-require('./../css/staticSearch.css')
-require('./../js/staticSearch.js')
+require('../css/staticSearch.less')
+require('./../js/staticSearch.js')      //静态知识搜索
 require('./../images/empty.png').replace(/^undefined/g, '')
 require('./../images/empty2.png').replace(/^undefined/g, '')
 require('./../images/empty3.png').replace(/^undefined/g, '')
@@ -40,6 +40,10 @@ if(mrId){
         msg = res.data.data ||{}
         window.msg = msg
         renderFollowUp(msg)
+        setTimeout(()=>{
+            adjustWidth();
+        },200)
+
     }
   }).catch(function (err) {
       console.log(err);
@@ -75,14 +79,11 @@ $(document).on('click',".allDis .right,.allDis .secDis",function(){
 
 
 
-function adjustHei(){
-  const iframeHei = $(".bodyWrap").height()
-  const tabHei = $(".tabList").height()
-  $(".contentWrapper").css("height",iframeHei-tabHei-20-30+3+19+'px')
+function adjustWidth(){
+  const iframeWh = $(".bodyWrap").width();console.log(11,iframeWh)
+  $(".operaNameWrap").css("width",iframeWh-168+'px')
 }
 
-
-
 $(function(){
   $.fn.extend({  
     "preventScroll":function(){  
@@ -102,17 +103,8 @@ $(function(){
             }  
         })    
     }  
-  });  
-  // $(".iframeWrap").preventScroll();  
-  $(".iframeWrap").preventScroll();  
-  $(".recommendWrap").preventScroll();  
-  $(".infoWrap").preventScroll();  
-  $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll();  
-  $(window).on("resize", function(){
-    $(".iframeWrap").preventScroll();  
-    $(".recommendWrap").preventScroll();  
- 
-    $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll(); 
-    adjustHei() 
-  })
+  });
+    $(window).on('resize', function(){
+        adjustWidth()
+    })
 });

src/js/check.js

@@ -1,81 +0,0 @@
-if(!Promise){
-  var Promise = require("bluebird");
-  Promise.config({
-    longStackTraces: true,
-    warnings: true
-  })
-}
-
-const $ = require("jquery");
-const { post,config,getUrlArgObject } = require('./promise.js');
-let mrId = getUrlArgObject('mrId')
-let hospitalIdUrl = getUrlArgObject('hospitalId') || ''
-let msg;
-
-function getMRInfo() {
-   return post(config.getMr2,{mrId:mrId})
-}
-$('.empty').css("display","none")
-if(mrId){
-  getMRInfo().then(res =>{
-    if(res.data.code == '0'){
-        msg = res.data.data ||{}
-        window.msg = msg
-        renderPushData()
-    }
-  }).catch(function (err) {
-      console.log(err);
-  })
-} else{
-
-}
-
-
-
-let disName=""
-function handleShow(){
-  const newinConf = {
-    width: '600',   //窗口的文档显示区的宽度。以像素计。
-    height: '826',  //窗口文档显示区的高度。以像素计。
-    left: '0',  //窗口的 x 坐标。以像素计。
-    top: '0',    //窗口的 y 坐标。以像素计。
-    openMode: "_blank"  //每次都是新窗口打开为_blank,打开同一窗口填写任意字符串
-  }
-  const newWindowLocation = `width=${newinConf.width}, height=${newinConf.height}, left=${newinConf.left}, top=${newinConf.top} scrollbars=yes`
-  window.open('./emergency.html?disName='+disName, newinConf.openMode, newWindowLocation)
-}
-$(document).on('click',".allDis .allName",function(){
-  handleShow()
-})
-$(document).on('click',".singleDis",function(){
-  $(this).next().css("display","block")
-  $(this).css("display","none")
-})
-$(document).on('click',".allDis .right,.allDis .secDis",function(){
-  $(".allDis").css("display","none")
-  $(".singleDis").css("display","block")
-})
-
-
-function renderPushData(){
-  return getPushInfo().then(res =>{
-    if(res.data.code == "0"){
-      const result = res.data.data.debug['数据']
-      let allData = {}
-      allData.chiefLabel = result.chiefLabel //主诉
-      allData.presentLabel = result.presentLabel //现病史
-      allData.pastLabel = result.pastLabel //既往史
-      allData.personalLabel = result.personalLabel //个人史
-      allData.familyLabel = result.familyLabel //家族史
-      allData.maritalLabel = result.maritalLabel //婚育史
-      allData.menstrualLabel = result.menstrualLabel //月经史
-      allData.vitalLabel = result.vitalLabel //体格
-      console.log(allData)
-      
-    }
-  })
-}
-
-function getPushInfo() {
-  return  post(config.pushInner,Object.assign({},msg,{featureType: '1,4,5,6,7,8,9,10',hospitalId:hospitalIdUrl||msg.hospitalId,ruleType:config.ruleTypeMap['22']}))
-}

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,124 +1,141 @@
 var $ = require("jquery");
 var { post,config,getUrlArgObject,openNewWin,isIe8 ,openNewWin} = require('./promise.js');
-let showImg = require('./../images/show2.png').replace(/^undefined/g, '')
-let collapseImg = require('./../images/collapse2.png').replace(/^undefined/g, '')
+let showImg = require('./../images/show.png').replace(/^undefined/g, '')
+let collapseImg = require('./../images/collapse.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.filter((it)=>it.history===0)||[];
+        operaItemDetail.length=operaItemDetail.length>0?1:0;
         renderDetailHorizontal(operaItemDetail)
-    }else{
+    } else {
         renderBtn(operaItemDetail)
         renderDetail(operaItemDetail)
-        checkDom()
-    }   
+        //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").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>`)
+    //最近一次计划默认展开
+    $(".laterWrap .infoBox:first-child .childrenBox").show();
+    $(".laterWrap .infoBox:first-child .toggleInfo").attr("src",collapseImg)
     // adjustHeight()
     bindToggleInfo()
-  
+
 }
 function renderBtn(data){
     const hasBtn = data[0]&&data[0].history&&data[0].history === 1
@@ -126,24 +143,24 @@ function renderBtn(data){
         return
     }
     const str = `<div class="btnBox" id="btnBox"><span class="btnName">显示历史计划</span></div>`
-    $(".followUpWrap").append(str)
+    $(".operaNameWrap").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 +173,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 +186,19 @@ function checkDom() {
         cheakDomTimer = setTimeout(checkDom, 200)
     }
 }
-function bindToggleHistory(){
-    $(document).on("click",".btnName",function(){
+function bindToggleHistory() {
+    $(".followUpWrap .btnName").off("click").on("click",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,7 +208,7 @@ 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>
@@ -199,14 +216,14 @@ function followEmpty(){
     $(".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/homeStatic.js

@@ -29,7 +29,7 @@ function renderTab(data){
 //搜索跳转
 function goSearchList(){
   $(".searchBtn").click(function(){
-    let vals = $('.searchStr').val()
+    let vals = $('.searchStr').val().replace(/(^\s*)|(\s*$)/g, "")
       if (!vals) {
           $(".staticResult .loading").hide();
           toggleWarnBox('检索词不能为空！');
@@ -40,16 +40,16 @@ function goSearchList(){
 }
 //获取字典信息
 function getAllTypes(){
-  const allTypes = localStorage.getItem('allTypes')&&JSON.parse(localStorage.getItem('allTypes'))||[];
+  /*const allTypes = localStorage.getItem('allTypes')&&JSON.parse(localStorage.getItem('allTypes'))||[];
   if(allTypes.length>0){
     renderTab(allTypes)
     return
-  }
+  }*/
   post(config.dictionaryInfo, {}).then((res) => {
     const result = res.data
     if(result.code==='0'){
       const data = result.data[7]||[];
-      localStorage.setItem('allTypes',JSON.stringify(data))
+      //localStorage.setItem('allTypes',JSON.stringify(data))
       renderTab(data)
     }
   })