Ver código fonte

PSSR照明及检修功能更新

jiangbiao 6 meses atrás
pai
commit
9d8b89e963

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAboveallController.java

@@ -200,12 +200,15 @@ public class TPssrAboveallController extends BaseController {
      * 生成照明、电伴热数据
      */
     private void genZmdbr(Long subId, String userId) {
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯外观完好,干净,无破损。", userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯无锈蚀。", userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯具固定牢固,无松动。", userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明导线完好,无破损。", userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明开关完好。", userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明设备可以正常打开或者关闭。", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯外观完好,干净,无破损。", "1",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯无锈蚀。", "1",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯具固定牢固,无松动。", "1",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明导线完好,无破损。", "1",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明开关完好。", "1",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明设备可以正常打开或者关闭。", "1",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "现场电伴热带无破损断裂,无变形", "2",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "电伴热带与管道设备紧密贴合,无缝隙", "2",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "电源接线盒牢固密封,接线端子无松动锈蚀。", "2",userId, new Date()));
     }
 
     /**

+ 2 - 1
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLighting.java

@@ -22,9 +22,10 @@ public class TPssrLighting extends BaseEntity
     public TPssrLighting() {
     }
 
-    public TPssrLighting(Long subId, String checkContent, String createrCode, Date createdate) {
+    public TPssrLighting(Long subId, String checkContent,String lightingType, String createrCode, Date createdate) {
         this.subId = subId;
         this.checkContent = checkContent;
+        this.lightingType = lightingType;
         this.createrCode = createrCode;
         this.createdate = createdate;
         this.approveStatus = 0L;

+ 9 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulExchanger.java

@@ -99,11 +99,20 @@ public class TPssrOverhaulExchanger extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private Long devType;
     private String confirm1Name;
     private String confirm2Name;
     private List<Long> fileIds;
     private List<TPssrFile> fileList;
 
+    public Long getDevType() {
+        return devType;
+    }
+
+    public void setDevType(Long devType) {
+        this.devType = devType;
+    }
+
     public List<TPssrFile> getFileList() {
         return fileList;
     }

+ 6 - 1
master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="equipmentName"    column="equipment_name"    />
         <result property="workDes"    column="work_des"    />
         <result property="pidNo"    column="pid_no"    />
+        <result property="devType"    column="dev_type"    />
         <result property="completionDate"    column="completion_date"    />
         <result property="confirmedPerson"    column="confirmed_person"    />
         <result property="confirmedName"    column="confirmed_name"    />
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPssrOverhaulExchangerVo">
-        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person,u.NICK_NAME confirmed_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_exchanger d
+        select d.dev_type,d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person,u.NICK_NAME confirmed_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_exchanger d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u on u.user_id = d.CONFIRMED_PERSON
     </sql>
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
+            <if test="devType != null "> and dev_type = #{devType}</if>
             <if test="tagNo != null  and tagNo != ''"> and tag_no = #{tagNo}</if>
             <if test="equipmentName != null  and equipmentName != ''"> and equipment_name like concat(concat('%', #{equipmentName}), '%')</if>
             <if test="workDes != null  and workDes != ''"> and work_des = #{workDes}</if>
@@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tagNo != null">tag_no,</if>
             <if test="equipmentName != null">equipment_name,</if>
             <if test="workDes != null">work_des,</if>
+            <if test="devType != null">dev_type,</if>
             <if test="pidNo != null">pid_no,</if>
             <if test="completionDate != null">completion_date,</if>
             <if test="confirmedPerson != null">confirmed_person,</if>
@@ -119,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tagNo != null">#{tagNo},</if>
             <if test="equipmentName != null">#{equipmentName},</if>
             <if test="workDes != null">#{workDes},</if>
+            <if test="devType != null">#{dev_type},</if>
             <if test="pidNo != null">#{pidNo},</if>
             <if test="completionDate != null">#{completionDate},</if>
             <if test="confirmedPerson != null">#{confirmedPerson},</if>
@@ -141,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tagNo != null">tag_no = #{tagNo},</if>
             <if test="equipmentName != null">equipment_name = #{equipmentName},</if>
             <if test="workDes != null">work_des = #{workDes},</if>
+            <if test="devType != null">dev_type = #{devType},</if>
             <if test="pidNo != null">pid_no = #{pidNo},</if>
             <if test="completionDate != null">completion_date = #{completionDate},</if>
             <if test="confirmedPerson != null">confirmed_person = #{confirmedPerson},</if>

+ 0 - 6
ui/src/views/pssr/laboratory/index.vue

@@ -455,12 +455,6 @@
               <el-button @click="upload.open = false">取 消</el-button>
           </div>
       </el-dialog>
-
-    <!-- 附件对话框 -->
-    <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="doc.open" append-to-body title="现场照片"
-               width="1000px">
-      <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
-    </el-dialog>
   </div>
 </template>
 

+ 14 - 4
ui/src/views/pssr/overhaulExchanger/index.vue

@@ -155,7 +155,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>换热器检修清单</H2>
+      <H2>{{devName}}检修清单</H2>
     </div>
     <el-table v-loading="loading" :data="overhaulExchangerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -410,6 +410,14 @@ export default {
       type: Number,
       default: 0
     },
+    devType: {
+      type: Number,
+      default: 1
+    },
+    devName: {
+      type: String,
+      default: '换热器'
+    },
   },
   data() {
     return {
@@ -511,6 +519,7 @@ export default {
         pageSize: 20,
         subId: this.subId,
         approveId: null,
+        devType: this.devType,
         tagNo: null,
         equipmentName: null,
         workDes: null,
@@ -629,6 +638,7 @@ export default {
         id: null,
         subId: this.subId,
         approveId: null,
+        devType: this.devType,
         tagNo: null,
         equipmentName: null,
         workDes: null,
@@ -665,7 +675,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加检修项目-换热器";
+      this.title = "添加检修项目-"+this.devName;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -674,7 +684,7 @@ export default {
       getOverhaulExchanger(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改检修项目-换热器";
+        this.title = "修改检修项目-"+this.devName;
       });
     },
     /** 提交按钮 */
@@ -714,7 +724,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有检修项目-换热器数据项?', "警告", {
+      this.$confirm('是否确认导出所有检修项目-'+this.devName+'数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

+ 16 - 4
ui/src/views/pssr/subitem/index.vue

@@ -3,17 +3,29 @@
     <div v-if="sn=='jxxm'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="换热器" name="first">
-          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="换热器" :dev-type="Number(1)"/>
         </el-tab-pane>
-        <el-tab-pane label="塔罐" name="fourth">
+        <el-tab-pane label="电仪" name="second">
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="电仪" :dev-type="Number(2)"/>
+        </el-tab-pane>
+        <el-tab-pane label="反应器" name="third">
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="反应器" :dev-type="Number(3)"/>
+        </el-tab-pane>
+        <el-tab-pane label="裂解炉" name="fourth">
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="裂解炉" :dev-type="Number(4)"/>
+        </el-tab-pane>
+        <el-tab-pane label="塔罐" name="fifth">
           <overhaul-tower :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
-        <el-tab-pane label="阀门" name="fifth">
+        <el-tab-pane label="阀门" name="sixth">
           <overhaul-valve :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
-        <el-tab-pane label="过滤器" name="sixth">
+        <el-tab-pane label="过滤器" name="seventh">
           <overhaul-filter :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
+        <el-tab-pane label="其他" name="eighth">
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="其他" :dev-type="Number(5)"/>
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div v-if="sn=='kgfa'">