质量月报

- 裂解C5相关指标
- S6301新增字段C4及C4以下组分含量、C4及C4以下组分含量<10、C250 灵敏板T
- S6301查询和导入等功能相应修改
- S6301导入模板修改

master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportController.java

@@ -1197,14 +1197,20 @@ public class TMonthlyQualityReportController extends BaseController
                         entity.setC5ConjugatedDienesDcpd30(cellValue);
                     } else if (j == 11) {
                         entity.setPentadieneCycc5(cellValue);
+                    } else if (j == 12) {
+                        entity.setC4(cellValue);
                     } else if (j == 14) {
                         entity.setC5ConjugatedDienesDcpd40(cellValue);
+                    } else if (j == 15) {
+                        entity.setC410(cellValue);
                     } else if (j == 17) {
                         entity.setTotalSulfur(cellValue);
                     } else if (j == 18) {
                         entity.setTotalSulfur150(cellValue);
                     } else if (j == 19) {
                         entity.setSilicon(cellValue);
+                    } else if (j == 20) {
+                        entity.setC250(cellValue);
                     }
                 }
                 tMonthlyQualityReportS6301Service.insertTMonthlyQualityReportS6301(entity);

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS6301.java

@@ -89,6 +89,39 @@ public class TMonthlyQualityReportS6301 extends BaseEntity
     /** 总硫<=150 */
     private String totalSulfur150;
 
+    /** C4及C4以下组分含量 */
+    private String c4;
+
+    /** C4及C4以下组分含量<=10.00 */
+    private String c410;
+
+    /** C250 灵敏板T */
+    private String c250;
+
+    public String getC250() {
+        return c250;
+    }
+
+    public void setC250(String c250) {
+        this.c250 = c250;
+    }
+
+    public String getC4() {
+        return c4;
+    }
+
+    public void setC4(String c4) {
+        this.c4 = c4;
+    }
+
+    public String getC410() {
+        return c410;
+    }
+
+    public void setC410(String c410) {
+        this.c410 = c410;
+    }
+
     public String getTotalSulfur150() {
         return totalSulfur150;
     }

master/src/main/resources/mybatis/production/TMonthlyQualityReportS6301Mapper.xml

@@ -28,10 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="startDate" column="start_date" />
         <result property="endDate" column="end_date" />
         <result property="totalSulfur150" column="total_sulfur150" />
+        <result property="c4" column="c4" />
+        <result property="c410" column="c410" />
+        <result property="c250" column="c250" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS6301Vo">
-        select d.id, d.total_sulfur150, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.ic5, d.dcpd, d.c5, d.c5_conjugated_dienes_dcpd_30, d.pentadiene_cycc5, d.c5_conjugated_dienes_dcpd_40, d.total_sulfur, d.silicon, d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time ,s.dept_name from t_monthly_quality_report_s6301 d
+        select d.id, d.c4, d.c410, d.c250, d.total_sulfur150, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.ic5, d.dcpd, d.c5, d.c5_conjugated_dienes_dcpd_30, d.pentadiene_cycc5, d.c5_conjugated_dienes_dcpd_40, d.total_sulfur, d.silicon, d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time ,s.dept_name from t_monthly_quality_report_s6301 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -54,6 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="silicon != null  and silicon != ''"> and silicon = #{silicon}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="totalSulfur150 != null "> and total_sulfur150 = #{totalSulfur150}</if>
+            <if test="c4 != null "> and c4 = #{c4}</if>
+            <if test="c410 != null "> and c410 = #{c410}</if>
+            <if test="c250 != null "> and c250 = #{c250}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -91,6 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="totalSulfur150 != null">total_sulfur150,</if>
+            <if test="c4 != null">c4,</if>
+            <if test="c410 != null">c410,</if>
+            <if test="c250 != null">c250,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -113,6 +122,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="totalSulfur150 != null">#{totalSulfur150},</if>
+            <if test="c4 != null">#{c4},</if>
+            <if test="c410 != null">#{c410},</if>
+            <if test="c250 != null">#{c250},</if>
          </trim>
     </insert>
 
@@ -138,6 +150,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="totalSulfur150 != null">total_sulfur150 = #{totalSulfur150},</if>
+            <if test="c4 != null">c4 = #{c4},</if>
+            <if test="c410 != null">c410 = #{c410},</if>
+            <if test="c250 != null">c250 = #{c250},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -839,10 +839,13 @@
       <el-table-column label="C5总量" align="center" prop="c5" :show-overflow-tooltip="true"/>
       <el-table-column label="碳五共轭双烯烃+双环戊二烯>=30" align="center" prop="c5ConjugatedDienesDcpd30" :show-overflow-tooltip="true"/>
       <el-table-column label="间戊二烯+环戊二烯" align="center" prop="pentadieneCycc5" :show-overflow-tooltip="true"/>
+      <el-table-column label="C4及C4以下组分含量" align="center" prop="c4" :show-overflow-tooltip="true"/>
       <el-table-column label="碳五共轭双烯烃+双环戊二烯>=40" align="center" prop="c5ConjugatedDienesDcpd40" :show-overflow-tooltip="true"/>
+      <el-table-column label="C4及C4以下组分含量<10" align="center" prop="c410" :show-overflow-tooltip="true"/>
       <el-table-column label="总硫" align="center" prop="totalSulfur" :show-overflow-tooltip="true"/>
       <el-table-column label="总硫<=150" align="center" prop="totalSulfur150" :show-overflow-tooltip="true"/>
       <el-table-column label="硅" align="center" prop="silicon" :show-overflow-tooltip="true"/>
+      <el-table-column label="C250 灵敏板T" align="center" prop="c250" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -4097,9 +4100,93 @@ export default {
           });
           break;
         case "12":
+          this.disposeChart();
           listS6301(this.analysisQueryParams).then(response => {
             let data = response.data;
-            console.log(data)
+            let c5ConjugatedDienesDcpd30Array = [];
+            let c5ConjugatedDienesDcpd40Array = [];
+            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);
+              c250Array.push(data[i].c250);
+              c4Array.push(data[i].c4);
+              c410Array.push(data[i].c410);
+              sampleDateArray.push(data[i].sampleDate);
+            }
+            let option = {
+              title: {
+                text: dictLabel,
+                left: 'center',
+                textStyle: {
+                  fontSize: 16
+                }
+              },
+              tooltip: {
+                trigger: 'axis'
+              },
+              legend: {
+                x: 'center',
+                y: 'bottom',
+                data: ['碳五共轭双烯烃+双环戊二烯>=30', '碳五共轭双烯烃+双环戊二烯>=40', 'C250 灵敏板T', 'C4及C4以下组分含量', 'C4及C4以下组分含量<=10']
+              },
+              grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '10%',
+                containLabel: true
+              },
+              toolbox: {
+                feature: {
+                  saveAsImage: {}
+                }
+              },
+              xAxis: {
+                type: 'category',
+                boundaryGap: false,
+                data: sampleDateArray,
+                axisLabel: {
+                  interval: 0,
+                  rotate: 45
+                }
+              },
+              yAxis: {
+                type: 'value'
+              },
+              series: [
+                {
+                  name: '碳五共轭双烯烃+双环戊二烯>=30',
+                  type: 'line',
+                  data: c5ConjugatedDienesDcpd30Array
+                },
+                {
+                  name: '碳五共轭双烯烃+双环戊二烯>=40',
+                  type: 'line',
+                  data: c5ConjugatedDienesDcpd40Array
+                },
+                {
+                  name: 'C250 灵敏板T',
+                  type: 'line',
+                  data: c250Array
+                },
+                {
+                  name: 'C4及C4以下组分含量',
+                  type: 'line',
+                  data: c4Array
+                },
+                {
+                  name: 'C4及C4以下组分含量<=10',
+                  type: 'line',
+                  data: c410Array
+                }
+              ]
+            };
+            this.chart = this.echarts.init(document.getElementById('chart'));
+            this.chart.setOption(option);
           });
           break;
         case "13":