质量月报 - 裂解C5相关指标趋势图优化

ui/src/views/production/quality/index.vue

@@ -4103,18 +4103,30 @@ export default {
           this.disposeChart();
           listS6301(this.analysisQueryParams).then(response => {
             let data = response.data;
-            let c5ConjugatedDienesDcpd30Array = [];
-            let c5ConjugatedDienesDcpd40Array = [];
+            let c5ConjugatedDienesDcpdArray = [];
             let c250Array = [];
             let c4Array = [];
-            let c410Array = [];
             let sampleDateArray = [];
             for(let i = 0 ; i < data.length; i++){
-              c5ConjugatedDienesDcpd30Array.push(data[i].c5ConjugatedDienesDcpd30);
-              c5ConjugatedDienesDcpd40Array.push(data[i].c5ConjugatedDienesDcpd40);
+              let c5ConjugatedDienesDcpd30 = data[i].c5ConjugatedDienesDcpd30;
+              let c5ConjugatedDienesDcpd40 = data[i].c5ConjugatedDienesDcpd40;
+              if (c5ConjugatedDienesDcpd30 != null) {
+                c5ConjugatedDienesDcpdArray.push(c5ConjugatedDienesDcpd30);
+              } else if (c5ConjugatedDienesDcpd40 != null) {
+                c5ConjugatedDienesDcpdArray.push(c5ConjugatedDienesDcpd40);
+              } else {
+                c5ConjugatedDienesDcpdArray.push("");
+              }
               c250Array.push(data[i].c250);
-              c4Array.push(data[i].c4);
-              c410Array.push(data[i].c410);
+              let c4 = data[i].c4;
+              let c410 = data[i].c410;
+              if (c4 != null) {
+                c4Array.push(c4);
+              } else if (c410 != null) {
+                c4Array.push(c410);
+              } else {
+                c4Array.push("");
+              }
               sampleDateArray.push(data[i].sampleDate);
             }
             let option = {
@@ -4131,7 +4143,7 @@ export default {
               legend: {
                 x: 'center',
                 y: 'bottom',
-                data: ['碳五共轭双烯烃+双环戊二烯>=30', '碳五共轭双烯烃+双环戊二烯>=40', 'C250 灵敏板T', 'C4及C4以下组分含量', 'C4及C4以下组分含量<=10']
+                data: ['碳五共轭双烯烃+双环戊二烯', 'C250 灵敏板T', 'C4及C4以下组分含量']
               },
               grid: {
                 top: '10%',
@@ -4154,34 +4166,35 @@ export default {
                   rotate: 45
                 }
               },
-              yAxis: {
-                type: 'value'
-              },
-              series: [
+
+              yAxis: [
                 {
-                  name: '碳五共轭双烯烃+双环戊二烯>=30',
-                  type: 'line',
-                  data: c5ConjugatedDienesDcpd30Array
+                  type: 'value',
+                  position: 'left'
                 },
                 {
-                  name: '碳五共轭双烯烃+双环戊二烯>=40',
+                  type: 'value',
+                  position: 'right'
+                }
+              ],
+              series: [
+                {
+                  name: '碳五共轭双烯烃+双环戊二烯',
                   type: 'line',
-                  data: c5ConjugatedDienesDcpd40Array
+                  data: c5ConjugatedDienesDcpdArray,
+                  yAxisIndex: 0
                 },
                 {
                   name: 'C250 灵敏板T',
                   type: 'line',
-                  data: c250Array
+                  data: c250Array,
+                  yAxisIndex: 0
                 },
                 {
                   name: 'C4及C4以下组分含量',
                   type: 'line',
-                  data: c4Array
-                },
-                {
-                  name: 'C4及C4以下组分含量<=10',
-                  type: 'line',
-                  data: c410Array
+                  data: c4Array,
+                  yAxisIndex: 1
                 }
               ]
             };