质量月报

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

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

@@ -315,6 +315,10 @@ public class TMonthlyQualityReportController extends BaseController
                         entity.setDieneValue(cellValue);
                     } else if (j == 28) {
                         entity.setTotalNitrogen(cellValue);
+                    } else if (j == 29) {
+                        entity.setTemperatureIn(cellValue);
+                    } else if (j == 30) {
+                        entity.setTemperatureRaise(cellValue);
                     }
                 }
                 tMonthlyQualityReportS1301Service.insertTMonthlyQualityReportS1301(entity);

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

@@ -106,6 +106,28 @@ public class TMonthlyQualityReportS1301 extends BaseEntity
 
     private String deptName;
 
+    /** 入口温度 */
+    private String temperatureIn;
+
+    /** 一段温升 */
+    private String temperatureRaise;
+
+    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 getDeptName() {
         return deptName;
     }

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

@@ -32,10 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="startDate" column="start_date" />
         <result property="endDate" column="end_date" />
+        <result property="temperatureIn" column="temperature_in" />
+        <result property="temperatureRaise" column="temperature_raise" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS1301Vo">
-        select d.id, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.na, d.benzene, d.toluene, d.ethylbenzene, d.p_xylene, d.m_xylene, d.o_xylene, d.styrene, d.phenylacetylene, d.total_aromatics, d.br_number, d.diene_value, d.total_nitrogen, 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_s1301 d
+        select d.id, d.temperature_in, d.temperature_raise, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.na, d.benzene, d.toluene, d.ethylbenzene, d.p_xylene, d.m_xylene, d.o_xylene, d.styrene, d.phenylacetylene, d.total_aromatics, d.br_number, d.diene_value, d.total_nitrogen, 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_s1301 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -62,6 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dieneValue != null  and dieneValue != ''"> and diene_value = #{dieneValue}</if>
             <if test="totalNitrogen != null  and totalNitrogen != ''"> and total_nitrogen = #{totalNitrogen}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="temperatureIn != null "> and temperature_in = #{temperatureIn}</if>
+            <if test="temperatureRaise != null "> and temperature_raise = #{temperatureRaise}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -103,6 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="temperatureIn != null">temperature_in,</if>
+            <if test="temperatureRaise != null">temperature_raise,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -129,6 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="temperatureIn != null">#{temperatureIn},</if>
+            <if test="temperatureRaise != null">#{temperatureRaise},</if>
          </trim>
     </insert>
 
@@ -158,6 +166,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="temperatureIn != null">temperature_in = #{temperatureIn},</if>
+            <if test="temperatureRaise != null">temperature_raise = #{temperatureRaise},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -105,6 +105,8 @@
       <el-table-column label="溴价" align="center" prop="brNumber" :show-overflow-tooltip="true"/>
       <el-table-column label="双烯值" align="center" prop="dieneValue" :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="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -4279,9 +4281,97 @@ export default {
           });
           break;
         case "14":
+          this.disposeChart();
           listS1301(this.analysisQueryParams).then(response => {
             let data = response.data;
-            console.log(data)
+            let temperatureInArray = [];
+            let temperatureRaiseArray = [];
+            let styreneArray = [];
+            let dieneValueArray = [];
+            let sampleDateArray = [];
+            for(let i = 0 ; i < data.length; i++){
+              temperatureInArray.push(data[i].temperatureIn);
+              temperatureRaiseArray.push(data[i].temperatureRaise);
+              styreneArray.push(data[i].styrene);
+              dieneValueArray.push(data[i].dieneValue);
+              sampleDateArray.push(data[i].sampleDate);
+            }
+            let option = {
+              title: {
+                text: dictLabel,
+                left: 'center',
+                textStyle: {
+                  fontSize: 16
+                }
+              },
+              tooltip: {
+                trigger: 'axis'
+              },
+              legend: {
+                x: 'center',
+                y: 'bottom',
+                data: ['入口温度', '一段温升', '苯乙烯(0.18-0.8)', '双烯值(0.2-1.5)']
+              },
+              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: '苯乙烯(0.18-0.8)',
+                  type: 'line',
+                  data: styreneArray,
+                  yAxisIndex: 1
+                },
+                {
+                  name: '双烯值(0.2-1.5)',
+                  type: 'line',
+                  data: dieneValueArray,
+                  yAxisIndex: 1
+                }
+              ]
+            };
+            this.chart = this.echarts.init(document.getElementById('chart'));
+            this.chart.setOption(option);
           });
           break;
         case "15":