Browse Source

柯赛看板,品质修改

xiaost 7 months ago
parent
commit
18ee15d6e6
2 changed files with 30 additions and 65 deletions
  1. 27 65
      src/views/quality/bottom2.vue
  2. 3 0
      src/views/quality/up1.vue

+ 27 - 65
src/views/quality/bottom2.vue

@@ -61,73 +61,35 @@ export default {
             let series = new Array();
             let xAxis0 = new Array();
             let mindata = 100;
-            //获取总共有多少个线别
-            const groupByLonglineMap = dataList.reduce((result, currentItem) => {
-              // 使用 key 函数提取分组键
-            const groupKey = currentItem["v_longline"];
-              // 初始化分组数组(如果尚未创建)
-             if (!result[groupKey]) {
-                result[groupKey] = [];
-             }
-              // 将当前项添加到分组数组
-              result[groupKey].push(currentItem);
-              return result;
-            }, {});
-
-            //const groupByLonglineMap = Array.groupBy(dataList, (dataList) => dataList.v_longline);
-            const longlines = Array.from(new Set(dataList.map(item => item['v_longline']))).join().split(",");
-            let seriesdata = new Array();
-            for (let value of longlines) {
-              let se = new Object();
-              se.name  = value;
-              se.data = new Array();
-              seriesdata.push(se);
-            }
-            //15天内
-            for (let i =14 ;i>=0;i--){
-              let formattedDate;
-              if(i == 0){
-                formattedDate = this.$moment().format('MM/DD');
-              }else{
-                formattedDate = this.$moment().subtract(i, 'days').format('MM/DD')
-              }
-              xAxis0.push(formattedDate);
-              //获取分组当天数据
-              for (let value of seriesdata) {
-                let dataall = groupByLonglineMap[value.name];
-                let data0 = '-';
-                if(null != dataall) {
-                  let datam = dataall.filter(item => item.v_ymd1 == formattedDate);
-                  if(datam.length>0){
-                    data0 = datam[0].v_ztrate;
-                    if(mindata>data0){
-                      mindata = data0;
-                    }
-                  }
-                }
-                value.data.push(data0);
+            let ndata = new Array();
+            for (let index = 0; index < dataList.length; index++) {
+              const element = dataList[index];
+              xAxis0.push(element.v_ymd);
+              ndata.push(element.v_ztrate);
+              if(mindata>element.v_ztrate){
+                mindata = element.v_ztrate;
               }
             }
-            for (let value of seriesdata) {
-              series.push({
-                name: value.name,
-                type: 'line',
-                data: value.data,
-                symbolSize: 4,
-                lineStyle: {
-                  width: 3
-                },
-                /*itemStyle: {
-                normal: {
-                  barBorderRadius: 6,
-                      color:  "rgb(42,87,42)"
-                }
-              },*/
-                emphasis: {
-                  focus: 'series'
-                }
-              });
-            }
+            series.push({
+              name: 'OQC',
+              type: 'line',
+              data: ndata,
+              symbolSize: 4,
+              lineStyle: {
+                width: 3
+              },
+              label: {
+                show: true,
+                position: 'top',
+                fontSize:15,
+                color:'inherit',
+                fontWeight: "bold"
+              },
+              emphasis: {
+                focus: 'series'
+              },
+            });
+
             this.linedata.series = series;
             this.linedata.xAxiss = xAxis0;
             //最小值往下取整10的倍数,然后减20

+ 3 - 0
src/views/quality/up1.vue

@@ -136,6 +136,9 @@ export default {
           const element = dataList[index];
           xAxis0.push(element.v_ymd);
           ndata.push(element.v_okrate);
+          if(mindata>element.v_okrate){
+            mindata = element.v_okrate;
+          }
         }
         //7天内
         /* let ndata = new Array();