Browse Source

修改看板

callm 1 year ago
parent
commit
c93fc2e60f

+ 15 - 26
src/components/assemblyechart/bottom/bottomLeft2Chart/chart.vue

@@ -72,21 +72,6 @@ export default {
 
         ],
         series: [
-          {
-            name: '投入',
-            type: 'bar',
-            barWidth: 15,
-            emphasis: {
-              focus: 'series'
-            },
-            data:[],
-            label: {
-              show: true,
-              position: 'top',
-              fontSize:14,
-              fontWeight: "bold"
-            },
-          },
           {
             name: '产出',
             type: 'bar',
@@ -112,7 +97,18 @@ export default {
             //data: [12, 22, 32, 12, 32, 12, 32],
             emphasis: {
               focus: 'series'
-            }
+            },
+            itemStyle: {
+              normal: {
+                barBorderRadius: 6,
+                color:  "rgba(255,153,0)"
+                /* 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)" }
+                 ])*/
+              }
+            },
           },
           {
             name: '良率%',
@@ -192,32 +188,25 @@ export default {
             let series1 = new Array();
             let series2 = new Array();
             let series3 = new Array();
-            let series4 = new Array();
         var maxnumber=0;
         for (let index = 0; index < dataList.length; index++) {
           const element = dataList[index];
           xAxis0.push(element.sp_wccode);
-          //投入
-          series0.push(element.v_inqty);
-          if(element.v_inqty>maxnumber){
-            maxnumber= element.v_inqty;
-          }
           //产出
-          series1.push(element.v_outqty);
+          series0.push(element.v_outqty);
           if(element.v_outqty>maxnumber){
             maxnumber= element.v_outqty;
           }
           //不良
-          series2.push(element.v_ngqty);
+          series1.push(element.v_ngqty);
           //良率
-          series3.push(element.v_okrate);
+          series2.push(element.v_okrate);
         }
         this.options.xAxis[0].data = xAxis0;
         this.options.series[0].data = series0;
         this.options.series[1].data = series1;
         this.options.series[2].data = series2;
         this.options.series[3].data = series3;
-        this.options.series[4].data = series4;
         this.options.yAxis[0].max = (maxnumber*1.2).toFixed();
             /*let myChart = this.$children[0].chart;
             myChart.setOption({

+ 4 - 46
src/components/hjechart/bottom/bottomLeft2Chart/chart.vue

@@ -72,21 +72,6 @@ export default {
 
         ],
         series: [
-          {
-            name: '投入',
-            type: 'bar',
-            barWidth: 15,
-            emphasis: {
-              focus: 'series'
-            },
-            data:[],
-            label: {
-              show: true,
-              position: 'top',
-              fontSize:14,
-              fontWeight: "bold"
-            },
-          },
           {
             name: '产出',
             type: 'bar',
@@ -147,25 +132,6 @@ export default {
             emphasis: {
               focus: 'series'
             }
-          }, {
-            name: 'UPH',
-            type: 'line',
-            symbolSize: 8,
-            barWidth: 15,
-            data:[],
-            //data: [12, 22, 32, 12, 32, 12, 32],
-            emphasis: {
-              focus: 'series'
-            },
-            lineStyle: {
-              width: 4
-            },
-            label: {
-              show: true,
-              position: 'top',
-              fontSize:14,
-              fontWeight: "bold"
-            }
           }
         ]
       },
@@ -214,24 +180,16 @@ export default {
           const element = dataList[index];
           xAxis0.push(element.sp_wccode);
           //投入
-          series0.push(element.v_inqty);
-          if(element.v_inqty>maxnumber){
-            maxnumber= element.v_inqty;
-          }
-          //产出
-          series1.push(element.v_outqty);
+
+          series0.push(element.v_outqty);
           if(element.v_outqty>maxnumber){
             maxnumber= element.v_outqty;
           }
           //不良
-          series2.push(element.v_ngqty);
+          series1.push(element.v_ngqty);
           //良率
-          series3.push(element.v_okrate);
+          series2.push(element.v_okrate);
           //UPH
-          series4.push(element.uph);
-          if(element.uph>maxnumber){
-            maxnumber= element.uph;
-          }
         }
         this.options.xAxis[0].data = xAxis0;
         this.options.series[0].data = series0;

+ 4 - 4
src/components/hjechart/bottom/bottomRightChart/index.vue

@@ -70,7 +70,7 @@ export default {
                         let dataList = JSON.parse(result.data.data);
                         let weekCategory = new Array();
                         let weekLineData = new Array();
-                        let goaldata ;
+                       // let goaldata ;
                         let minDa = dataList[0].v_okrate ;
                         for (let index = 0; index < dataList.length; index++) {
                           const element = dataList[index];
@@ -82,16 +82,16 @@ export default {
                           if(element.v_okrate<minDa){
                             minDa = element.v_okrate;
                           }
-                          if(index == 0){
+                         /* if(index == 0){
                             goaldata = element.v_ligoaldata;
-                          }
+                          }*/
                         }
                         //获取最小值,取整十的数
                         minDa = Math.floor(minDa/10)*10;
                         this.cdata.minData = minDa;
                         this.cdata.weekCategory = weekCategory;
                         this.cdata.weekLineData = weekLineData;
-                        this.cdata.goalData = goaldata;
+                       // this.cdata.goalData = goaldata;
                       },(result)=>{
                         console.error(result)
                       }

File diff suppressed because it is too large
+ 330 - 330
yarn.lock


Some files were not shown because too many files changed in this diff