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

src/css/cdssHorizontal.less

@@ -11,7 +11,7 @@
   width: 43px;
   height: 100%;
   position: absolute;
-  background: @staticMainColor;
+  background: @bgcBlue;
   color: #fff;
   font-size: 12px;
   left: 0px;
@@ -79,7 +79,7 @@
 .activeTab {
   font-weight: 500;
   background: #e3f0ff;
-  color: @staticMainColor;
+  color: @bgcBlue;
 }
 .activeLine {
   display: none;
@@ -132,9 +132,8 @@
   padding: 0 0 0 110px;
   box-sizing: border-box;
   line-height: 27px;
-  &:hover{
-      
-background: #F6F6F6;
+  &:hover {
+    background: #f6f6f6;
   }
 }
 .moduleItemTitBox {
@@ -146,6 +145,9 @@ background: #F6F6F6;
   left: 0;
   margin-top: -1px;
 }
+.casewriting .moduleItemTitBox .moduleTitle {
+  color: @colorWaring;
+}
 .titleIcon {
   width: 20px;
   margin: 0px 5px 0 5px;
@@ -163,10 +165,10 @@ background: #F6F6F6;
 .moduleTitle {
   font-size: 14px;
   font-weight: 500;
-  color: @staticMainColor;
+  color: @bgcBlue;
 }
 .diag .moduleTitle {
-  color: #ff656b;
+  //   color: #ff656b;
 }
 .rightBox .moduleTitle {
   color: #1e1e1e;
@@ -265,7 +267,7 @@ background: #F6F6F6;
   cursor: pointer;
   position: absolute;
   line-height: 27px;
-  color: @staticMainColor;
+  color: @bgcBlue;
   right: 5px;
   bottom: 0;
 }
@@ -298,7 +300,7 @@ background: #F6F6F6;
   position: absolute;
   left: 0;
   font-size: 12px;
-  color: @staticMainColor;
+  color: @bgcBlue;
   //   background: #e2eaf2;
   border: 0px;
   display: inline-block;
@@ -307,7 +309,7 @@ background: #F6F6F6;
   top: 4px;
   padding: 2px 5px;
   border-radius: 9px;
-  border: 1px solid @staticMainColor;
+  border: 1px solid @bgcBlue;
 }
 .rightBoxTitle {
   height: 36px;
@@ -343,18 +345,19 @@ background: #F6F6F6;
   padding: 0 0 0 160px;
   // background: rgba(60,172,228,.17);
   // filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#333CACE4,endColorstr=#333CACE4);
-background: #FFF7F2;
-  margin-top: 5px;
+  background: #fff7f2;
+  margin-top: 7px;
   max-height: 81px;
   overflow-y: hidden;
   position: relative;
 }
 .casewriting .moduleItemTitBox {
   width: 160px;
-}
-.casewriting .moduleTitle {
   color: @colorWaring;
 }
+// .casewriting .moduleTitle {
+//   color: @colorWaring;
+// }
 .casewriting {
   position: relative;
   box-sizing: border-box;
@@ -440,6 +443,7 @@ background: #FFF7F2;
 }
 .medicalKonwledgeWrap {
   height: 202px;
+  overflow: auto;
 }
 .readMorePlan {
   margin-top: 20px;
@@ -454,7 +458,7 @@ background: #FFF7F2;
     list-style: none;
     display: inline-block;
 
-    color: @staticMainColor;
+    color: @bgcBlue;
   }
   img {
     width: 5px;
@@ -475,8 +479,8 @@ background: #FFF7F2;
     height: 22px;
     line-height: 22px;
     border-radius: 9px;
-    color: @staticMainColor;
-    border: 1px solid @staticMainColor;
+    color: @bgcBlue;
+    border: 1px solid @bgcBlue;
     text-align: center;
     font-size: 12px;
     img {
@@ -490,7 +494,7 @@ background: #FFF7F2;
   display: inline-block;
   width: 5px;
   height: 5px;
-  background: @staticMainColor;
+  background: @bgcBlue;
   border-radius: 50%;
   position: absolute;
   left: -10px;
@@ -500,7 +504,9 @@ background: #FFF7F2;
   // position: absolute;
   // left: 50px;
 }
-
+.qcWrap {
+  overflow-y: auto;
+}
 /*******中医********/
 .tcm-item {
   display: none;
@@ -514,10 +520,11 @@ background: #FFF7F2;
       vertical-align: middle;
       width: 20px;
       height: 20px;
+      margin-top: -1.5px;
     }
     .h2 {
       font-size: 14px;
-      color: @staticMainColor;
+      color: @bgcBlue;
     }
     .go {
       margin-right: 10px;
@@ -529,7 +536,6 @@ background: #FFF7F2;
         width: 5px;
         height: 9px;
         vertical-align: middle;
-        
       }
     }
   }
@@ -541,9 +547,9 @@ background: #FFF7F2;
     line-height: 25px;
     border-radius: 4px;
     text-align: center;
-    background: #E7F1FF;
+    background: #e7f1ff;
     text-decoration: none;
-    color: #1677FF;
+    color: #1677ff;
   }
   .content {
     .infos {
@@ -568,7 +574,7 @@ background: #FFF7F2;
       height: 24px;
     }
     .detail {
-      padding: 0 8px 8px 4px;
+      padding: 0 8px 27px 4px;
       margin-right: 20px;
       max-height: 125px;
       overflow-y: hidden;
@@ -582,10 +588,13 @@ background: #FFF7F2;
       }
       li {
         margin-bottom: 6px;
+        &:hover {
+          background: #f6f6f6;
+        }
       }
       .label {
         float: left;
-        border-left: 2px solid #267fd7;
+        border-left: 4px solid #267fd7;
         padding-left: 5px;
         line-height: 12px;
         margin-top: 4px;
@@ -601,6 +610,7 @@ background: #FFF7F2;
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
+          font-size: 12px;
           /*&:nth-child(2) {    //ie8不兼容，用jquery
                     width: 420px;
                   }*/
@@ -610,8 +620,8 @@ background: #FFF7F2;
     .a-link {
       display: inline-block;
       width: 100%;
-      border: 1px @staticMainColor solid;
-      color: @staticMainColor;
+      border: 1px @bgcBlue solid;
+      color: @bgcBlue;
       height: 30px;
       line-height: 30px;
       border-radius: 4px;
@@ -682,3 +692,8 @@ background: #FFF7F2;
   color: #333333;
   font-weight: 500;
 }
+.tcmWarp {
+  padding-bottom: 10px;
+  box-sizing: border-box;
+  overflow: auto;
+}

src/css/common.less

@@ -8,7 +8,7 @@
 @dangerColor:#FF7F5B; //警惕
 @shadowColor:#DEDDDD; //阴影颜色
 @linkColor:#1677FF; //链接颜色
-@warnColor:#FF8042;   //错误提示颜色
+@warnColor:#333130;   //错误提示颜色
 @suggerColor:#267FD7; //推送颜色
 @treatColor:#1ECEBD; //治疗颜色
 @pushBgColor:#E3F0FF; //推送title背景颜色

src/css/followUpV.less

@@ -99,7 +99,7 @@
     padding-bottom: 7px;
 }
 .followUpWrap .emptyBox{
-    margin-top: 100px;
+    margin-top: 50px;
     text-align: center;
 }
 .followUpWrap .emptyImg{

src/js/promise.js

@@ -19,8 +19,13 @@ let iconDiagPush2 = require('./../images/icon_diag_push2.png').replace(/^undefin
 let iconCommonTreatPush = require('./../images/icon_drug_push.png').replace(/^undefined/g, '')
 let iconCheckupPush = require('./../images/icon_checkup_push.png').replace(/^undefined/g, '')
 let iconTreat = require('./../images/zhiliao.png').replace(/^undefined/g, '')
+let writingNorms = require('./../images/writingNorms.png').replace(/^undefined/g, '')
+
 let iconTreatMedicine = require('./../images/treat_icon.png').replace(/^undefined/g, '')
 let iconCaseWrite = require('./../images/icon_case_write.png').replace(/^undefined/g, '')
+let intelligentDiagnosis = require('./../images/intelligentDiagnosis.png').replace(/^undefined/g, '')
+
+
 
 
 //重写assign方法imgR
@@ -192,7 +197,7 @@ const throttle = function (fn, threshhold) {
   }
 }
 const colorMap={
-  warnColor:'#FFE8DD', //智能警示等tab颜色
+  warnColor:'#FF7836', //智能警示等tab颜色
   suggerColor:'#E3F0FF', //推荐提示tab颜色
   treatColor:'#E3FEFE',  //治疗等tab颜色
 }
@@ -273,7 +278,7 @@ const titleConfigH = {
   },
   diagPush:{
     background: "#FAECED",
-    icon: iconDiagPush,
+    icon: intelligentDiagnosis,
     name:"智能诊断",
     location:"left"
   },
@@ -337,8 +342,8 @@ const titleConfigH = {
     name:"治疗方案"
   },
   casewritingPush:{
-    background: "#E3FEFE",
-    icon: iconTreat,
+    background: "#FFE8DD",
+    icon: writingNorms,
     name:"病历书写规范提示",
     location:"left"
   }