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

# Conflicts:
#	src/components/prodlinechart/bottom2Chart/index.vue

src/views/quality/bottom1.vue

@@ -57,7 +57,7 @@ export default {
         headerBGC: 'rgba(15,19,37,0.1)', //表头
         oddRowBGC: 'rgba(15,19,37,0.1)', //奇数行
         evenRowBGC: 'rgba(23,28,51,0.1)', //偶数行
-        columnWidth: [200,220,130],
+        columnWidth: [150,300,110],
         align: ['center','center','center']
       },
       firstdata:{

src/views/warehouse/up3.vue

@@ -22,9 +22,9 @@ export default {
         data: [],
         rowNum: 10, //表格行数
         headerHeight: 40,
-        headerBGC: '#0f1325', //表头
-        oddRowBGC: '#0f1325', //奇数行
-        evenRowBGC: '#171c33', //偶数行
+        headerBGC: 'rgba(15,19,37,0.1)', //表头
+        oddRowBGC: 'rgba(15,19,37,0.1)', //奇数行
+        evenRowBGC: 'rgba(23,28,51,0.1)', //偶数行
         columnWidth: [200,200, 200],
         align: ['center','center','center']
       },