看板- 样式调整

src/components/packageechart/bottom/bottomLeft2Chart/chart.vue

@@ -24,7 +24,13 @@ export default {
             type: 'shadow'
           }
         },
-        legend: {},
+        legend: {
+          textStyle: {
+            fontSize: 18
+          },
+          itemWidth: 29,
+          itemHeight: 19
+        },
         grid: {
           left: '3%',
           right: '4%',
@@ -34,13 +40,19 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data:[]
-            //data: ['插件-01', '插件-02', '插件-03', '插件-04', '插件-05', '插件-06', '插件-07'],
+            data:[],
+            axisLabel: {
+              fontSize: 16,
+              fontWeight: "bold"
+            }
           }
         ],
         yAxis: [
           {
             type: 'value',
+            axisLabel: {
+              fontSize: 16
+            }
           },
           {
             type: 'value',
@@ -48,8 +60,12 @@ export default {
             min: 0,
             max: 100,
             interval: 20,
+            nameTextStyle: {
+              fontSize: 20
+            },
             axisLabel: {
-              formatter: '{value}%'
+              formatter: '{value}%',
+              fontSize: 16
             }
           }
 
@@ -62,8 +78,13 @@ export default {
             emphasis: {
               focus: 'series'
             },
-            data:[]
-            //data: [320, 332, 301, 334, 390, 330, 320]
+            data:[],
+            label: {
+              show: true,
+              position: 'top',
+              fontSize:14,
+              fontWeight: "bold"
+            },
           },
           {
             name: '产出',
@@ -73,8 +94,13 @@ export default {
             emphasis: {
               focus: 'series'
             },
-            data:[]
-            //data: [220, 232, 221, 234, 290, 230, 220]
+            data:[],
+            label: {
+              show: true,
+              position: 'inside',
+              fontSize:14,
+              fontWeight: "bold"
+            },
           },
           {
             name: '不良',
@@ -92,20 +118,29 @@ export default {
             type: 'line',
             data:[],
             yAxisIndex: 1,
-            //data: [92, 92,92, 72, 82, 62, 62],
+            symbolSize: 8,
+            label: {
+              show: true,
+              position: 'top',
+              color:'#fff'
+            },
             tooltip: {
               valueFormatter: function (value) {
                 return value + '%';
               }
             },
+            lineStyle: {
+              width: 4
+            },
             itemStyle: {
               normal: {
-                barBorderRadius: 5,
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                barBorderRadius: 6,
+                color:  "rgba(156,107,211,0.8)"
+               /* color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   { offset: 0, color: "rgba(156,107,211,0.8)" },
                   { offset: 0.2, color: "rgba(156,107,211,0.5)" },
                   { offset: 1, color: "rgba(156,107,211,0.2)" }
-                ])
+                ])*/
               }
             },
             emphasis: {

src/components/packageechart/bottom/bottomRightChart/chart.vue

@@ -111,7 +111,7 @@ export default {
             subtext: newData.year + '/' + newData.nowdate,
             subtextStyle: {
               color: '#fff',
-              fontSize: 16
+              fontSize: 18
             },
             top: 50,
             left: 80
@@ -121,12 +121,12 @@ export default {
             left: 80,
             orient: 'vertical',
             itemGap: 15,
-            itemWidth: 12,
-            itemHeight: 12,
+            itemWidth: 14,
+            itemHeight: 14,
             data: ['实际','平均'],
             textStyle: {
               color: '#fff',
-              fontSize: 14
+              fontSize: 16
             }
           },
           tooltip: {
@@ -136,7 +136,8 @@ export default {
             center: ['68%', '27%'],
             radius: '40%',
             name: {
-              color: '#fff'
+              color: '#fff',
+              fontSize:16
             },
             splitNumber: 8,
             axisLine: {
@@ -192,7 +193,7 @@ export default {
             axisLine: true,
             axisLabel: {
               color: 'rgba(255,255,255,.8)',
-              fontSize: 12
+              fontSize: 15
             },
             data: newData.weekCategory
           },
@@ -223,7 +224,7 @@ export default {
             },
             axisLabel: {
               color: 'rgba(255,255,255,.8)',
-              fontSize: 12
+              fontSize: 14
             }
           },
           series: [
@@ -305,6 +306,11 @@ export default {
                 }
               },
               data: newData.weekLineData,
+              label: {
+                show: true,
+                position: 'top',
+                fontSize:14,
+              },
               lineSmooth: true,
               markLine: {
                 silent: true,
@@ -322,6 +328,7 @@ export default {
                 },
                 lineStyle: {
                   normal: {
+                    fontSize: 16,
                     color: 'rgba(248,211,81,.7)'
                   }
                 }

src/components/smtechart/up/up1Chart/chart.vue

@@ -97,7 +97,7 @@ export default {
             data:[],
             label: {
               show: true,
-              position: 'top',
+              position: 'inside',
               fontSize:14,
               fontWeight: "bold"
             },
@@ -122,19 +122,24 @@ export default {
             type: 'line',
             data:[],
             yAxisIndex: 1,
+            symbolSize: 8,
             tooltip: {
               valueFormatter: function (value) {
                 return value + '%';
               }
             },
+            lineStyle: {
+              width: 4
+            },
             itemStyle: {
               normal: {
-                barBorderRadius: 5,
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: "rgba(156,107,211,0.8)" },
-                  { offset: 0.2, color: "rgba(156,107,211,0.5)" },
-                  { offset: 1, color: "rgba(156,107,211,0.2)" }
-                ])
+                barBorderRadius: 6,
+                color:  "rgba(156,107,211,0.8)"
+                /* color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                   { offset: 0, color: "rgba(156,107,211,0.8)" },
+                   { offset: 0.2, color: "rgba(156,107,211,0.5)" },
+                   { offset: 1, color: "rgba(156,107,211,0.2)" }
+                 ])*/
               }
             },
             emphasis: {
@@ -144,7 +149,8 @@ export default {
               show: true,
               position: 'top',
               fontSize:14,
-              fontWeight: "bold"
+              fontWeight: "bold",
+              color:'#fff'
             },
           }
         ]

src/main.js

@@ -73,7 +73,7 @@ Vue.prototype.$http.interceptors.request.use(config => {
     config.headers['x-access-token'] = sessionStorage.getItem('x-access-token');
   }
   if(config.params && config.params['condition']) {
-    console.log(sessionStorage.getItem('li_code'));
+    //console.log(sessionStorage.getItem('li_code'));
     config.params['condition'] = config.params['condition'] + " and V_LICODE='"+sessionStorage.getItem('li_code')+"'";
   }
   return config;

src/views/package/centerLeft_two.vue

@@ -89,6 +89,7 @@ export default {
                         }
                       }
                       this.titleItem = titleitems;
+                      console.log(titleitems);
                       },(result)=>{
                         console.error(result)
                       }

src/views/smt/bottom2.vue

@@ -32,15 +32,15 @@
     data() {
       return {
         config1: {
-          header: ['供料器','位置','抛料率', '抛料数'],
+          header: ['线别','机台','料号','抛料率%', '抛料数'],
           data: [],
           rowNum: 5, //表格行数
           headerHeight: 35,
           headerBGC: '#0f1325', //表头
           oddRowBGC: '#0f1325', //奇数行
           evenRowBGC: '#171c33', //偶数行
-          columnWidth: [200,200,150,150],
-           align: ['center','center','center','center']
+          columnWidth: [120,100,250,130,130],
+           align: ['center','center','center','center','center']
         },
         config2: {
           header: ['工单号','类型','编号','使用次数'],
@@ -50,7 +50,7 @@
           headerBGC: '#0f1325', //表头
           oddRowBGC: '#0f1325', //奇数行
           evenRowBGC: '#171c33', //偶数行
-          columnWidth: [200,150,200,150],
+          columnWidth: [200,90,280,150],
           align: ['center','center','center','center']
         }
       }
@@ -78,9 +78,10 @@
                           for (let index = 0; index < dataList.length; index++) {
                             const element = dataList[index];
                             let item = new Array();
-                            //'供料器','位置','抛料率', '抛料数'
-                            item.push(element.prodcode);
+                            //"线别", "机台", "料号", "抛料率", "抛料数"
+                            item.push(element.v_licode);
                             item.push(element.prlocation);
+                            item.push(element.prodcode);
                             item.push(element.plrate);
                             item.push(element.plqty);
                            /* item.push("<span  class='colorGrass'>" + element.testqty + "</span>");