Merge branch 'master' of dd.tall.wiki:binbin0314/salt-lake-hospital

src/components/Duration/Duration.js

@@ -66,6 +66,11 @@ const mixin = {
             // symbol: 'star',
             data: this.pointTimeHospital,
             color: 'rgb(18, 131, 227)',
+            lineStyle: {
+              shadowColor: '#5cfbff',
+              shadowBlur: 8,
+              width: 4,
+            },
           },
           {
             name: '国际水准',
@@ -74,6 +79,11 @@ const mixin = {
             symbolSize: 6,
             data: this.pointTimeInternation,
             color: 'rgb(30, 231, 231)',
+            lineStyle: {
+              shadowColor: '#5cfbff',
+              shadowBlur: 8,
+              width: 4,
+            },
           },
           {
             name: '当前数据',
@@ -82,6 +92,11 @@ const mixin = {
             symbolSize: 6,
             data: this.pointTimeCurrentList,
             color: 'rgb(227, 18, 187)',
+            lineStyle: {
+              shadowColor: '#5cfbff',
+              shadowBlur: 8,
+              width: 4,
+            },
           },
         ],
       };

src/components/FastEd/FastEd.vue

@@ -15,6 +15,8 @@
         <div class="flex-1">{{ item.c }}</div>
       </div>
     </div>
+    <div class="mask-box1"></div>
+    <div class="mask-box2"></div>
   </div>
 </template>
 
@@ -72,6 +74,7 @@ export default {
        * 启动播报滚动事件
        */
       const that = this;
+
       window.onload = function() {
         // BBAllTime = 0;
         that.oMarquee = document.getElementById('bobaodiv'); //滚动对象
@@ -144,4 +147,26 @@ export default {
     align-items: center;
   }
 }
+
+.mask-box1 {
+  height: 25%;
+  width: 100%;
+  background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(4, 25, 49, 1)), to(rgba(4, 25, 49, 0)));
+  // rgba(4, 25, 49, 0);
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 100;
+}
+
+.mask-box2 {
+  height: 25%;
+  width: 100%;
+  background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(2, 53, 103, 0)), to(rgba(2, 53, 103, 1)));
+  // rgba(4, 25, 49, 0);
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 100;
+}
 </style>

src/components/Panel/Panel.vue

@@ -28,12 +28,7 @@
             <a-icon class="down-icon" type="caret-down" />
           </span>
         </div>
-        <a-progress
+        <a-progress :percent="percent" :show-info="false" :stroke-color="strokeColor" :stroke-width="strokeWidth" status="active" />
-          :percent="percent"
-          :show-info="false"
-          :stroke-color="strokeColor"
-          :stroke-width="strokeWidth"
-        />
         <div>123</div>
       </div>
     </div>

src/components/Sensor/Sensor.js

@@ -1,12 +1,4 @@
 var option = {
-  // title: {
-  //   left: '10%',
-  //   textStyle: {
-  //     fontWeight: 'normal',
-  //     color: '#ccc', //标题颜色
-  //   },
-  //   text: '震动传感器',
-  // },
   legend: {
     x: 'center',
     y: 'top',
@@ -102,7 +94,12 @@ var option = {
         },
       },
       areaStyle: {},
-      lineStyle: { normal: { color: 'rgb(91,225,251)', width: 2 } },
+      lineStyle: {
+        normal: {
+          color: 'rgb(91,225,251)',
+          width: 2,
+        },
+      },
     },
   ],
 };