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

src/css/staticInfo.less

@@ -304,4 +304,28 @@
   left: 20px;
   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);
+}
+
+.infos::-webkit-scrollbar-thumb, .anchors::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  width: 6px;
+  border-radius: 5px;
+  background: @staticMainColor;
+  height: 100px;
+}
+
+.infos::-webkit-scrollbar-track, .anchors::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  border-radius: 2px;
+  background: #f0f2f5;
+  opacity: .2;
+}

src/js/cdss.js

@@ -106,7 +106,11 @@ function getConf() {
 }
 
 function getPushInfo() {
-  return  post(config.pushInner,Object.assign({},msg,{featureType: '1,4,5,6,7,8,9,10,11',hospitalId:hospitalIdUrl||msg.hospitalId,ruleType:config.ruleTypeMap['22']}))
+    return post(config.pushInner, Object.assign({}, msg, {
+        featureType: '1,4,5,6,7,8,9,10,12',
+        hospitalId: hospitalIdUrl || msg.hospitalId,
+        ruleType: config.ruleTypeMap['22']
+    }))
   
 }
 function getPusgWarning(){

src/js/cdssHorizontal.js

@@ -53,7 +53,11 @@ function getConf() {
   return post(config.getPushSet,{hospitalId:hospitalIdUrl||msg.hospitalId||1,planCode: planCode})
 }
 function getPushInfo() {
-  return  post(config.pushInner,Object.assign({},msg,{featureType: '1,4,5,6,7,8,9,10,11',hospitalId:hospitalIdUrl||msg.hospitalId,ruleType:config.ruleTypeMap['22']}))
+    return post(config.pushInner, Object.assign({}, msg, {
+        featureType: '1,4,5,6,7,8,9,10,12',
+        hospitalId: hospitalIdUrl || msg.hospitalId,
+        ruleType: config.ruleTypeMap['22']
+    }))
   
 }
 function getPusgWarning(){