Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/aps/ai/components/excute.vue

@@ -335,7 +335,7 @@ export default {
       Api.getbyorderid(params).then(res => {
         if (res.success) {
           this.gridHeight = 50;
-          this.gridHeight = (res.result.length + 1) * 42;
+          this.gridHeight = (res.result.length + 1) * 47;
           this.data1 = res.result;
         }
       });

pages/aps/aps/components/excute.vue

@@ -395,7 +395,7 @@ export default {
       Api.getbyorderid(params).then(res => {
         if (res.success) {
           this.gridHeight = 50;
-          this.gridHeight = (res.result.length + 1) * 42;
+          this.gridHeight = (res.result.length + 1) * 47;
           this.data1 = res.result;
         }
       });

pages/demo/lid/components/sideEast.vue

  <template>
   <div class="demoDiv">
-    <Card style="width:100%; box-shadow: 0 0 10px #000;">
+    <Card style="width:100%; box-shadow: 0 0 10px #666;">
       <p slot="title" class="tl">任务执行状态统计</p>
       <div style="height:300px;">
         <Echart3 class="echartPo" />
@@ -90,7 +90,7 @@ export default {
   width: 320px;
   background: #fff;
   border-radius: 5px;
-  box-shadow: 0 0 10px #000;
+  box-shadow: 0 0 10px #666;
   text-align: left;
   padding: 20px;
   height: 310px;

pages/demo/lid/components/sideWest.vue

@@ -19,7 +19,7 @@
       </p>
     </div>
     <div class="mt30 demoDiv">
-      <Card class="mt10" style="width:100%; box-shadow: 0 0 10px #000">
+      <Card class="mt10" style="width:100%; box-shadow: 0 0 10px #666">
         <p slot="title" class="tl">实时行车异常列车</p>
         <div class="divInfoWest">
           <p>地址：山西省西安市未央区</p>
@@ -79,7 +79,7 @@ export default {
     background: url(/imgshow/bg1.png) right top no-repeat,
       linear-gradient(to right, #43aaf9 0%, #917dfb 100%);
     border-radius: 5px;
-    box-shadow: 0 0 10px #000;
+    box-shadow: 0 0 10px #666;
     color: white;
     height: 100px;
     width: 300px;
@@ -102,7 +102,7 @@ export default {
     background: url(/imgshow/bg3.png) right top no-repeat,
       linear-gradient(to right, #05e99c 0%, #7cf538 100%);
     border-radius: 5px;
-    box-shadow: 0 0 10px #000;
+    box-shadow: 0 0 10px #666;
     color: white;
     height: 100px;
     width: 300px;
@@ -125,7 +125,7 @@ export default {
     background: url(/imgshow/bg5.png) right top no-repeat,
       linear-gradient(to right, #f95577 0%, #fca534 100%);
     border-radius: 5px;
-    box-shadow: 0 0 10px #000;
+    box-shadow: 0 0 10px #666;
     color: white;
     height: 100px;
     width: 300px;