裂解巡检 - 测温/测压表新增H109B字段

首页 - 物料平衡裂解炉状态分别取H109A和H109B

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

@@ -167,6 +167,9 @@ public class TFurnancePressure extends BaseEntity
     /** 状态 */
     private String status;
 
+    /** H109B状态 */
+    private String status2;
+
     /** 班组 */
     @Excel(name = "班值", dictType = "TEAM_DIVIDE")
     private String team;
@@ -235,6 +238,14 @@ public class TFurnancePressure extends BaseEntity
 
     private boolean isPass8RatioExceeded;
 
+    public String getStatus2() {
+        return status2;
+    }
+
+    public void setStatus2(String status2) {
+        this.status2 = status2;
+    }
+
     public String getPassNo() {
         return passNo;
     }

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

@@ -111,6 +111,9 @@ public class TFurnanceTemperature extends BaseEntity
     /** 状态 */
     private String status;
 
+    /** H109B状态 */
+    private String status2;
+
     /** 班组 */
     @Excel(name = "班值", dictType = "TEAM_DIVIDE")
     private String team;
@@ -149,6 +152,14 @@ public class TFurnanceTemperature extends BaseEntity
 
     private boolean isPass16Complete;
 
+    public String getStatus2() {
+        return status2;
+    }
+
+    public void setStatus2(String status2) {
+        this.status2 = status2;
+    }
+
     public String getPassNo() {
         return passNo;
     }

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="status"    column="status"    />
+        <result property="status2"    column="status2"    />
         <result property="team"    column="team"    />
         <result property="photoUrl"    column="photo_url"    />
         <result property="recorder"    column="recorder"    />
@@ -55,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTFurnancePressureVo">
-        select d.id, d.recorder, d.team, d.photo_url, d.status, d.furnance_name, d.record_time,
+        select d.id, d.recorder, d.team, d.photo_url, d.status, d.status2, d.furnance_name, d.record_time,
         d.pass1, d.pass2, d.pass3, d.pass4, d.pass5, d.pass6, d.pass7, d.pass8, d.pass9, d.pass10, d.pass11, d.pass12, d.pass13, d.pass14, d.pass15, d.pass16,
         d.remarks1, d.remarks2, d.remarks3, d.remarks4, d.remarks5, d.remarks6, d.remarks7, d.remarks8, d.remarks9, d.remarks10, d.remarks11, d.remarks12, d.remarks13, d.remarks14, d.remarks15, d.remarks16,
         d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time from t_furnance_pressure d
@@ -88,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pass16 != null  and pass16 != ''"> and pass16 = #{pass16}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="status2 != null "> and status2 = #{status2}</if>
             <if test="team != null "> and team = #{team}</if>
             <if test="photoUrl != null "> and photo_url = #{photoUrl}</if>
             <if test="recorder != null and recorder != 0"> and recorder = #{recorder}</if>
@@ -183,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="status != null">status,</if>
+            <if test="status2 != null">status2,</if>
             <if test="team != null">team,</if>
             <if test="photoUrl != null">photo_url,</if>
             <if test="recorder != null and recorder != 0">recorder,</if>
@@ -230,6 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="status != null">#{status},</if>
+            <if test="status2 != null">#{status2},</if>
             <if test="team != null">#{team},</if>
             <if test="photoUrl != null">#{photoUrl},</if>
             <if test="recorder != null and recorder != 0">#{recorder},</if>
@@ -280,6 +284,7 @@ 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="status != null">status = #{status},</if>
+            <if test="status2 != null">status2 = #{status2},</if>
             <if test="team != null">team = #{team},</if>
             <if test="photoUrl != null">photo_url = #{photoUrl},</if>
             <if test="recorder != null and recorder != 0">recorder = #{recorder},</if>

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

@@ -33,11 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="status"    column="status"    />
+        <result property="status2"    column="status2"    />
         <result property="team"    column="team"    />
     </resultMap>
 
     <sql id="selectTFurnanceTemperatureVo">
-        select d.id, d.team, d.status, d.furnance_name, d.record_time, d.pass1, d.pass2, d.pass3, d.pass4, d.pass5, d.pass6, d.pass7, d.pass8, d.pass9, d.pass10, d.pass11, d.pass12, d.pass13, d.pass14, d.pass15, d.pass16, d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time from t_furnance_temperature d
+        select d.id, d.team, d.status, d.status2, d.furnance_name, d.record_time, d.pass1, d.pass2, d.pass3, d.pass4, d.pass5, d.pass6, d.pass7, d.pass8, d.pass9, d.pass10, d.pass11, d.pass12, d.pass13, d.pass14, d.pass15, d.pass16, d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time from t_furnance_temperature d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pass16 != null  and pass16 != ''"> and pass16 = #{pass16}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="status2 != null "> and status2 = #{status2}</if>
             <if test="team != null "> and team = #{team}</if>
             and d.del_flag = 0
         </where>
@@ -142,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="status != null">status,</if>
+            <if test="status2 != null">status2,</if>
             <if test="team != null">team,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -171,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="status != null">#{status},</if>
+            <if test="status2 != null">#{status2},</if>
             <if test="team != null">#{team},</if>
          </trim>
     </insert>
@@ -203,6 +207,7 @@ 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="status != null">status = #{status},</if>
+            <if test="status2 != null">status2 = #{status2},</if>
             <if test="team != null">team = #{team},</if>
         </trim>
         where id = #{id}

ui/src/views/front/materialBalanceHome.vue

@@ -450,7 +450,7 @@ export default {
           for (let i = 0; i < response.data.length; i++) {
             if (response.data[i].furnanceName == 'H109') {
               this.status109A = response.data[i].status;
-              this.status109B = response.data[i].status;
+              this.status109B = response.data[i].status2;
             } else if (response.data[i].furnanceName == 'H110') {
               this.status110 = response.data[i].status;
             } else if (response.data[i].furnanceName == 'H111') {

ui/src/views/production/pressure/h109.vue

@@ -48,7 +48,8 @@
         </template>
       </el-table-column>
       <el-table-column label="班组" align="center" prop="team" :show-overflow-tooltip="true" width="80" :formatter="teamFormat"/>
-      <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true" width="80" :formatter="statusFormat"/>
+      <el-table-column label="状态A" align="center" prop="status" :show-overflow-tooltip="true" width="80" :formatter="statusFormat"/>
+      <el-table-column label="状态B" align="center" prop="status2" :show-overflow-tooltip="true" width="80" :formatter="statusFormat2"/>
       <el-table-column label="PASS1出口左" align="center" prop="pass1" :show-overflow-tooltip="true">
         <el-table-column label="PG1213J" align="center" width="100">
           <template slot-scope="scope">
@@ -349,7 +350,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态">
+        <el-form-item label="状态A">
           <el-select v-model="form.status" placeholder="请选择" size="small" @change="handleChange">
             <el-option
               v-for="item in statusOptions"
@@ -359,6 +360,16 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="状态B">
+          <el-select v-model="form.status2" placeholder="请选择" size="small">
+            <el-option
+              v-for="item in statusOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
@@ -2076,6 +2087,9 @@
       statusFormat(row, column) {
         return this.selectDictLabel(this.statusOptions, row.status);
       },
+      statusFormat2(row, column) {
+        return this.selectDictLabel(this.statusOptions, row.status2);
+      },
       /** 查询部门下拉树结构 */
       getTreeselect() {
         treeselect().then(response => {

ui/src/views/production/temperature/h109.vue

@@ -48,7 +48,8 @@
         </template>
       </el-table-column>
       <el-table-column label="班组" align="center" prop="team" :show-overflow-tooltip="true" width="80" :formatter="teamFormat"/>
-      <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true" width="80" :formatter="statusFormat"/>
+      <el-table-column label="状态A" align="center" prop="status" :show-overflow-tooltip="true" width="80" :formatter="statusFormat"/>
+      <el-table-column label="状态B" align="center" prop="status2" :show-overflow-tooltip="true" width="80" :formatter="statusFormat2"/>
       <el-table-column label="PASS1出口左" align="center" prop="pass1" :show-overflow-tooltip="true">
         <!--<el-table-column v-for="(item,index) in 14" :label="(index+1).toString()" align="center" width="60">-->
         <el-table-column v-for="(item,index) in 14" :label="'第'+ chineseNum[index] +'根'" align="center" width="80">
@@ -229,7 +230,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态">
+        <el-form-item label="状态A">
           <el-select v-model="form.status" placeholder="请选择" size="small" @change="handleChange">
             <el-option
               v-for="item in statusOptions"
@@ -239,6 +240,16 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="状态B">
+          <el-select v-model="form.status2" placeholder="请选择" size="small">
+            <el-option
+              v-for="item in statusOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
@@ -536,6 +547,9 @@
       statusFormat(row, column) {
         return this.selectDictLabel(this.statusOptions, row.status);
       },
+      statusFormat2(row, column) {
+        return this.selectDictLabel(this.statusOptions, row.status2);
+      },
       /** 查询裂解炉炉管测温列表 */
       getList() {
         this.loading = true;