Browse Source

ly 加字段

ly 10 months ago
parent
commit
a5ade644ac

+ 20 - 9
cpms-admin/src/main/resources/mapper/process/TValveCsocscMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cpms.project.process.mapper.TValveCsocscMapper">
-    
+
     <resultMap type="TValveCsocsc" id="TValveCsocscResult">
         <result property="id"    column="id"    />
         <result property="unit"    column="unit"    />
@@ -28,15 +28,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updaterCode"    column="updater_code"    />
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
+        <result property="checkBeforeSu"    column="check_before_su"    />
+        <result property="sheReview"    column="she_review"    />
     </resultMap>
 
     <sql id="selectTValveCsocscVo">
-        select id, unit, vt_no, pid_no, location_des, medium, valve_type, valve_size, identifier, valve_position, firmly_secured, responsibility, checked_by, pid_status, risk_level, check_date, remarks, del_flag, creater_code, createdate, updater_code, updatedate, dept_id from t_valve_csocsc
+        select id, unit, vt_no, pid_no, location_des, medium, valve_type, valve_size, identifier, valve_position, firmly_secured, responsibility, checked_by, check_before_su, she_review, pid_status, risk_level, check_date, remarks, del_flag, creater_code, createdate, updater_code, updatedate, dept_id from t_valve_csocsc
     </sql>
 
     <select id="selectTValveCsocscList" parameterType="TValveCsocsc" resultMap="TValveCsocscResult">
         <include refid="selectTValveCsocscVo"/>
-        <where>  
+        <where>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="vtNo != null  and vtNo != ''"> and vt_no = #{vtNo}</if>
             <if test="pidNo != null  and pidNo != ''"> and pid_no = #{pidNo}</if>
@@ -62,12 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by createdate desc
     </select>
-    
+
     <select id="selectTValveCsocscById" parameterType="Long" resultMap="TValveCsocscResult">
         <include refid="selectTValveCsocscVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTValveCsocsc" parameterType="TValveCsocsc" useGeneratedKeys="true" keyProperty="id">
         insert into t_valve_csocsc
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -93,7 +95,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
-         </trim>
+            <if test="checkBeforeSu != null">check_before_su,</if>
+            <if test="sheReview != null">she_review,</if>
+
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="unit != null">#{unit},</if>
             <if test="vtNo != null">#{vtNo},</if>
@@ -117,7 +122,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">#{updaterCode},</if>
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
-         </trim>
+            <if test="checkBeforeSu != null">#{checkBeforeSu},</if>
+            <if test="sheReview != null">#{sheReview},</if>
+
+        </trim>
     </insert>
 
     <update id="updateTValveCsocsc" parameterType="TValveCsocsc">
@@ -145,6 +153,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="checkBeforeSu != null">check_before_su = #{checkBeforeSu},</if>
+            <if test="sheReview != null">she_review = #{sheReview},</if>
+
         </trim>
         where id = #{id}
     </update>
@@ -154,9 +165,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTValveCsocscByIds" parameterType="String">
-        delete from t_valve_csocsc where id in 
+        delete from t_valve_csocsc where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

+ 1 - 1
cpms-ui/package.json

@@ -43,7 +43,7 @@
     "core-js": "3.25.3",
     "echarts": "5.4.0",
     "echarts-liquidfill": "^3.1.0",
-    "element-ui": "2.15.14",
+    "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",

+ 14 - 0
cpms-ui/src/views/process/csocsc/index.vue

@@ -114,8 +114,12 @@
       </el-table-column>
       <el-table-column :label="'负责人\nResponsibility'" align="center" prop="responsibility" width="180"/>
       <el-table-column :label="'现场检查人\nChecked by'" align="center" prop="checkedBy" width="180"/>
+      <el-table-column :label="'开车前检查\ncheck before SU'" align="center" prop="checkBeforeSu" width="180"/>
+
       <el-table-column :label="'PID图纸状态\nStatus on PID'" align="center" prop="pidStatus" width="180"/>
       <el-table-column :label="'风险等级\nValve Risk level'" align="center" prop="riskLevel" width="180"/>
+      <el-table-column label="SHE Review" align="center" prop="sheReview" width="180"/>
+
       <el-table-column label="检查日期" align="center" prop="checkDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</span>
@@ -207,12 +211,18 @@
         <el-form-item label="现场检查人" prop="checkedBy">
           <el-input v-model="form.checkedBy" placeholder="请输入现场检查人"/>
         </el-form-item>
+        <el-form-item label="开车前检查" prop="checkBeforeSu">
+          <el-input v-model="form.checkBeforeSu" placeholder="请输入开车前检查"/>
+        </el-form-item>
         <el-form-item label="PID图纸状态" prop="pidStatus">
           <el-input v-model="form.pidStatus" placeholder="请输入PID图纸状态"/>
         </el-form-item>
         <el-form-item label="风险等级" prop="riskLevel">
           <el-input v-model="form.riskLevel" placeholder="请输入风险等级"/>
         </el-form-item>
+        <el-form-item label="SHE Review" prop="sheReview">
+          <el-input v-model="form.sheReview" placeholder="请输入SHE Review"/>
+        </el-form-item>
         <el-form-item label="检查日期" prop="checkDate">
           <el-date-picker clearable
                           v-model="form.checkDate"
@@ -332,10 +342,12 @@ export default {
         identifier: null,
         valvePosition: null,
         firmlySecured: null,
+        checkBeforeSu: null,
         responsibility: null,
         checkedBy: null,
         pidStatus: null,
         riskLevel: null,
+        sheReview: null,
         checkDate: null,
         remarks: null,
         createrCode: null,
@@ -391,8 +403,10 @@ export default {
         firmlySecured: null,
         responsibility: null,
         checkedBy: null,
+        checkBeforeSu: null,
         pidStatus: null,
         riskLevel: null,
+        sheReview: null,
         checkDate: null,
         remarks: null,
         delFlag: null,