Merge remote-tracking branch 'origin/yidin-vue' into yidin-vue

src/components/prodlinechart/bottom1Chart/chart.vue

@@ -99,7 +99,7 @@ export default {
             data:[],
             label: {
               show: true,
-              position: 'inside',
+              position: 'top',
               fontSize:14,
               fontWeight: "bold",
               color:"inherit",

src/components/prodlinechart/bottom2Chart/chart.vue

@@ -102,7 +102,7 @@ export default {
               position: 'inside',
               fontSize:14,
               fontWeight: "bold",
-              color:'#19be6b',
+              color:'#fff',
             },
           },
           {
@@ -114,7 +114,14 @@ export default {
             //data: [12, 22, 32, 12, 32, 12, 32],
             emphasis: {
               focus: 'series'
-            }
+            },
+            label: {
+              show: true,
+              position: 'top',
+              fontSize:14,
+              fontWeight: "bold",
+              color:'inherit',
+            },
           },
           {
             name: 'UPPH',

src/components/shopechart/bottom1Chart/chart.vue

@@ -107,7 +107,7 @@ export default {
             data:[],
             label: {
               show: true,
-              position: 'inside',
+              position: 'top',
               fontSize:14,
               fontWeight: "bold",
               color:"inherit",

src/components/shopechart/bottom2Chart/chart.vue

@@ -107,7 +107,8 @@ export default {
               position: 'inside',
               fontSize:14,
               fontWeight: "bold",
-              color:"inherit",
+             // color:"inherit",
+              color:'#fff'
             },
           },
           {
@@ -115,6 +116,13 @@ export default {
             type: 'bar',
             stack: 'Ad',
             barWidth: 10,
+            label: {
+              show: true,
+              position: 'top',
+              fontSize:14,
+              fontWeight: "bold",
+              color:"inherit",
+            },
             data:[],
             //data: [12, 22, 32, 12, 32, 12, 32],
             emphasis: {
@@ -165,7 +173,8 @@ export default {
             emphasis: {
               focus: 'series'
             }
-          }, {
+          },
+          {
             name: 'UPH',
             type: 'line',
             barWidth: 15,

src/components/zxshopechart/bottom1Chart/chart.vue

@@ -107,7 +107,7 @@ export default {
             data:[],
             label: {
               show: true,
-              position: 'inside',
+              position: 'top',
               fontSize:14,
               fontWeight: "bold",
               color:"inherit",

src/components/zxshopechart/bottom2Chart/chart.vue

@@ -107,7 +107,7 @@ export default {
               position: 'inside',
               fontSize:14,
               fontWeight: "bold",
-              color:"inherit",
+              color:"fff",
             },
           },
           {
@@ -119,7 +119,12 @@ export default {
             //data: [12, 22, 32, 12, 32, 12, 32],
             emphasis: {
               focus: 'series'
-            }
+            },
+            label: {
+              show: true,
+              position: 'top',
+              color:'inherit'
+            },
           },
           {
             name: 'UPPH',

src/views/prodline/index.vue

@@ -171,7 +171,7 @@ export default {
     cancelLoading() {
       setTimeout(() => {
         this.loading = false
-      }, 5000)
+      }, 1000)
     },
     handleBlur (val){
       this.setFactory(val);

src/views/prodline/up3.vue

@@ -71,7 +71,7 @@ export default {
       this.settestdata(); //获取数据
       this.timing = setInterval(() => {
         this.settestdata(); //获取-主题词
-      }, 10000);
+      }, 30000);
     },
     async settestdata() {
       //人员管理

src/views/quality/bottom3.vue

@@ -126,7 +126,7 @@ $box-width: 100%;
         font-size: 20px;
       }
       .dv-scroll-board {
-        height: 200px;
+        height: 190px;
       }
     }
   }

src/views/quality/index.vue

@@ -165,7 +165,7 @@ export default {
     cancelLoading() {
       setTimeout(() => {
         this.loading = false
-      }, 5000)
+      }, 1000)
     },
     handleBlur (val) {
       this.setFactory(val);

src/views/shop/index.vue

@@ -175,7 +175,7 @@ export default {
     cancelLoading() {
       setTimeout(() => {
         this.loading = false
-      }, 5000)
+      }, 1000)
     },
     handleBlur (val){
       this.setFactory(val);

src/views/zxshop/index.vue

@@ -168,7 +168,7 @@ export default {
     cancelLoading() {
       setTimeout(() => {
         this.loading = false
-      }, 5000)
+      }, 1000)
     },
    /* handleBlur (val){
       this.setFactory(val);