质量月报

- 二段加氢反应器性能
- S4501新增字段入口温度、一段温升、压差100Pa
- S4501查询和导入等功能相应修改
- S4501导入模板修改

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

@@ -887,6 +887,12 @@ public class TMonthlyQualityReportController extends BaseController
                         entity.setTotalSulfur(cellValue);
                     } else if (j == 25) {
                         entity.setTotalNitrogen(cellValue);
+                    } else if (j == 26) {
+                        entity.setTemperatureIn(cellValue);
+                    } else if (j == 27) {
+                        entity.setTemperatureRaise(cellValue);
+                    } else if (j == 28) {
+                        entity.setPressureDiff(cellValue);
                     }
                 }
                 tMonthlyQualityReportS4501Service.insertTMonthlyQualityReportS4501(entity);

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

@@ -126,6 +126,39 @@ public class TMonthlyQualityReportS4501 extends BaseEntity
     @Excel(name = "总氮")
     private String totalNitrogen;
 
+    /** 入口温度 */
+    private String temperatureIn;
+
+    /** 温升 */
+    private String temperatureRaise;
+
+    /** 压差100Pa */
+    private String pressureDiff;
+
+    public String getTemperatureIn() {
+        return temperatureIn;
+    }
+
+    public void setTemperatureIn(String temperatureIn) {
+        this.temperatureIn = temperatureIn;
+    }
+
+    public String getTemperatureRaise() {
+        return temperatureRaise;
+    }
+
+    public void setTemperatureRaise(String temperatureRaise) {
+        this.temperatureRaise = temperatureRaise;
+    }
+
+    public String getPressureDiff() {
+        return pressureDiff;
+    }
+
+    public void setPressureDiff(String pressureDiff) {
+        this.pressureDiff = pressureDiff;
+    }
+
     public String getBrIndex() {
         return brIndex;
     }

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

@@ -37,10 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="brIndex" column="br_index" />
         <result property="totalSulfur" column="total_sulfur" />
         <result property="totalNitrogen" column="total_nitrogen" />
+        <result property="temperatureIn" column="temperature_in" />
+        <result property="temperatureRaise" column="temperature_raise" />
+        <result property="pressureDiff" column="pressure_diff" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS4501Vo">
-        select d.id, d.br_index, d.total_sulfur, d.total_nitrogen, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.benzene, d.toluene, d.ethylbenzene, d.m_xylene, d.o_xylene, d.p_xylene, d.c5_na, d.c6_na, d.c7_na, d.c8_na, d.c9, d.c8_a, d.c4_c5_na, d.c6_c8_na, d.c4_c8_na, 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_s4501 d
+        select d.id, d.temperature_in, d.temperature_raise, d.pressure_diff, d.br_index, d.total_sulfur, d.total_nitrogen, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.benzene, d.toluene, d.ethylbenzene, d.m_xylene, d.o_xylene, d.p_xylene, d.c5_na, d.c6_na, d.c7_na, d.c8_na, d.c9, d.c8_a, d.c4_c5_na, d.c6_c8_na, d.c4_c8_na, 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_s4501 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -72,6 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brIndex != null "> and br_index = #{brIndex}</if>
             <if test="totalSulfur != null "> and total_sulfur = #{totalSulfur}</if>
             <if test="totalNitrogen != null "> and total_nitrogen = #{totalNitrogen}</if>
+            <if test="temperatureIn != null "> and temperature_in = #{temperatureIn}</if>
+            <if test="temperatureRaise != null "> and temperature_raise = #{temperatureRaise}</if>
+            <if test="pressureDiff != null "> and pressure_diff = #{pressureDiff}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -118,6 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brIndex != null">br_index,</if>
             <if test="totalSulfur != null">total_sulfur,</if>
             <if test="totalNitrogen != null">total_nitrogen,</if>
+            <if test="temperatureIn != null">temperature_in,</if>
+            <if test="temperatureRaise != null">temperature_raise,</if>
+            <if test="pressureDiff != null">pressure_diff,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -149,6 +158,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brIndex != null">#{brIndex},</if>
             <if test="totalSulfur != null">#{totalSulfur},</if>
             <if test="totalNitrogen != null">#{totalNitrogen},</if>
+            <if test="temperatureIn != null">#{temperatureIn},</if>
+            <if test="temperatureRaise != null">#{temperatureRaise},</if>
+            <if test="pressureDiff != null">#{pressureDiff},</if>
          </trim>
     </insert>
 
@@ -183,6 +195,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brIndex != null">br_index = #{brIndex},</if>
             <if test="totalSulfur != null">total_sulfur = #{totalSulfur},</if>
             <if test="totalNitrogen != null">total_nitrogen = #{totalNitrogen},</if>
+            <if test="temperatureIn != null">temperature_in = #{temperatureIn},</if>
+            <if test="temperatureRaise != null">temperature_raise = #{temperatureRaise},</if>
+            <if test="pressureDiff != null">pressure_diff = #{pressureDiff},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -587,6 +587,9 @@
       <el-table-column label="溴指数" align="center" prop="brIndex" :show-overflow-tooltip="true"/>
       <el-table-column label="总硫" align="center" prop="totalSulfur" :show-overflow-tooltip="true"/>
       <el-table-column label="总氮" align="center" prop="totalNitrogen" :show-overflow-tooltip="true"/>
+      <el-table-column label="入口温度" align="center" prop="temperatureIn" :show-overflow-tooltip="true"/>
+      <el-table-column label="温升" align="center" prop="temperatureRaise" :show-overflow-tooltip="true"/>
+      <el-table-column label="压差 100Pa" align="center" prop="pressureDiff" :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
@@ -4375,9 +4378,105 @@ export default {
           });
           break;
         case "15":
+          this.disposeChart();
           listS4501(this.analysisQueryParams).then(response => {
             let data = response.data;
-            console.log(data)
+            let temperatureInArray = [];
+            let temperatureRaiseArray = [];
+            let pressureDiffArray = [];
+            let c6C8NaArray = [];
+            let brNumberArray = [];
+            let sampleDateArray = [];
+            for(let i = 0 ; i < data.length; i++){
+              temperatureInArray.push(data[i].temperatureIn);
+              temperatureRaiseArray.push(data[i].temperatureRaise);
+              pressureDiffArray.push(data[i].pressureDiff);
+              c6C8NaArray.push(data[i].c6C8Na);
+              brNumberArray.push(data[i].brNumber);
+              sampleDateArray.push(data[i].sampleDate);
+            }
+            let option = {
+              title: {
+                text: dictLabel,
+                left: 'center',
+                textStyle: {
+                  fontSize: 16
+                }
+              },
+              tooltip: {
+                trigger: 'axis'
+              },
+              legend: {
+                x: 'center',
+                y: 'bottom',
+                data: ['入口温度', '温升', '压差 100Pa', '新鲜C6-C8', '溴价指数']
+              },
+              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',
+                  position: 'left'
+                },
+                {
+                  type: 'value',
+                  position: 'right'
+                }
+              ],
+              series: [
+                {
+                  name: '入口温度',
+                  type: 'line',
+                  data: temperatureInArray,
+                  yAxisIndex: 0
+                },
+                {
+                  name: '温升',
+                  type: 'line',
+                  data: temperatureRaiseArray,
+                  yAxisIndex: 0
+                },
+                {
+                  name: '压差 100Pa',
+                  type: 'line',
+                  data: pressureDiffArray,
+                  yAxisIndex: 0
+                },
+                {
+                  name: '新鲜C6-C8',
+                  type: 'line',
+                  data: c6C8NaArray,
+                  yAxisIndex: 1
+                },
+                {
+                  name: '溴价指数',
+                  type: 'line',
+                  data: brNumberArray,
+                  yAxisIndex: 1
+                }
+              ]
+            };
+            this.chart = this.echarts.init(document.getElementById('chart'));
+            this.chart.setOption(option);
           });
           break;
       }