Merge branch 'master' of...

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage into master

danger-manage-admin/src/main/java/com/zehong/web/controller/hiddenDanger/TStaningBookController.java

@@ -100,4 +100,14 @@ public class TStaningBookController extends BaseController
     {
         return toAjax(tStaningBookService.deleteTStaningBookByIds(bookIds));
     }
+
+    /**
+     * 统计，按年、月、日统计发现数量和已处置数量
+     * 日，为当日；月为当前30日内；年为当前365日内
+     * @return
+     */
+    @GetMapping(value = "/statics")
+    public AjaxResult statics(String type){
+        return AjaxResult.success(tStaningBookService.statics(type));
+    }
 }

danger-manage-admin/src/main/java/com/zehong/web/controller/system/TNfcSettingController.java

@@ -58,6 +58,18 @@ public class TNfcSettingController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 导出巡检打卡列表
+     */
+    @Log(title = "setting", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportPunchClockList")
+    public AjaxResult exportPunchClockList(TNfcSetting tNfcSetting)
+    {
+        List<TNfcRecord> list = tNfcSettingService.punchClockList(tNfcSetting);
+        ExcelUtil<TNfcRecord> util = new ExcelUtil<TNfcRecord>(TNfcRecord.class);
+        return util.exportExcel(list, "巡检打卡数据");
+    }
+
     /**
      * 导出巡检列表
      */

danger-manage-admin/src/main/java/com/zehong/web/controller/workPermit/TWorkPermitController.java

@@ -9,7 +9,11 @@ import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.SecurityUtils;
 import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TSpecialWorkPermit;
+import com.zehong.system.domain.TSpecialWorkPermitSign;
 import com.zehong.system.domain.TWorkPermit;
+import com.zehong.system.service.ITSpecialWorkPermitService;
+import com.zehong.system.service.ITSpecialWorkPermitSignService;
 import com.zehong.system.service.ITWorkPermitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +33,12 @@ public class TWorkPermitController extends BaseController
     @Autowired
     private ITWorkPermitService tWorkPermitService;
 
+    @Autowired
+    private ITSpecialWorkPermitService tSpecialWorkPermitService;
+
+    @Autowired
+    private ITSpecialWorkPermitSignService tSpecialWorkPermitSignService;
+
     /**
      * 查询作业许可证列表
      */
@@ -38,9 +48,50 @@ public class TWorkPermitController extends BaseController
         startPage();
         List<TWorkPermit> list = tWorkPermitService.selectTWorkPermitList(tWorkPermit);
         //setOperator(list);
+        setApprovalInfo(list);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据登录用户查询作业单
+     * @param tWorkPermit
+     * @return
+     */
+    @GetMapping("/selectTWorkPermitListByLoginUser")
+    public TableDataInfo selectTWorkPermitListByLoginUser(TWorkPermit tWorkPermit){
+        startPage();
+        tWorkPermit.setCurrentLoginUser(SecurityUtils.getLoginUser().getUser().getUserId());
+        List<TWorkPermit> list = tWorkPermitService.selectTWorkPermitListByLoginUser(tWorkPermit);
+        //setOperator(list);
+        setApprovalInfo(list);
         return getDataTable(list);
     }
 
+    /**
+     * 获取审核人信息
+     * @param list 作业许可证列表
+     */
+    private void setApprovalInfo(List<TWorkPermit> list){
+        for(TWorkPermit tWorkPermit : list){
+            List<Long> approvalIds = new ArrayList<>();
+            if("1".equals(tWorkPermit.getApplyStatus())){
+                TSpecialWorkPermit tSpecialWorkPermit = new TSpecialWorkPermit();
+                tSpecialWorkPermit.setWorkPermitId(tWorkPermit.getWorkPermitId());
+                List<TSpecialWorkPermit> specialWorkPermits =tSpecialWorkPermitService.selectTSpecialWorkPermitList(tSpecialWorkPermit);
+                for(TSpecialWorkPermit specialWorkPermit : specialWorkPermits){
+                    TSpecialWorkPermitSign tSpecialWorkPermitSign = new TSpecialWorkPermitSign();
+                    tSpecialWorkPermitSign.setPermitId(specialWorkPermit.getSpecialWorkPermitId());
+                    List<TSpecialWorkPermitSign> specialWorkPermitSigns = tSpecialWorkPermitSignService.selectTSpecialWorkPermitSignList(tSpecialWorkPermitSign);
+                    for(TSpecialWorkPermitSign specialWorkPermitSign: specialWorkPermitSigns){
+                        approvalIds.add(specialWorkPermitSign.getStaffId());
+                    }
+                }
+            }
+            tWorkPermit.setApprovals(approvalIds);
+        }
+
+    }
+
     /**
      * 根据许可证状态及登录人设置操作权限
      * @param list 作业许可证列表

danger-manage-system/src/main/java/com/zehong/system/domain/TNfcRecord.java

@@ -21,47 +21,41 @@ public class TNfcRecord extends BaseEntity {
     /**
      * nfc_id
      */
-    @Excel(name = "nfc_id")
     private Long nfcId;
 
-    /**
-     * 是否正常 0否 1是
-     */
-    @Excel(name = "是否正常 0否 1是")
-    private Integer isNormal;
-
     /**
      * 图片地址
      */
-    @Excel(name = "图片地址")
     private String picture;
 
     /**
      * 备注
      */
-    @Excel(name = "备注")
     private String remarks;
 
-    /**上报时间*/
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
     /**
      * 上报人姓名
      */
-    @Excel(name = "上报人")
     private Long createUser;
 
     /**巡检地点*/
+    @Excel(name = "巡检地点")
     private String patrolAddress;
 
+    /**巡检区域*/
+    @Excel(name = "巡检区域")
+    private String dictLabel;
+
     /**巡检内容*/
+    @Excel(name = "巡检内容")
     private String  patrolComent;
 
     /**巡检频次*/
+    @Excel(name = "巡检频次")
     private String patrolFrequency;
 
     /** 巡检人*/
+    @Excel(name = "上报人")
     private String nickName;
 
     private String userName;
@@ -70,8 +64,45 @@ public class TNfcRecord extends BaseEntity {
 
     private String endTime;
 
-    /**巡检区域*/
-    private String dictLabel;
+    /**
+     * 是否正常 0否 1是
+     */
+    @Excel(name = "巡检结果", readConverterExp = "0=异常,1=正常")
+    private Integer isNormal;
+
+    /**上报时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkStartTime;
+
+    /**
+     * 结束时间
+     * @return
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkEndTime;
+
+
+    public String getApplyWorkStartTime() {
+        return applyWorkStartTime;
+    }
+
+    public void setApplyWorkStartTime(String applyWorkStartTime) {
+        this.applyWorkStartTime = applyWorkStartTime;
+    }
+
+    public String getApplyWorkEndTime() {
+        return applyWorkEndTime;
+    }
+
+    public void setApplyWorkEndTime(String applyWorkEndTime) {
+        this.applyWorkEndTime = applyWorkEndTime;
+    }
 
     public String getDictLabel() {
         return dictLabel;

danger-manage-system/src/main/java/com/zehong/system/domain/TNfcSetting.java

 package com.zehong.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * setting对象 t_nfc_setting
  *
@@ -51,8 +51,37 @@ public class TNfcSetting extends BaseEntity
      */
     private String nickName;
 
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkStartTime;
+
+    /**
+     * 结束时间
+     * @return
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkEndTime;
+
 
 
+    public String getApplyWorkStartTime() {
+        return applyWorkStartTime;
+    }
+
+    public void setApplyWorkStartTime(String applyWorkStartTime) {
+        this.applyWorkStartTime = applyWorkStartTime;
+    }
+
+    public String getApplyWorkEndTime() {
+        return applyWorkEndTime;
+    }
+
+    public void setApplyWorkEndTime(String applyWorkEndTime) {
+        this.applyWorkEndTime = applyWorkEndTime;
+    }
+
     public String getNickName() {
         return nickName;
     }
@@ -149,6 +178,8 @@ public class TNfcSetting extends BaseEntity
                 ", isDel=" + isDel +
                 ", region='" + region + '\'' +
                 ", nickName='" + nickName + '\'' +
+                ", applyWorkStartTime=" + applyWorkStartTime +
+                ", applyWorkEndTime=" + applyWorkEndTime +
                 '}';
     }
 }

danger-manage-system/src/main/java/com/zehong/system/domain/TWorkPermit.java

@@ -102,6 +102,26 @@ public class TWorkPermit extends BaseEntity
 
     private String operator;
 
+    private List<Long> approvals;
+
+    private long currentLoginUser;
+
+    public long getCurrentLoginUser() {
+        return currentLoginUser;
+    }
+
+    public void setCurrentLoginUser(long currentLoginUser) {
+        this.currentLoginUser = currentLoginUser;
+    }
+
+    public List<Long> getApprovals() {
+        return approvals;
+    }
+
+    public void setApprovals(List<Long> approvals) {
+        this.approvals = approvals;
+    }
+
     /**
      * 签字人身份
      */

danger-manage-system/src/main/java/com/zehong/system/mapper/TStaningBookMapper.java

 package com.zehong.system.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TStaningBook;
 
 /**
@@ -58,4 +60,6 @@ public interface TStaningBookMapper
      * @return 结果
      */
     public int deleteTStaningBookByIds(Long[] bookIds);
+
+    public Map statics(String type);
 }

danger-manage-system/src/main/java/com/zehong/system/mapper/TWorkPermitMapper.java

@@ -58,4 +58,11 @@ public interface TWorkPermitMapper
      * @return 结果
      */
     public int deleteTWorkPermitByIds(Long[] workPermitIds);
+
+    /**
+     * 根据登录用户查询作业单
+     * @param tWorkPermit
+     * @return
+     */
+    List<TWorkPermit> selectTWorkPermitListByLoginUser(TWorkPermit tWorkPermit);
 }

danger-manage-system/src/main/java/com/zehong/system/service/ITStaningBookService.java

 package com.zehong.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TStaningBook;
 
 /**
@@ -58,4 +60,11 @@ public interface ITStaningBookService
      * @return 结果
      */
     public int deleteTStaningBookById(Long bookId);
+
+    /**
+     * 统计数量
+     * @param type
+     * @return
+     */
+    public Map statics(String type);
 }

danger-manage-system/src/main/java/com/zehong/system/service/ITWorkPermitService.java

@@ -58,4 +58,11 @@ public interface ITWorkPermitService
      * @return 结果
      */
     public int deleteTWorkPermitById(Long workPermitId);
+
+    /**
+     * 根据登录用户查询作业单
+     * @param tWorkPermit
+     * @return
+     */
+    List<TWorkPermit> selectTWorkPermitListByLoginUser(TWorkPermit tWorkPermit);
 }

danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java

@@ -86,8 +86,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
             return a;
         }
         TNfcSetting ts = tNfcSettingMapper.getInfoByNfcNum(tNfcSetting.getNfcNum());
-        int nfcNum = tNfcSettingMapper.getNfcNum(tNfcSetting.getNfcNum());
-        if (nfcNum!=0){
+        if(ts.getNfcId()!=tNfcSetting.getNfcId()){
             ts.setNfcNum("");
             tNfcSettingMapper.updateTNfcSetting(ts);
         }

danger-manage-system/src/main/java/com/zehong/system/service/impl/TSpecialWorkPermitServiceImpl.java

@@ -160,7 +160,7 @@ public class TSpecialWorkPermitServiceImpl implements ITSpecialWorkPermitService
         TWorkPermitVo tWorkPermitVo = new TWorkPermitVo();
         TWorkPermit tWorkPermit = itWorkPermitService.selectTWorkPermitById(workPermitId);
         tWorkPermitVo.settWorkPermit(tWorkPermit);
-
+/*
         List<Integer> postIds = postService.selectPostListByUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         if(SecurityUtils.getLoginUser().getUser().getUserId().equals(Long.valueOf(tWorkPermit.getLinkMan()))){
             postIds.add(-1);
@@ -168,7 +168,7 @@ public class TSpecialWorkPermitServiceImpl implements ITSpecialWorkPermitService
         if(SecurityUtils.getLoginUser().getUser().getUserId().equals(Long.valueOf(tWorkPermit.getRatifier()))){
             postIds.add(-2);
         }
-        tWorkPermitVo.setPostIds(postIds);
+        tWorkPermitVo.setPostIds(postIds);*/
         TSpecialWorkPermit tSpecialWorkPermit = new TSpecialWorkPermit();
         tSpecialWorkPermit.setWorkPermitId(workPermitId);
         tWorkPermitVo.setSpecialWorkPermits(tSpecialWorkPermitMapper.selectTSpecialWorkPermitList(tSpecialWorkPermit));

danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaningBookServiceImpl.java

 package com.zehong.system.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import com.zehong.common.core.domain.entity.SysDept;
 import com.zehong.common.utils.DateUtils;
@@ -110,4 +111,9 @@ public class TStaningBookServiceImpl implements ITStaningBookService
     {
         return tStaningBookMapper.deleteTStaningBookById(bookId);
     }
+
+    @Override
+    public Map statics(String type) {
+        return tStaningBookMapper.statics(type);
+    }
 }

danger-manage-system/src/main/java/com/zehong/system/service/impl/TWorkPermitServiceImpl.java

@@ -93,4 +93,14 @@ public class TWorkPermitServiceImpl implements ITWorkPermitService
     {
         return tWorkPermitMapper.deleteTWorkPermitById(workPermitId);
     }
+
+    /**
+     * 根据登录用户查询作业单
+     * @param tWorkPermit
+     * @return
+     */
+    @Override
+    public List<TWorkPermit> selectTWorkPermitListByLoginUser(TWorkPermit tWorkPermit){
+        return tWorkPermitMapper.selectTWorkPermitListByLoginUser(tWorkPermit);
+    }
 }

danger-manage-system/src/main/resources/mapper/system/TNfcRecordMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TNfcRecordMapper">
-    
+
     <resultMap type="TNfcRecord" id="TNfcRecordResult">
         <result property="recordId"    column="record_id"    />
         <result property="nfcId"    column="nfc_id"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ns.`patrol_address` ,ns.`patrol_coment`,ns.`patrol_frequency`
         FROM t_nfc_record nr LEFT JOIN t_nfc_setting ns ON ns.`nfc_id` = nr.`nfc_id`
         LEFT JOIN sys_user u ON u.user_id = nr.create_user
-        <where>  
+        <where>
             <if test="nfcId != null "> and nr.nfc_id = #{nfcId}</if>
             <if test="isNormal != null "> and nr.is_normal = #{isNormal}</if>
             <if test="picture != null  and picture != ''"> and nr.picture = #{picture}</if>
@@ -39,12 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order By nr.create_time desc
     </select>
-    
+
     <select id="selectTNfcRecordById" parameterType="Long" resultMap="TNfcRecordResult">
         <include refid="selectTNfcRecordVo"/>
         where record_id = #{recordId}
     </select>
-        
+
     <insert id="insertTNfcRecord" parameterType="TNfcRecord" useGeneratedKeys="true" keyProperty="recordId">
         insert into t_nfc_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -83,9 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTNfcRecordByIds" parameterType="String">
-        delete from t_nfc_record where record_id in 
+        delete from t_nfc_record where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>

danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml

@@ -28,6 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="region != null  and region != ''"> and  region = #{region}</if>
             <if test="patrolAddress != null  and patrolAddress != ''"> and patrol_address = #{patrolAddress}</if>
             <if test="nfcNum != null  and nfcNum != ''"> and nfc_num = #{nfcNum}</if>
+            <if test="applyWorkStartTime!=null and applyWorkStartTime!=''">
+                and a.create_time &gt;= #{applyWorkStartTime}
+            </if>
+            <if test="applyWorkEndTime!=null and applyWorkEndTime!=''">
+               and a.create_time &lt;= #{applyWorkEndTime}
+            </if>
         </where>
         order  by patrol_sort
     </select>
@@ -107,6 +113,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="region != null and region != ''">
                 and b.region=#{region}
             </if>
+            <if test="applyWorkStartTime!=null and applyWorkStartTime!=''">
+                and a.create_time &gt;= #{applyWorkStartTime}
+            </if>
+            <if test="applyWorkEndTime!=null and applyWorkEndTime!=''">
+                and a.create_time &lt;= #{applyWorkEndTime}
+            </if>
         </where>
 			group by a.create_time desc
     </select>

danger-manage-system/src/main/resources/mapper/system/TStaningBookMapper.xml

@@ -180,4 +180,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{bookId}
         </foreach>
     </delete>
+    <select id="statics" parameterType="String" resultType="Map">
+        select count(1) faxian,sum(case state when '2' then 1 else 0 end )as zhenggai from t_staning_book where is_del=0
+        <if test="type=='day'">
+            and DATE_SUB(now(), INTERVAL 1 DAY) &lt; date(find_time)
+        </if>
+        <if test="type=='month'">
+            and DATE_SUB(now(), INTERVAL 30 DAY) &lt; date(find_time)
+        </if>
+        <if test="type=='year'">
+            and DATE_SUB(now(), INTERVAL 365 DAY) &lt; date(find_time)
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

danger-manage-system/src/main/resources/mapper/system/TWorkPermitMapper.xml

@@ -152,4 +152,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{workPermitId}
         </foreach>
     </delete>
+
+    <select id="selectTWorkPermitListByLoginUser" parameterType="TWorkPermit" resultMap="TWorkPermitResult">
+        SELECT
+        permit.work_permit_id,
+        permit.apply_dept,
+        permit.link_man,
+        permit.link_phone,
+        permit.work_bound,
+        permit.device_name,
+        permit.device_num,
+        permit.apply_work_start_time,
+        permit.apply_work_end_time,
+        permit.work_content,
+        permit.contractor,
+        permit.ratifier,
+        permit.main_dangerous_mark,
+        permit.dangerous_mark_detial,
+        permit.licence_info,
+        permit.relation_sign,
+        permit.produce_comfirm,
+        permit.work_deal,
+        permit.apply_status,
+        permit.create_time,
+        permit.update_time,
+        permit.remarks
+        FROM
+         t_work_permit permit
+        LEFT JOIN t_special_work_permit special ON permit.work_permit_id = special.work_permit_id
+        LEFT JOIN t_special_work_permit_sign sign ON special.special_work_permit_id = sign.permit_id
+        WHERE (
+            permit.link_man = #{currentLoginUser}
+            OR sign.sign_id = #{currentLoginUser}
+        )
+        <where>
+            <if test="applyDept != null  and applyDept != ''"> and apply_dept = #{applyDept}</if>
+            <if test="linkMan != null  and linkMan != ''"> and link_man = #{linkMan}</if>
+            <if test="linkPhone != null  and linkPhone != ''"> and link_phone = #{linkPhone}</if>
+            <if test="workBound != null  and workBound != ''"> and work_bound = #{workBound}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceNum != null  and deviceNum != ''"> and device_num like concat('%', #{deviceNum},'%')</if>
+            <if test="applyWorkStartTime != null "> and apply_work_start_time = #{applyWorkStartTime}</if>
+            <if test="applyWorkEndTime != null "> and apply_work_end_time = #{applyWorkEndTime}</if>
+            <if test="workContent != null  and workContent != ''"> and work_content = #{workContent}</if>
+            <if test="contractor != null "> and contractor = #{contractor}</if>
+            <if test="ratifier != null "> and ratifier = #{ratifier}</if>
+            <if test="mainDangerousMark != null  and mainDangerousMark != ''"> and main_dangerous_mark = #{mainDangerousMark}</if>
+            <if test="dangerousMarkDetial != null  and dangerousMarkDetial != ''"> and dangerous_mark_detial = #{dangerousMarkDetial}</if>
+            <if test="licenceInfo != null  and licenceInfo != ''"> and licence_info = #{licenceInfo}</if>
+            <if test="relationSign != null  and relationSign != ''"> and relation_sign = #{relationSign}</if>
+            <if test="produceComfirm != null  and produceComfirm != ''"> and produce_comfirm = #{produceComfirm}</if>
+            <if test="workDeal != null  and workDeal != ''"> and work_deal = #{workDeal}</if>
+            <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+        GROUP BY permit.work_permit_id
+        ORDER BY create_time DESC
+    </select>
 </mapper>
\ No newline at end of file

danger-manage-web/src/api/indexChars/chars.js

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-10-07 09:05:29
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-10-07 10:16:10
+ * @LastEditTime: 2022-10-22 11:25:50
  * @FilePath: /danger-manage-web/src/api/indexChars/chars.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -17,3 +17,11 @@ export function getRypbData(query) {
     params: query,
   });
 }
+// 巡检统计年月日
+export function getxjtjYMD(query) {
+  return request({
+    url: "/system/book/statics",
+    method: "get",
+    params: query,
+  });
+}

danger-manage-web/src/api/system/statistics.js

@@ -51,3 +51,12 @@ export function exportSetting(query) {
     params: query
   })
 }
+
+//
+export function exportPunchClockList(query) {
+  return request({
+    url: '/system/inspection/exportPunchClockList',
+    method: 'get',
+    params: query
+  })
+}

danger-manage-web/src/api/workPermit/permit.js

@@ -9,6 +9,14 @@ export function listPermit(query) {
   })
 }
 
+export function selectTWorkPermitListByLoginUser(query) {
+  return request({
+    url: '/work/permit/selectTWorkPermitListByLoginUser',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询作业许可证详细
 export function getPermit(workPermitId) {
   return request({

danger-manage-web/src/components/DangerousMark/NewWorkPermitDetail.vue

+<template>
+  <el-dialog title="作业单" :visible.sync="certificateDetailOpen" width="900px" :close-on-click-modal="false" append-to-body :before-close="certificateDetailClose">
+    <div class="tags_box">
+      <div class="tags">
+        <div :class="{isActive:'workPermit'== active}" @click="handelToogel('workPermit')">作业单</div>
+      </div>
+      <div v-for="item in specialWorkPermits" class="tags">
+        <div :class="{isActive:item.specialWorkType==active}" @click="handelToogel(item.specialWorkType)">{{ getTagName(item.specialWorkType) }}</div>
+      </div>
+    </div>
+    <div class="con_box">
+      <div v-show="active == 'workPermit'">
+        <table id="workPermitPrint">
+          <tr>
+            <td rowspan="4" colspan="2">作业许可申请人</td>
+            <td colspan="2">申请部门/单位</td>
+            <td colspan="2">{{certificateData.applyDept}}</td>
+            <td colspan="2">申请人及联系方式</td>
+            <td colspan="2">{{certificateData.linkMan}}|{{certificateData.linkPhone}}</td>
+          </tr>
+          <tr>
+            <td colspan="2">作业区域范围</td>
+            <td colspan="2">{{certificateData.workBound}}</td>
+            <td colspan="2">设备名称及编号</td>
+            <td colspan="2">{{certificateData.deviceName}}|{{certificateData.deviceNum}}</td>
+          </tr>
+          <tr>
+            <td colspan="2">申请作业时间</td>
+            <td colspan="6">
+              {{ certificateData.applyWorkStartTime == null ? "-" :certificateData.applyWorkStartTime.split(" ")[0].split("-")[1]}}月{{certificateData.applyWorkStartTime == null ? "-" :certificateData.applyWorkStartTime.split(" ")[0].split("-")[2]}}日{{certificateData.applyWorkStartTime == null ? "-" :certificateData.applyWorkStartTime.split(" ")[1].split(":")[0]}}时{{certificateData.applyWorkStartTime == null ? "-" :certificateData.applyWorkStartTime.split(" ")[1].split(":")[1]}}分至{{certificateData.applyWorkEndTime == null ? "-" :certificateData.applyWorkEndTime.split(" ")[0].split("-")[1]}}月{{certificateData.applyWorkEndTime == null ? "-" :certificateData.applyWorkEndTime.split(" ")[0].split("-")[2]}}日{{certificateData.applyWorkEndTime == null ? "-" :certificateData.applyWorkEndTime.split(" ")[1].split(":")[0]}}时{{certificateData.applyWorkEndTime == null ? "-" :certificateData.applyWorkEndTime.split(" ")[1].split(":")[1]}}分
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">作业内容</td>
+            <td colspan="6">{{certificateData.workContent}}</td>
+          </tr>
+          <tr>
+            <td colspan="2">所有相关方讨论</td>
+            <td>工作安全分析</td>
+            <td style="writing-mode: vertical-rl;">危害识别</td>
+            <td colspan="6" style="text-align: left">
+              <div><input type="checkbox" disabled v-model="mainDangerousMark.burn">灼伤（低温/高温/化学品灼伤,电弧烧伤,火灾，易燃气/液体，蒸汽，电焊、动火、射线等）</div>
+              <div><input type="checkbox" disabled v-model="mainDangerousMark.electricShock">电击（触电，电压，不适当的接地，电气热作业，地下/暗线等）。</div>
+              <div><input type="checkbox" disabled v-model="mainDangerousMark.objectStrike">物体打击（爆炸，压力，能量释放，移动/坠落的物体，不正确的存放,设备）</div>
+              <div><input type="checkbox" disabled v-model="mainDangerousMark.stifle">窒息/中毒（惰性气体，有毒气体，易挥发的液体溶剂等）</div>
+              <div><input type="checkbox" disabled v-model="mainDangerousMark.drop">坠落（高处作业，没有防护的开口，没有固定的梯子，脚手架搭设，无防护的平台等）</div>
+              <div><input type="checkbox" disabled v-model="mainDangerousMark.vehicleInjury">车辆伤害（速度过快,疲劳驾驶,车辆故障,缺乏防御性驾驶,能见度差,不寻常的路状，分心等）</div>
+              <div><input type="checkbox" disabled v-model="mainDangerousMark.other">其它危害。</div>
+              <div>注：如存在以上任一情况，请填写安全措施。</div>
+            </td>
+          </tr>
+          <tr>
+            <td rowspan="4" colspan="2">批准人填写</td>
+            <td rowspan="4" colspan="2">许可证</td>
+            <td colspan="6" style="text-align: left">是否需要进一步的JSA: <input disabled type="checkbox" v-model="licenceInfo.jsa.yes"/>否<input type="checkbox" disabled v-model="licenceInfo.jsa.no"/>是  JSA[<input class="editInput" disabled v-model="licenceInfo.jsa.num" style="width: 250px" placeholder="填写JSA编号"/>]</td>
+          </tr>
+          <tr>
+            <td colspan="6" style="text-align: left"><input disabled type="checkbox" v-model="licenceInfo.specialLicence"/>0无需特殊工作许可</td>
+          </tr>
+          <tr>
+            <td colspan="6" style="text-align: left">
+              <div><input type="checkbox" disabled v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" disabled v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" disabled v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="6" style="text-align: left;">
+              <div><input type="checkbox" disabled v-model="licenceInfo.flareUp.isChecked"/>2动火作业许可证 [<input class="editInput" disabled v-model="licenceInfo.flareUp.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.heightWork.isChecked"/>3高处作业许可证 [<input class="editInput" disabled v-model="licenceInfo.heightWork.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.breakGround.isChecked"/>4动土作业许可证 [<input class="editInput" disabled v-model="licenceInfo.breakGround.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" disabled v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.limitSpace.isChecked"/>6受限空间作业许可证 [<input class="editInput" disabled v-model="licenceInfo.limitSpace.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.electricityUse.isChecked"/>7临时用电许可证 [<input class="editInput" disabled v-model="licenceInfo.electricityUse.num" style="width: 250px" placeholder="填写编号"/>]</div>
+              <div><input type="checkbox" disabled v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" disabled v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">相关方填写</td>
+            <td colspan="4">
+              <div style="text-align: left">
+                承包商:
+                <textarea disabled v-model="relationSign.contractor" style="height: 96px"></textarea>
+              </div>
+
+            </td>
+            <td colspan="4">
+              <div style="text-align: left">
+                负责人：
+                <textarea disabled v-model="relationSign.personCharge" style="height: 96px"></textarea>
+              </div>
+            </td>
+          </tr>
+          <tr v-if="(certificateData.applyStatus-0)>3">
+            <td colspan="2">生产班组确认</td>
+            <td colspan="8">
+              <el-row>
+                <el-col :span="8" style="text-align: left">本人已知晓此工作许可证的内容</el-col>
+                <el-col :span="8" style="text-align: right">确认签字（当班班长）：</el-col>
+                <el-col :span="8"><NewEsign :resultImg.sync ="produceComfirm.monitorName" :isReWrite="false" :width="918" :height="100"/></el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24" style="text-align: right">日期/时间：<input style="width: 228px" disabled v-model="produceComfirm.date" class="editInput"/></el-col>
+              </el-row>
+            </td>
+          </tr>
+        </table>
+        <div style="margin-top:10px;float: right"><el-button type="primary" v-print="'#workPermitPrint'">打印</el-button></div>
+      </div>
+      <div v-for="item in specialWorkPermits" v-show="active == item.specialWorkType">
+        <FlareUp v-if="item.specialWorkType == 'flareUp'"
+                 :ref="item.specialWorkType"
+                 :workPermitId = "item.workPermitId"
+                 :licenceNum = "item.licenceNum"
+                 applyStatus="4"/>
+      </div>
+
+    </div>
+
+  </el-dialog>
+
+</template>
+
+<script>
+  import NewEsign from "@/components/SaftyWork/NewEsign";
+  import FlareUp from "@/components/NewSaftyWork/FlareUp";
+  import { getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
+  import { listSign } from "@/api/workPermit/workPermitSign";
+    export default {
+      components: {
+        NewEsign,
+        FlareUp
+      },
+      name: "new-work-permit-detail",
+      props:{
+        certificateDetailOpen:{
+          type:Boolean,
+          default:false
+        },
+        certificateData:{
+          type:Object
+        }
+      },
+      data(){
+        return{
+          mainDangerousMark :{
+            burn : false,
+            electricShock : false,
+            objectStrike : false,
+            stifle : false,
+            drop : false,
+            vehicleInjury : false,
+            other : false
+          },
+          licenceInfo : {
+            lockListing: {
+              num: "",
+              isChecked: false
+            },
+            blindPlate: {
+              num: "",
+              isChecked: false,
+              status: "0"
+            },
+            breakGround: {
+              num: "",
+              isChecked: false,
+              status: "0"
+            },
+            limitSpace: {
+              num: "",
+              isChecked: false,
+              status: "0"
+            },
+            jsa: {
+              no: false,
+              yes: false,
+              num: ""
+            },
+            specialLicence: false,
+            flareUp: {
+              num: "",
+              isChecked: false,
+              status: "0"
+            },
+            hoisting: {
+              num: "",
+              isChecked: false,
+              status: "0"
+            },
+            ray: {
+              num: "",
+              isChecked: false,
+              status: "0"
+            },
+            electricityUse: {
+              num: "",
+              isChecked: false,
+              status: "0"
+            },
+            heightWork: {
+              num: "",
+              isChecked: false,
+              status: "0"
+            }
+          },
+          relationSign:{
+            contractor:"",
+            personCharge:""
+          },
+          produceComfirm:{
+            leaderDeptId:"",
+            monitorId:"",
+            monitorName:"",
+            date:""
+          },
+          active:"workPermit",
+          specialWorkPermits:[]
+        }
+      },
+      watch:{
+        certificateDetailOpen(newValue){
+          if(null != this.certificateData.mainDangerousMark){
+            this.mainDangerousMark = JSON.parse(this.certificateData.mainDangerousMark);
+          }
+          if(null != this.certificateData.licenceInfo){
+            this.licenceInfo = JSON.parse(this.certificateData.licenceInfo);
+          }
+          if(null != this.certificateData.relationSign){
+            this.relationSign = JSON.parse(this.certificateData.relationSign);
+          }
+          if(null != this.certificateData.produceComfirm){
+            this.produceComfirm = JSON.parse(this.certificateData.produceComfirm);
+          }
+          this.specialWorkPermit();
+        }
+      },
+      methods:{
+        certificateDetailClose(){
+          this.$emit('update:certificateDetailOpen',false);
+        },
+        handelToogel(item) {
+          this.active = item;
+        },
+        specialWorkPermit(){
+          getSpecialWorkPermitByWorkPermitId({workPermitId:this.certificateData.workPermitId}).then(res =>{
+            this.specialWorkPermits = res.data.specialWorkPermits;
+            for(let key in this.specialWorkPermits ){
+              this.$nextTick(() => {
+                listSign({ pageNum: 1,pageSize: 99999,permitId:this.specialWorkPermits[key].specialWorkPermitId}).then(res =>{
+                  this.$refs[this.specialWorkPermits[key].specialWorkType][0][this.specialWorkPermits[key].specialWorkType] = JSON.parse(this.specialWorkPermits[key].specialWorkData);
+                  this.$refs[this.specialWorkPermits[key].specialWorkType][0].specialWorkPermitId = this.specialWorkPermits[key].specialWorkPermitId;
+                  this.$refs[this.specialWorkPermits[key].specialWorkType][0].specialWorkPermitSigns = res.rows;
+                })
+              })
+            }
+          })
+        },
+        //获取tag名称
+        getTagName(key){
+          switch(key){
+            case "blindPlate":
+              return "盲板抽堵作业许可";
+            case "flareUp":
+              return "动火作业许可证";
+            case "heightWork":
+              return "高处作业许可证";
+            case "breakGround":
+              return "动土作业许可证";
+            case "hoisting":
+              return "吊装作业许可证";
+            case "limitSpace":
+              return "受限空间作业许可证";
+            case "electricityUse":
+              return "临时用电许可证";
+            case "ray":
+              return "射线探伤许可证";
+            default:
+              return "";
+          }
+        },
+
+      }
+    }
+</script>
+
+<style scoped lang="scss">
+  table{
+    border-collapse: collapse;
+    table-layout: fixed;
+    text-align: center;
+    width: 100%;
+  }
+  table td, table th{
+    border: 1px solid;
+    height: 30px;
+  }
+
+  .editInput{
+    border: none;
+    width: 100%;
+    height: 100%;
+    text-align: center;
+  }
+
+  .editInput:focus{
+    outline: none;
+  }
+
+  .editLine{
+    border-bottom: 1px solid;
+    border-top: none;
+    border-left: none;
+    border-right: none;
+    text-align: center;
+  }
+
+  .editLine:focus{
+    outline: none;
+  }
+
+
+  textarea{
+    height: 100%;
+    width: 100%;
+    border: none;
+    resize:none;
+  }
+
+  textarea:focus{
+    outline: none;
+  }
+
+
+  .tags_box {
+    height: 10%;
+    display: flex;
+  .tags {
+  div {
+    padding: 10px 20px;
+    cursor: pointer;
+    border: #cccccc 1px solid;
+    #margin-right: 20px;
+    #border-radius: 5px;
+  }
+  .isActive {
+    background-color: #409EFF;
+    color: white;
+  }
+  }
+  }
+
+  .con_box {
+    height: 500px;;
+    border: #cccccc 1px solid;
+    padding: 10px;
+    overflow-y: scroll;
+    overflow-x: hidden;
+  &::-webkit-scrollbar {
+     width:5px;
+   }
+  &::-webkit-scrollbar-track {
+     -webkit-box-shadow:inset006pxrgba(0,0,0,0.3);
+     border-radius:10px;
+   }
+  &::-webkit-scrollbar-thumb {
+     border-radius:5px;
+     background:rgba(0,0,0,0.1);
+     -webkit-box-shadow:inset006pxrgba(0,0,0,0.5);
+   }
+  }
+
+</style>

danger-manage-web/src/components/NewSaftyWork/FlareUp.vue

 <template>
   <div>
-    <table>
+    <table id="flareUpPrint">
       <tr>
         <td colspan="4">申请单位</td>
-        <td colspan="3"><input v-model="flareUp.applyUnit" class="editInput"/></td>
+        <td colspan="3"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.applyUnit" class="editInput"/></td>
         <td colspan="3">作业申请时间</td>
-        <td colspan="5">
+        <td colspan="5" v-if="(applyStatus-0) == 0">
           <el-date-picker clearable size="small"
                           v-model="flareUp.applyDate"
                           type="datetime"
@@ -14,38 +14,41 @@
                           style="width: 100%">
           </el-date-picker>
         </td>
+        <td colspan="5"  v-if="(applyStatus-0) > 0">
+          {{ (flareUp.applyDate == null || flareUp.applyDate =='') ? "-" :flareUp.applyDate.split(" ")[0].split("-")[1]}}年{{ (flareUp.applyDate == null || flareUp.applyDate =='') ? "-" :flareUp.applyDate.split(" ")[0].split("-")[1]}}月{{(flareUp.applyDate == null || flareUp.applyDate =='') ? "-" :flareUp.applyDate.split(" ")[0].split("-")[2]}}日{{(flareUp.applyDate == null || flareUp.applyDate =='') ? "-" :flareUp.applyDate.split(" ")[1].split(":")[0]}}时{{(flareUp.applyDate == null || flareUp.applyDate =='') ? "-" :flareUp.applyDate.split(" ")[1].split(":")[1]}}分
+        </td>
         <td colspan="2">编号</td>
         <td colspan="3"><input v-model="flareUp.num" disabled class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">作业内容</td>
-        <td colspan="6"><input v-model="flareUp.workContent" class="editInput"/></td>
+        <td colspan="6"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.workContent" class="editInput"/></td>
         <td colspan="4">动火地点及动火部位</td>
-        <td colspan="6"><input v-model="flareUp.fireLocation" class="editInput"/></td>
+        <td colspan="6"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.fireLocation" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">动火作业级别</td>
         <td colspan="6">
-          特级<input v-model="flareUp.fireLevel.special" type="checkbox"/>
-          一级<input v-model="flareUp.fireLevel.first" type="checkbox"/>
-          二级<input v-model="flareUp.fireLevel.second" type="checkbox"/>
+          特级<input :disabled="(applyStatus-0) > 0" v-model="flareUp.fireLevel.special" type="checkbox"/>
+          一级<input :disabled="(applyStatus-0) > 0" v-model="flareUp.fireLevel.first" type="checkbox"/>
+          二级<input :disabled="(applyStatus-0) > 0" v-model="flareUp.fireLevel.second" type="checkbox"/>
         </td>
         <td colspan="4">动火方式</td>
-        <td colspan="6"><input v-model="flareUp.fireMethod" class="editInput"/></td>
+        <td colspan="6"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.fireMethod" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">动火人及证书编号</td>
-        <td colspan="16"><input v-model="flareUp.pepeloAndLinceseNum" class="editInput"/></td>
+        <td colspan="16"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.pepeloAndLinceseNum" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">作业单位</td>
-        <td colspan="6"><input v-model="flareUp.workUnit" class="editInput"/></td>
+        <td colspan="6"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.workUnit" class="editInput"/></td>
         <td colspan="4">作业负责人</td>
-        <td colspan="6"><input v-model="flareUp.leader" class="editInput"/></td>
+        <td colspan="6"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.leader" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">气体取样分析时间</td>
-        <td colspan="4">
+        <td colspan="4" v-if="(applyStatus-0) == 0">
           <el-date-picker clearable size="small"
                           v-model="flareUp.firstSimple.simpleDate"
                           type="datetime"
@@ -54,7 +57,7 @@
                           style="width: 100%">
           </el-date-picker>
         </td>
-        <td colspan="4">
+        <td colspan="4" v-if="(applyStatus-0) == 0">
           <el-date-picker clearable size="small"
                           v-model="flareUp.secondSimple.simpleDate"
                           type="datetime"
@@ -63,7 +66,7 @@
                           style="width: 100%">
           </el-date-picker>
         </td>
-        <td colspan="4">
+        <td colspan="4" v-if="(applyStatus-0) == 0">
           <el-date-picker clearable size="small"
                           v-model="flareUp.thirdSimple.simpleDate"
                           type="datetime"
@@ -72,7 +75,7 @@
                           style="width: 100%">
           </el-date-picker>
         </td>
-        <td colspan="4">
+        <td colspan="4" v-if="(applyStatus-0) == 0">
           <el-date-picker clearable size="small"
                           v-model="flareUp.fourthSimple.simpleDate"
                           type="datetime"
@@ -81,114 +84,130 @@
                           style="width: 100%">
           </el-date-picker>
         </td>
+
+        <td colspan="4" v-if="(applyStatus-0) >0">
+          {{ (flareUp.firstSimple.simpleDate == null || flareUp.firstSimple.simpleDate =='') ? "-" :flareUp.firstSimple.simpleDate.split(" ")[0].split("-")[1]}}月{{(flareUp.firstSimple.simpleDate == null || flareUp.firstSimple.simpleDate =='') ? "-" :flareUp.firstSimple.simpleDate.split(" ")[0].split("-")[2]}}日{{(flareUp.firstSimple.simpleDate == null || flareUp.firstSimple.simpleDate =='') ? "-" :flareUp.firstSimple.simpleDate.split(" ")[1].split(":")[0]}}时{{(flareUp.firstSimple.simpleDate == null || flareUp.firstSimple.simpleDate =='') ? "-" :flareUp.firstSimple.simpleDate.split(" ")[1].split(":")[1]}}分
+        </td>
+        <td colspan="4" v-if="(applyStatus-0) >0">
+          {{ (flareUp.secondSimple.simpleDate == null || flareUp.secondSimple.simpleDate =='') ? "-" :flareUp.secondSimple.simpleDate.split(" ")[0].split("-")[1]}}月{{(flareUp.secondSimple.simpleDate == null || flareUp.firstSimple.simpleDate =='') ? "-" :flareUp.secondSimple.simpleDate.split(" ")[0].split("-")[2]}}日{{(flareUp.secondSimple.simpleDate == null || flareUp.secondSimple.simpleDate =='') ? "-" :flareUp.secondSimple.simpleDate.split(" ")[1].split(":")[0]}}时{{(flareUp.secondSimple.simpleDate == null || flareUp.secondSimple.simpleDate =='') ? "-" :flareUp.secondSimple.simpleDate.split(" ")[1].split(":")[1]}}分
+        </td>
+        <td colspan="4" v-if="(applyStatus-0) >0">
+          {{ (flareUp.thirdSimple.simpleDate == null || flareUp.thirdSimple.simpleDate =='') ? "-" :flareUp.thirdSimple.simpleDate.split(" ")[0].split("-")[1]}}月{{(flareUp.thirdSimple.simpleDate == null || flareUp.firstSimple.simpleDate =='') ? "-" :flareUp.thirdSimple.simpleDate.split(" ")[0].split("-")[2]}}日{{(flareUp.thirdSimple.simpleDate == null || flareUp.thirdSimple.simpleDate =='') ? "-" :flareUp.thirdSimple.simpleDate.split(" ")[1].split(":")[0]}}时{{(flareUp.thirdSimple.simpleDate == null || flareUp.thirdSimple.simpleDate =='') ? "-" :flareUp.thirdSimple.simpleDate.split(" ")[1].split(":")[1]}}分
+        </td>
+        <td colspan="4" v-if="(applyStatus-0) >0">
+          {{ (flareUp.fourthSimple.simpleDate == null || flareUp.fourthSimple.simpleDate =='') ? "-" :flareUp.fourthSimple.simpleDate.split(" ")[0].split("-")[1]}}月{{(flareUp.fourthSimple.simpleDate == null || flareUp.firstSimple.simpleDate =='') ? "-" :flareUp.fourthSimple.simpleDate.split(" ")[0].split("-")[2]}}日{{(flareUp.fourthSimple.simpleDate == null || flareUp.fourthSimple.simpleDate =='') ? "-" :flareUp.fourthSimple.simpleDate.split(" ")[1].split(":")[0]}}时{{(flareUp.fourthSimple.simpleDate == null || flareUp.fourthSimple.simpleDate =='') ? "-" :flareUp.fourthSimple.simpleDate.split(" ")[1].split(":")[1]}}分
+        </td>
       </tr>
       <tr>
         <td colspan="4">代表性气体</td>
-        <td colspan="4"><input v-model="flareUp.firstSimple.simpleGas" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.secondSimple.simpleGas" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.thirdSimple.simpleGas" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.fourthSimple.simpleGas" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.firstSimple.simpleGas" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.secondSimple.simpleGas" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.thirdSimple.simpleGas" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.fourthSimple.simpleGas" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">分析结果/%</td>
-        <td colspan="4"><input v-model="flareUp.firstSimple.simpleResult" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.secondSimple.simpleResult" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.thirdSimple.simpleResult" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.fourthSimple.simpleResult" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.firstSimple.simpleResult" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.secondSimple.simpleResult" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.thirdSimple.simpleResult" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.fourthSimple.simpleResult" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">分析人</td>
-        <td colspan="4"><input v-model="flareUp.firstSimple.simplePeople" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.secondSimple.simplePeople" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.thirdSimple.simplePeople" class="editInput"/></td>
-        <td colspan="4"><input v-model="flareUp.fourthSimple.simplePeople" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.firstSimple.simplePeople" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.secondSimple.simplePeople" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.thirdSimple.simplePeople" class="editInput"/></td>
+        <td colspan="4"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.fourthSimple.simplePeople" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">关联的其他特殊作业及安全作业票编号</td>
-        <td colspan="16"><input v-model="flareUp.specialLinceseNum" class="editInput"/></td>
+        <td colspan="16"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.specialLinceseNum" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">风险辨识结果在下列画√</td>
         <td colspan="16" style="text-align: left">
           <el-row>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.hit" type="checkbox"/>1.物体打击
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.hit" type="checkbox"/>1.物体打击
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.vehicleInjuries" type="checkbox"/>2.车辆伤害
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.vehicleInjuries" type="checkbox"/>2.车辆伤害
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.mechanicalInjuries" type="checkbox"/>3.机械伤害
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.mechanicalInjuries" type="checkbox"/>3.机械伤害
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.liftingInjury" type="checkbox"/>4.起重伤害
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.liftingInjury" type="checkbox"/>4.起重伤害
             </el-col>
             <el-col :span="4">
-              <input v-model="flareUp.dangerousResult.electricShock" type="checkbox"/> 5.触电
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.electricShock" type="checkbox"/> 5.触电
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.drowning" type="checkbox"/> 6.淹溺
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.drowning" type="checkbox"/> 6.淹溺
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.scald" type="checkbox"/> 7.灼烫
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.scald" type="checkbox"/> 7.灼烫
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.fire" type="checkbox"/> 8.火灾
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.fire" type="checkbox"/> 8.火灾
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.drop" type="checkbox"/> 9.高处坠落
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.drop" type="checkbox"/> 9.高处坠落
             </el-col>
             <el-col :span="4">
-              <input v-model="flareUp.dangerousResult.collapse" type="checkbox"/> 10.坍塌
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.collapse" type="checkbox"/> 10.坍塌
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.boilerExplosion" type="checkbox"/> 11.锅炉爆炸
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.boilerExplosion" type="checkbox"/> 11.锅炉爆炸
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.containerExplosion" type="checkbox"/> 12.容器爆炸
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.containerExplosion" type="checkbox"/> 12.容器爆炸
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.otherExplosion" type="checkbox"/> 13.其它爆炸
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.otherExplosion" type="checkbox"/> 13.其它爆炸
             </el-col>
             <el-col :span="5">
-              <input v-model="flareUp.dangerousResult.poisoning" type="checkbox"/> 14.中毒和窒息
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.poisoning" type="checkbox"/> 14.中毒和窒息
             </el-col>
             <el-col :span="4">
-              <input v-model="flareUp.dangerousResult.otherHurt" type="checkbox"/>15.其它伤害
+              <input :disabled="(applyStatus-0) > 0" v-model="flareUp.dangerousResult.otherHurt" type="checkbox"/>15.其它伤害
             </el-col>
           </el-row>
         </td>
       </tr>
       <tr>
         <td colspan="4">动火作业实施时间</td>
-        <td colspan="16">
-          <el-row>
-            <el-col :span="11">
-              <el-date-picker clearable size="small"
-                              v-model="flareUp.executeStartTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="选择实施开始时间"
-                              style="width: 100%">
-              </el-date-picker>
-            </el-col>
-            <el-col :span="2" style="margin-top: 5px">
-              至
-            </el-col>
-            <el-col :span="11">
-              <el-date-picker clearable size="small"
-                              v-model="flareUp.executeEndTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="选择实施结束时间"
-                              style="width: 100%">
-              </el-date-picker>
-            </el-col>
-          </el-row>
+        <td colspan="16" v-if="(applyStatus-0) ==1">
+        <el-row>
+          <el-col :span="11">
+            <el-date-picker clearable size="small"
+                            v-model="flareUp.executeStartTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择实施开始时间"
+                            style="width: 100%">
+            </el-date-picker>
+          </el-col>
+          <el-col :span="2" style="margin-top: 5px">
+            至
+          </el-col>
+          <el-col :span="11">
+            <el-date-picker clearable size="small"
+                            v-model="flareUp.executeEndTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择实施结束时间"
+                            style="width: 100%">
+            </el-date-picker>
+          </el-col>
+        </el-row>
+      </td>
+        <td colspan="16" v-if="(applyStatus-0) !=1">
+          自{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}年{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}月{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[2]}}日{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[0]}}时{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[1]}}分至{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}年{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[1]}}月{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[2]}}日{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[0]}}时{{(flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[1].split(":")[1]}}分
         </td>
       </tr>
       <tr>
@@ -200,372 +219,318 @@
       <tr>
         <td colspan="2">1</td>
         <td colspan="14">动火设备内部构件清洗干净,蒸汽吹扫或水洗、置换合格,达到动火条件；</td>
-        <td colspan="2"><input v-model="flareUp.deviceClean.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.deviceClean.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.deviceClean.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.deviceClean.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">2</td>
-        <td colspan="14">与动火设备相连接的所有管线已断开,加盲板<input v-model="flareUp.blindPlate.block" class="editLine" style="width: 50px"/>块，未采取水封或仅关闭阀门的方式代替盲板；</td>
-        <td colspan="2"><input v-model="flareUp.blindPlate.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.blindPlate.comfire" class="editInput"/></td>
+        <td colspan="14">与动火设备相连接的所有管线已断开,加盲板<input :disabled="(applyStatus-0) > 0" v-model="flareUp.blindPlate.block" class="editLine" style="width: 50px"/>块，未采取水封或仅关闭阀门的方式代替盲板；</td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.blindPlate.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.blindPlate.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">3</td>
         <td colspan="14">动火点周围及附近的孔洞、窨井、地沟、水封设施、污水井等已清除易燃物，并已采取覆盖、铺沙等手段进行隔离；</td>
-        <td colspan="2"><input v-model="flareUp.around.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.around.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.around.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.around.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">4</td>
         <td colspan="14">罐区内动火点同一防火提内和防火间距内的储罐未进行脱水和取样作业；</td>
-        <td colspan="2"><input v-model="flareUp.tankFarm.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.tankFarm.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.tankFarm.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.tankFarm.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">5</td>
         <td colspan="14">高处作业已采取防火花飞溅措施，作业人员佩戴必要的个体防护装备；</td>
-        <td colspan="2"><input v-model="flareUp.height.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.height.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.height.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.height.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">6</td>
         <td colspan="14">在有可燃物构件和使用可燃物做防腐内衬的设备内部动火作业，已采取防火隔绝措施；</td>
-        <td colspan="2"><input v-model="flareUp.firePrevention.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.firePrevention.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.firePrevention.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.firePrevention.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">7</td>
         <td colspan="14">乙炔气瓶直立放置，已采取防倾倒措施并安装防回火装置；乙炔气瓶、氧气瓶与火源间的距离不应小于10 m,两气瓶相互间距不应小于5 m；</td>
-        <td colspan="2"><input v-model="flareUp.gasCylinder.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.gasCylinder.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.gasCylinder.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.gasCylinder.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">8</td>
-        <td colspan="14">现场配备灭火器<input v-model="flareUp.equipment.platform" class="editLine" style="width: 50px"/>台，灭火毯<input v-model="flareUp.equipment.block" class="editLine" style="width: 50px"/>块，消防蒸汽带或消防水带<input v-model="flareUp.equipment.metre" class="editLine" style="width: 50px"/>；</td>
-        <td colspan="2"><input v-model="flareUp.equipment.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.equipment.comfire" class="editInput"/></td>
+        <td colspan="14">现场配备灭火器<input :disabled="(applyStatus-0) > 0" v-model="flareUp.equipment.platform" class="editLine" style="width: 50px"/>台，灭火毯<input :disabled="(applyStatus-0) > 0" v-model="flareUp.equipment.block" class="editLine" style="width: 50px"/>块，消防蒸汽带或消防水带<input :disabled="(applyStatus-0) > 0" v-model="flareUp.equipment.metre" class="editLine" style="width: 50px"/>；</td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.equipment.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.equipment.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">9</td>
         <td colspan="14">电焊机所处位置已考虑防火防爆要求，且已可靠接地；</td>
-        <td colspan="2"><input v-model="flareUp.electricWeldingMachine.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.electricWeldingMachine.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.electricWeldingMachine.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.electricWeldingMachine.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">10</td>
         <td colspan="14">动火点周围规定距离内没有易燃易爆化学品的装卸、排放、喷漆等可能引起火灾爆炸的危险作业；</td>
-        <td colspan="2"><input v-model="flareUp.danger.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.danger.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.danger.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.danger.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">11</td>
         <td colspan="14">动火点30 m内垂直空间未排放可燃气体；15 m内垂直空间未排放可燃液体；10m范围内及动火点下方未同时进行可燃溶剂清洗或喷漆等作业，10m范围内未见有可燃性粉尘清扫作业；</td>
-        <td colspan="2"><input v-model="flareUp.combustible.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.combustible.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.combustible.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.combustible.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">12</td>
         <td colspan="14">已开展作业危害分析,制定相应的安全风险管控措施，交叉作业已明确协调人；</td>
-        <td colspan="2"><input v-model="flareUp.overlappingWork.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.overlappingWork.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.overlappingWork.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.overlappingWork.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">13</td>
         <td colspan="14">用于连续检测的移动式可燃气体检测仪已配备到位；</td>
-        <td colspan="2"><input v-model="flareUp.moveDevice.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.moveDevice.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.moveDevice.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.moveDevice.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">14</td>
         <td colspan="14">配备的摄录设备已到位，且防爆级别满足安全要求；</td>
-        <td colspan="2"><input v-model="flareUp.videography.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.videography.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.videography.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.videography.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">15</td>
         <td colspan="14">其他相关特殊作业已办理相应安全作业票，作业现场四周已设立警戒区；</td>
-        <td colspan="2"><input v-model="flareUp.special.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.special.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.special.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.special.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="2">16</td>
         <td colspan="14" style="text-align: left">
-          <div>其他安全措施：<input v-model="flareUp.otherSafeMeasure.otherDetail" class="editInput" style="width: 81%"/></div>
-          <div style="float: right">编制人：<input v-model="flareUp.otherSafeMeasure.prepared" class="editInput" style="width: 70%"/>  </div>
+          <div>其他安全措施：<input :disabled="(applyStatus-0) > 0" v-model="flareUp.otherSafeMeasure.otherDetail" class="editInput" style="width: 81%"/></div>
+          <div style="float: right">编制人：<input :disabled="(applyStatus-0) > 0" v-model="flareUp.otherSafeMeasure.prepared" class="editInput" style="width: 70%"/>  </div>
         </td>
-        <td colspan="2"><input v-model="flareUp.otherSafeMeasure.involve" class="editInput"/></td>
-        <td colspan="2"><input v-model="flareUp.otherSafeMeasure.comfire" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.otherSafeMeasure.involve" class="editInput"/></td>
+        <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.otherSafeMeasure.comfire" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">安全交底人</td>
-        <td colspan="6"><input v-model="flareUp.discloser" class="editInput"/></td>
+        <td colspan="6"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.discloser" class="editInput"/></td>
         <td colspan="4">接受交底人</td>
-        <td colspan="6"><input v-model="flareUp.receiver" class="editInput"/></td>
+        <td colspan="6"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.receiver" class="editInput"/></td>
       </tr>
       <tr>
         <td colspan="4">监护人</td>
-        <td colspan="16"><input v-model="flareUp.guardian" class="editInput"/></td>
-      </tr>
-      <!--<tr>
-        <td colspan="4">作业负责人意见</td>
-        <td colspan="6"><input v-model="flareUp.workLeader.opinion" class="editInput"/></td>
+        <td colspan="16"><input :disabled="(applyStatus-0) > 0" v-model="flareUp.guardian" class="editInput"/></td>
+      </tr>
+      <tr v-for="item in specialWorkPermitSigns" v-if="(applyStatus-0) > 0">
+        <td colspan="4" v-if="item.staffType=='leader'">作业负责人意见</td>
+        <td colspan="4" v-if="item.staffType=='beyondUnit'">所在单位意见</td>
+        <td colspan="4" v-if="item.staffType=='auditDept'">审核部门意见</td>
+        <td colspan="4" v-if="item.staffType=='approval'">动火审批人意见</td>
+        <td colspan="4" v-if="item.staffType=='fireBefore'">动火前，岗位当班班长验票情况</td>
+        <td colspan="4" v-if="item.staffType=='complete'">完工验收</td>
+        <td colspan="6" v-if="(applyStatus-0) ==1"><input :disabled="item.staffId != $store.state.user.userId" v-model="item.opinion" class="editInput"/></td>
+        <td colspan="6" v-if="(applyStatus-0) !=1"><input disabled v-model="item.opinion" class="editInput"/></td>
         <td colspan="2">签字:</td>
-        <td colspan="4"><input v-model="flareUp.workLeader.sign" class="editInput"/></td>
-        <td colspan="4">
+        <td colspan="4"><NewEsign :resultImg.sync ="item.signName" :isReWrite="(applyStatus-0) ==1" :width="918" :height="100"/></td>
+        <td colspan="4" v-if="(applyStatus-0) ==1">
           <el-date-picker clearable size="small"
-                          v-model="flareUp.workLeader.date"
+                          v-model="item.signDate"
                           type="datetime"
+                          :disabled="item.staffId != $store.state.user.userId"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           placeholder="选择时间"
                           style="width: 100%">
           </el-date-picker>
         </td>
-      </tr>
-      <tr>
-        <td colspan="4">所在单位意见</td>
-        <td colspan="6"><input v-model="flareUp.beyondUnit.opinion" class="editInput"/></td>
-        <td colspan="2">签字:</td>
-        <td colspan="4"><input v-model="flareUp.beyondUnit.sign" class="editInput"/></td>
-        <td colspan="4">
-          <el-date-picker clearable size="small"
-                          v-model="flareUp.beyondUnit.date"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择时间"
-                          style="width: 100%">
-          </el-date-picker>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="4">审核部门意见</td>
-        <td colspan="6"><input v-model="flareUp.auditDept.opinion" class="editInput"/></td>
-        <td colspan="2">签字:</td>
-        <td colspan="4"><input v-model="flareUp.auditDept.sign"  class="editInput"/></td>
-        <td colspan="4">
-          <el-date-picker clearable size="small"
-                          v-model="flareUp.auditDept.date"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择时间"
-                          style="width: 100%">
-          </el-date-picker>
+        <td colspan="4" v-if="(applyStatus-0) !=1">
+          {{ item.signDate == null ? "-" :item.signDate.split(" ")[0].split("-")[0]}}年{{ item.signDate == null ? "-" :item.signDate.split(" ")[0].split("-")[1]}}月{{item.signDate == null ? "-" :item.signDate.split(" ")[0].split("-")[2]}}日{{item.signDate == null ? "-" :item.signDate.split(" ")[1].split(":")[0]}}时{{item.signDate == null ? "-" :item.signDate.split(" ")[1].split(":")[1]}}分
         </td>
       </tr>
-      <tr>
-        <td colspan="4">动火审批人意见</td>
-        <td colspan="6"><input v-model="flareUp.approval.opinion" class="editInput"/></td>
-        <td colspan="2">签字:</td>
-        <td colspan="4"><input v-model="flareUp.approval.sign" class="editInput"/></td>
-        <td colspan="4">
-          <el-date-picker clearable size="small"
-                          v-model="flareUp.approval.date"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择时间"
-                          style="width: 100%">
-          </el-date-picker>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="4">动火前，岗位当班班长验票情况</td>
-        <td colspan="6"><input v-model="flareUp.fireBefore.opinion" class="editInput"/></td>
-        <td colspan="2">签字:</td>
-        <td colspan="4"><input v-model="flareUp.fireBefore.sign" class="editInput"/></td>
-        <td colspan="4">
-          <el-date-picker clearable size="small"
-                          v-model="flareUp.fireBefore.date"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择时间"
-                          style="width: 100%">
-          </el-date-picker>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="4">完工验收</td>
-        <td colspan="6"><input v-model="flareUp.complete.opinion" class="editInput"/></td>
-        <td colspan="2">签字:</td>
-        <td colspan="4"><input v-model="flareUp.complete.sign" class="editInput"/></td>
-        <td colspan="4">
-          <el-date-picker clearable size="small"
-                          v-model="flareUp.complete.date"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择时间"
-                          style="width: 100%">
-          </el-date-picker>
-        </td>
-      </tr>-->
     </table>
 
     <!-- 审批人选择 -->
-    <el-row style="margin-top: 10px">
-      <el-col :span="4">
-        <div style="font-size: 18px;margin-top: 5px">作业负责人：</div>
-      </el-col>
-      <el-col :span="8">
-        <el-select v-model="leaderDeptId" filterable placeholder="请选择作业负责人部门" @change="switchDept(leaderDeptId)">
-          <el-option
-            v-for="item in deptList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="12">
-        <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
-          <el-option
-            v-for="item in userList"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-    </el-row>
+    <div v-if="(applyStatus-0) == 0">
+      <el-row style="margin-top: 10px">
+        <el-col :span="4">
+          <div style="font-size: 18px;margin-top: 5px">作业负责人：</div>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="leaderDeptId" filterable placeholder="请选择作业负责人部门" @change="switchDept(leaderDeptId)">
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
 
-    <el-row style="margin-top: 10px">
-      <el-col :span="4">
-        <div style="font-size: 18px;margin-top: 5px">所在单位意见：</div>
-      </el-col>
-      <el-col :span="8">
-        <el-select v-model="beyondUnitDeptId" filterable placeholder="请选择所在单位" @change="switchDept(beyondUnitDeptId)">
-          <el-option
-            v-for="item in deptList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="12">
-        <el-select v-model="beyondUnitAuditor" filterable placeholder="请选择审核人">
-          <el-option
-            v-for="item in userList"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-    </el-row>
+      <el-row style="margin-top: 10px">
+        <el-col :span="4">
+          <div style="font-size: 18px;margin-top: 5px">所在单位意见：</div>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="beyondUnitDeptId" filterable placeholder="请选择所在单位" @change="switchDept(beyondUnitDeptId)">
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          <el-select v-model="beyondUnitAuditor" filterable placeholder="请选择审核人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
 
-    <el-row style="margin-top: 10px">
-      <el-col :span="4">
-        <div style="font-size: 18px;margin-top: 5px">审核部门意见：</div>
-      </el-col>
-      <el-col :span="8">
-        <el-select v-model="auditDeptDeptId" filterable placeholder="请选择审核部门" @change="switchDept(auditDeptDeptId)">
-          <el-option
-            v-for="item in deptList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="12">
-        <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
-          <el-option
-            v-for="item in userList"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-    </el-row>
+      <el-row style="margin-top: 10px">
+        <el-col :span="4">
+          <div style="font-size: 18px;margin-top: 5px">审核部门意见：</div>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="auditDeptDeptId" filterable placeholder="请选择审核部门" @change="switchDept(auditDeptDeptId)">
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
 
-    <el-row style="margin-top: 10px">
-      <el-col :span="4">
-        <div style="font-size: 18px;margin-top: 5px">动火审批人意见：</div>
-      </el-col>
-      <el-col :span="8">
-        <el-select v-model="approvalDeptId" filterable placeholder="请选择动火审批人" @change="switchDept(approvalDeptId)">
-          <el-option
-            v-for="item in deptList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="12">
-        <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
-          <el-option
-            v-for="item in userList"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-    </el-row>
+      <el-row style="margin-top: 10px">
+        <el-col :span="4">
+          <div style="font-size: 18px;margin-top: 5px">动火审批人意见：</div>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="approvalDeptId" filterable placeholder="请选择动火审批人" @change="switchDept(approvalDeptId)">
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
 
-    <el-row style="margin-top: 10px">
-      <el-col :span="4">
-        <div style="font-size: 18px;margin-top: 5px">动火前，岗位当班班长验票情况：</div>
-      </el-col>
-      <el-col :span="8">
-        <el-select v-model="fireBeforeDeptId" filterable placeholder="请选择岗位当班班长部门" @change="switchDept(fireBeforeDeptId)">
-          <el-option
-            v-for="item in deptList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="12">
-        <el-select v-model="fireBeforeAuditor" filterable placeholder="请选择审核人">
-          <el-option
-            v-for="item in userList"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-    </el-row>
+      <el-row style="margin-top: 10px">
+        <el-col :span="4">
+          <div style="font-size: 18px;margin-top: 5px">动火前，岗位当班班长验票情况：</div>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="fireBeforeDeptId" filterable placeholder="请选择岗位当班班长部门" @change="switchDept(fireBeforeDeptId)">
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          <el-select v-model="fireBeforeAuditor" filterable placeholder="请选择审核人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
+
+      <el-row style="margin-top: 10px">
+        <el-col :span="4">
+          <div style="font-size: 18px;margin-top: 5px">完工验收 ：</div>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="completeDeptId" filterable placeholder="请选择验收部门" @change="switchDept(completeDeptId)">
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
+    </div>
+
+    <!-- 审核按钮 -->
+    <div style="text-align: right;margin-top: 10px" v-if="applyStatus == '1'">
+      <el-button type="primary" @click="submitApproval">确定</el-button>
+      <el-button @click="cancelApproval">取消</el-button>
+    </div>
+
+    <div style="margin-top:10px;float: right" v-if="(applyStatus-0) > '1'"><el-button type="primary" v-print="'#flareUpPrint'">打印</el-button></div>
 
-    <el-row style="margin-top: 10px">
-      <el-col :span="4">
-        <div style="font-size: 18px;margin-top: 5px">完工验收 ：</div>
-      </el-col>
-      <el-col :span="8">
-        <el-select v-model="completeDeptId" filterable placeholder="请选择验收部门" @change="switchDept(completeDeptId)">
-          <el-option
-            v-for="item in deptList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="12">
-        <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
-          <el-option
-            v-for="item in userList"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
-          </el-option>
-        </el-select>
-      </el-col>
-    </el-row>
   </div>
 
 </template>
@@ -573,8 +538,10 @@
 <script>
   import { listDept } from "@/api/system/dept";
   import { listUser } from "@/api/system/user";
-  import { addSpecialPermit } from "@/api/workPermit/specialPermit";
-  import { addSign } from "@/api/workPermit/workPermitSign";
+  import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
+  import { addSign, listSign, updateSign } from "@/api/workPermit/workPermitSign";
+  import { updatePermit } from "@/api/workPermit/permit";
+  import NewEsign from "@/components/SaftyWork/NewEsign";
   export default {
     name: "flare-up",
     props:{
@@ -583,8 +550,14 @@
       },
       licenceNum:{
         type:String
+      },
+      applyStatus:{
+        type:String
       }
     },
+    components:{
+      NewEsign
+    },
     data(){
       return{
         flareUp:{
@@ -734,6 +707,10 @@
         approvalAuditor:"",
         fireBeforeAuditor:"",
         completeAuditor:"",
+        specialWorkPermitSigns:[],
+        specialWorkPermitId:"",
+        sign:"",
+        signOpen:false
       }
     },
     created(){
@@ -816,7 +793,7 @@
         //新增作业负责人
         addSign({permitId:permitId,staffId:this.leaderAuditor,staffType:"leader"});
         //新增单位意见
-        addSign({permitId:permitId,staffId:this.beyondUnitAuditor,"staffType":"beyondUnit"});
+        addSign({permitId:permitId,staffId:this.beyondUnitAuditor,staffType:"beyondUnit"});
         //新增审核部门
         addSign({permitId:permitId,staffId:this.auditDeptAuditor,staffType:"auditDept"});
         //新增动火审批人
@@ -826,6 +803,49 @@
         //新增完工验收
         addSign({permitId:permitId,staffId:this.completeAuditor,staffType:"complete"});
       },
+      submitApproval(){
+        for(let key in this.specialWorkPermitSigns){
+          if(this.specialWorkPermitSigns[key].staffId == this.$store.state.user.userId
+            && '' != this.specialWorkPermitSigns[key].signName
+            && null != this.specialWorkPermitSigns[key].signName){
+            updateSign(this.specialWorkPermitSigns[key]).then(res =>{
+              this.updateWorkPermitStatus();
+              this.msgSuccess("审核成功");
+            })
+          }
+        }
+      },
+      //更新作业单状态
+      updateWorkPermitStatus(){
+        getSpecialWorkPermitByWorkPermitId({workPermitId:this.workPermitId}).then(res =>{
+          let specialWorkPermits = res.data.specialWorkPermits;
+          let flag = true;
+          for(let key in specialWorkPermits ){
+            listSign({ pageNum: 1,pageSize: 99999,permitId:specialWorkPermits[key].specialWorkPermitId}).then(res =>{
+                for(key in res.rows){
+                  if(res.rows[key].signName == "" || null == res.rows[key].signName){
+                    flag = false;
+                  }
+                }
+            })
+          }
+          if(flag){
+            updatePermit({workPermitId:this.workPermitId,applyStatus:"2"}).then(res =>{
+              this.cancelApproval();
+              this.$parent.$parent.getList();
+            })
+          }
+      })
+
+      },
+      cancelApproval(){
+        this.$parent.$parent.cancelCertificateApproval();
+      },
+      signName(imageSrc){
+        this.sign = imageSrc;
+        this.signOpen = true;
+
+      },
     }
 
   }

danger-manage-web/src/components/SaftyWork/NewEsign.vue

+<template>
+  <div>
+    <input class="editInput" placeholder="请签名" v-if="resultImg == '' || resultImg == null" @click="signOpen =true"/>
+    <el-dialog title="签名" :visible.sync="signOpen" :close-on-click-modal="false" :z-index="2000">
+      <div style="border: 1px solid #cccccc">
+        <vue-esign ref="esign" :width="width" :height="height" :isCrop="isCrop" :lineWidth="lineWidth" :lineColor="lineColor" :bgColor.sync="bgColor" />
+        <div style="text-align: right">
+          <button @click="handleReset" style="margin-right: 2px">清空</button>
+          <button @click="handleGenerate">确定</button>
+        </div>
+      </div>
+    </el-dialog>
+    <div>
+      <img v-if="resultImg" :src="resultImg" alt="" style="width: 100%;height: 100%" @click="reWriteSign"/>
+    </div>
+  </div>
+</template>
+
+<script>
+  import vueEsign from 'vue-esign'
+  export default {
+    name: "esign",
+    components:{
+      vueEsign
+    },
+    props:{
+      width:{
+        type:Number
+      },
+      height:{
+        type:Number
+      },
+      resultImg:{
+        type:String,
+        default:""
+      },
+      isReWrite:{
+        type:Boolean,
+        default:true
+      }
+    },
+    data () {
+      return {
+        lineWidth: 3,
+        lineColor: '#000000',
+        bgColor: '',
+        isCrop: false,
+        signOpen:false
+      }
+    },
+    methods: {
+      handleReset () {
+        this.$refs['esign'].reset() //清空画布
+      },
+      handleGenerate () {
+        this.$refs['esign'].generate().then(res => {
+            this.$emit('update:resultImg',res);
+            this.signOpen = false;
+            //this.resultImg = res // 得到了签字生成的base64图片
+        }).catch(err => { //  没有签名，点击生成图片时调用
+            this.$message({
+              message: err + ' 未签名！',
+              type: 'warning'
+            })
+        })
+      },
+      //重签
+      reWriteSign(){
+        if(this.isReWrite){
+          this.signOpen = true;
+        }
+      }
+
+    }
+  }
+</script>
+
+<style scoped scss="lang">
+  .editInput{
+    border: none;
+    width: 100%;
+    height: 100%;
+    text-align: center;
+  }
+
+  .editInput:focus{
+    outline: none;
+  }
+
+</style>

danger-manage-web/src/components/bigWindow/Danger.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-06-21 09:24:11
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-06-24 17:38:50
+ * @LastEditTime: 2022-10-22 14:08:16
  * @FilePath: /danger-manage-web/src/components/bigWindow/Danger.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -11,80 +11,100 @@
     <div class="close" @click="close">
       <img src="@/assets/images/closeBtn.png" alt="" />
     </div>
-    <div class="up pb10" :class="{noBroder:deviceData.colorNum>2}">
-      <div class="tit fz16 pb10">风险辨识</div>
+    <div class="up pb10" :class="{ noBroder: deviceData.data.colorNum > 2 }">
+      <div class="tit fz16 pb10">{{ deviceData.name }}</div>
       <div class="one flex fz16">
         <div class="flex-item">
           <span class="left">风险类别:</span
-          ><span v-unValue class="right">{{ deviceData.fxlb }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.fxlb }}</span>
         </div>
         <div class="flex-item">
           <span class="left">辨识计划:</span
-          ><span v-unValue class="right">{{ deviceData.bsjh }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.bsjh }}</span>
         </div>
         <div class="flex-item">
           <span class="left">危险源:</span
-          ><span v-unValue class="right">{{ deviceData.wxy }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.wxy }}</span>
         </div>
         <!-- <div class="flex-item">
           <span class="left">风险点:</span
-          ><span v-unValue class="right">{{ deviceData.fxd }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.fxd }}</span>
         </div> -->
       </div>
 
       <div class="item">
         <span class="left">危险因素:</span
-        ><span v-unValue class="right">{{ deviceData.wxys }}</span>
+        ><span v-unValue class="right">{{ deviceData.data.wxys }}</span>
       </div>
 
       <div class="item">
         <span class="left">危害后果:</span
-        ><span v-unValue class="right">{{ deviceData.fxlb }}</span>
+        ><span v-unValue class="right">{{ deviceData.data.whhg }}</span>
       </div>
 
       <div class="one flex fz16">
         <div class="flex-item">
           <span class="left">事故类型:</span
-          ><span v-unValue class="right">{{ deviceData.sglx }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.sglx }}</span>
         </div>
         <div class="flex-item">
           <span class="left">事故发生频率:</span
-          ><span v-unValue class="right">{{ deviceData.sgfspl }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.sgfspl }}</span>
         </div>
         <div class="flex-item">
           <span class="left">管控层级:</span
-          ><span v-unValue class="right">{{ deviceData.gkcj }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.gkcj }}</span>
         </div>
         <div class="flex-item">
           <span class="left">管控部门:</span
-          ><span v-unValue class="right">{{ deviceData.gkbm }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.gkbm }}</span>
         </div>
         <div class="flex-item">
           <span class="left">管控责任岗位:</span
-          ><span v-unValue class="right">{{ deviceData.gkzrgw }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.gkzrgw }}</span>
         </div>
         <div class="flex-item">
           <span class="left">管控责任人:</span
-          ><span v-unValue class="right">{{ deviceData.gkzrr }}</span>
+          ><span v-unValue class="right">{{ deviceData.data.gkzrr }}</span>
         </div>
       </div>
     </div>
 
-  <!-- deviceData.colorNum<3的风险区域没有下面这些东西 -->
-    <div class="bottom pb10" v-if="deviceData.colorNum<3">
+    <!-- deviceData.data.colorNum<3的风险区域没有下面这些东西 -->
+    <div class="bottom pb10" v-if="deviceData.colorNum < 3">
       <div class="tit fz16 pb10">采取的风险管控措施</div>
       <div class="item">
         <span class="left">管理:</span
-        ><span v-unValue class="right">{{ deviceData.gl }}</span>
+        ><span v-unValue class="right">{{ deviceData.data.gl }}</span>
       </div>
 
       <div class="item">
         <span class="left">工程技术:</span
-        ><span v-unValue class="right">{{ deviceData.gcjs }}</span>
+        ><span v-unValue class="right">{{ deviceData.data.gcjs }}</span>
       </div>
-      <div class="item">
+      <div class="item flex">
         <span class="left">警示标识:</span>
-        <span v-unValue class="img"><img :src="deviceData.src" alt="" /></span>
+        <template v-if="deviceData.data.src && deviceData.data.src.length > 0">
+          <span v-unValue class="img">
+            <!-- <img
+              v-for="src in deviceData.data.src"
+              :key="src"
+              :src="src"
+              alt=""
+          /> -->
+            <el-image
+              v-for="src in deviceData.data.src"
+              :key="src"
+              style="width: 70px; height: 90px;margin-left:5px"
+              :src="src"
+              :preview-src-list="[src]"
+              :z-index="9999999"
+            ></el-image>
+          </span>
+        </template>
+        <template v-else>
+          <span class="right">-</span>
+        </template>
       </div>
     </div>
   </div>
@@ -97,7 +117,7 @@ export default {
     return {};
   },
   mounted() {
-    console.log(this.deviceData);
+    console.log(this.deviceData.data);
   },
   methods: {
     close() {
@@ -119,11 +139,9 @@ export default {
   .up {
     border-bottom: 1px solid #cccccc;
     margin-bottom: 15px;
-    &.noBroder{
-    border-bottom: 0px solid #cccccc;
-    margin-bottom: 10px;
-
-
+    &.noBroder {
+      border-bottom: 0px solid #cccccc;
+      margin-bottom: 10px;
     }
   }
   .tit {
@@ -173,14 +191,20 @@ export default {
       margin-left: 5px;
     }
     .img {
-      width: 300px;
-      height: 120px;
+      flex: 1;
+      width: 100%;
+      height: 90px;
+
       display: inline-block;
       vertical-align: top;
       margin-left: 5px;
+      #img,
       img {
-        width: 100%;
-        height: 100%;
+        // width: 100%;
+        width: 70px;
+        height: 90px;
+        margin-left: 5px;
+        cursor: pointer;
       }
     }
   }

danger-manage-web/src/utils/cesium/cesiumClass.js

 /*
  * @Author: your name
  * @Date: 2021-12-07 14:19:18
- * @LastEditTime: 2022-10-12 10:09:44
+ * @LastEditTime: 2022-10-22 10:31:44
  * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /cesium-vue/src/utils/seieumClass.js
@@ -1122,9 +1122,9 @@ export default class CreateCesium {
     this.dangerArr.forEach((item) => {
       item.show = bool;
     });
-    this.deviceTilesArr[10].forEach((item) => {
-      item.show = bool;
-    });
+    // this.deviceTilesArr[10].forEach((item) => {
+    //   item.show = bool;
+    // });
   }
   // 危险源与风险分布区切换
   dangeDeviceChange(type, bottomDeviceArr) {

danger-manage-web/src/utils/cesium/dangerArr.js

+// danger: [
+//   {
+//     lnglatArr: [
+//       [114.07699224128288, 38.24917864421566],
+//       [114.07647701382231, 38.24916311225547],
+//       [114.07651429608312, 38.24895731354076],
+//       [114.07708709377842, 38.248960473114614],
+//     ],
+//     colorNum: 1,
+//     fxlb: "高风险区域",
+//     bsjh: "",
+//     wxy: "锅炉操作",
+//     fxd: "锅炉点火",
+//     wxys: "操作人员违章作业来点火成功继续频繁点火",
+//     whhg: "丧失劳动能力",
+//     sglx: "锅炉爆炸，出点活在",
+//     sgfspl: "平均2-3年发生一起",
+//     gkcj: "班组级",
+//     gkbm: "安全管理部",
+//     gkzrgw: "锅炉工",
+//     gkzrr: "张三",
+//     gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
+//     gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
+//     src: danger,
+//   },
+//   {
+//     lnglatArr: [
+//       [114.07806724970564, 38.25034815051717],
+//       [114.07639696862833, 38.2502261900133],
+//       [114.07639078797055, 38.24993383198078],
+//       [114.078151284626, 38.25000196180475],
+//     ],
+//     colorNum: 2,
+//     fxlb: "中风险区域",
+//     bsjh: "",
+//     wxy: "锅炉操作",
+//     fxd: "锅炉点火",
+//     wxys: "操作人员违章作业来点火成功继续频繁点火",
+//     whhg: "丧失劳动能力",
+//     sglx: "锅炉爆炸，出点活在",
+//     sgfspl: "平均2-3年发生一起",
+//     gkcj: "班组级",
+//     gkbm: "安全管理部",
+//     gkzrgw: "锅炉工",
+//     gkzrr: "张三",
+//     gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
+//     gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
+//     src: danger,
+//   },
+//   {
+//     lnglatArr: [
+//       [114.0777392710896, 38.250782019890394],
+//       [114.07734950538038, 38.250761421969486],
+//       [114.0773933590535, 38.25022891713582],
+//       [114.07777116413182, 38.250232988449945],
+//     ],
+//     colorNum: 3,
+//     fxlb: "低风险区域",
+//     bsjh: "",
+//     wxy: "锅炉操作",
+//     fxd: "锅炉点火",
+//     wxys: "操作人员违章作业来点火成功继续频繁点火",
+//     whhg: "丧失劳动能力",
+//     sglx: "锅炉爆炸，出点活在",
+//     sgfspl: "平均2-3年发生一起",
+//     gkcj: "班组级",
+//     gkbm: "安全管理部",
+//     gkzrgw: "锅炉工",
+//     gkzrr: "张三",
+//     gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
+//     gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
+//     src: danger,
+//   },
+//   {
+//     lnglatArr: [
+//       [114.08185866090808, 38.24985142677479],
+//       [114.08093871524032, 38.24985819653048],
+//       [114.08100272185587, 38.249491674544146],
+//       [114.08185575292462, 38.24951700145305],
+//     ],
+//     colorNum: 4,
+//     fxlb: "中低风险区域",
+//     bsjh: "",
+//     wxy: "锅炉操作",
+//     fxd: "锅炉点火",
+//     wxys: "操作人员违章作业来点火成功继续频繁点火",
+//     whhg: "丧失劳动能力",
+//     sglx: "锅炉爆炸，出点活在",
+//     sgfspl: "平均2-3年发生一起",
+//     gkcj: "班组级",
+//     gkbm: "安全管理部",
+//     gkzrgw: "锅炉工",
+//     gkzrr: "张三",
+//     gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
+//     gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
+//     src: danger,
+//   },
+// ],
+// 禁止烟火
+import jzyh from "@/assets/images/dangerPic/jzyh.png";
+// 禁止带火种
+import jzdhz from "@/assets/images/dangerPic/jzdhz.png";
+// 当心中毒
+import dxzd from "@/assets/images/dangerPic/dxzd.png";
+// 当心泄露
+import dxxl from "@/assets/images/dangerPic/dxxl.png";
+// 当心爆炸
+import dxbz from "@/assets/images/dangerPic/dxbz.png";
+// 必须戴防毒面具
+import bxdfdmj from "@/assets/images/dangerPic/bxdfdmj.png";
+
 export const dangerArr = [
   {
     name: "污水处理",
@@ -8,7 +119,22 @@ export const dangerArr = [
       [114.08121715606055, 38.25164695300115],
       [114.08118032640901, 38.25221024391822],
     ],
-    data: {},
+    data: {
+      fxlb: "一般风险",
+      bsjh: "",
+      wxy: "锅炉操作",
+      fxd: "锅炉点火",
+      wxys: "操作人员违章作业来点火成功继续频繁点火",
+      whhg: "丧失劳动能力",
+      sglx: "锅炉爆炸，出点活在",
+      sgfspl: "平均2-3年发生一起",
+      gkcj: "班组级",
+      gkbm: "安全管理部",
+      gkzrgw: "锅炉工",
+      gkzrr: "张三",
+      gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
+      gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
+    },
   },
   {
     name: "危废库",
@@ -18,7 +144,9 @@ export const dangerArr = [
       [114.08168812394003, 38.250488614016135],
       [114.08164030994841, 38.25079994477491],
     ],
-    data: {},
+    data: {
+      fxlb: "较高风险"
+    },
     colorNum: 2,
   },
   {
@@ -31,7 +159,10 @@ export const dangerArr = [
       [114.08188193141116, 38.24996130073124],
       [114.08037480953207, 38.249932590119556],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险",
+      src: [jzyh, jzdhz, dxzd, dxxl, dxbz, bxdfdmj],
+    },
     colorNum: 1,
   },
   {
@@ -42,7 +173,9 @@ export const dangerArr = [
       [114.0818822111471, 38.24956024306349],
       [114.08098376391818, 38.24951885572243],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -53,7 +186,10 @@ export const dangerArr = [
       [114.08004240688804, 38.251581774583634],
       [114.08002489734042, 38.251950654364265],
     ],
-    data: {},
+
+    data: {
+      fxlb: "低风险"
+    },
     colorNum: 4,
   },
   {
@@ -64,7 +200,9 @@ export const dangerArr = [
       [114.08002301112488, 38.251377061619046],
       [114.08000932886821, 38.25149427805925],
     ],
-    data: {},
+    data: {
+      fxlb: "较高风险"
+    },
     colorNum: 2,
   },
   {
@@ -76,7 +214,9 @@ export const dangerArr = [
       [114.0799213099661, 38.24870811934452],
       [114.07992247747968, 38.2490596822873],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
   },
   {
     name: "干煤棚",
@@ -87,7 +227,9 @@ export const dangerArr = [
       [114.0793256381516, 38.248656072998905],
       [114.07928660378576, 38.24896257086807],
     ],
-    data: {},
+    data: {
+      fxlb: "一般风险"
+    },
   },
   {
     name: "甲醇球罐",
@@ -97,7 +239,9 @@ export const dangerArr = [
       [114.07900555924418, 38.24818826396147],
       [114.07896214915758, 38.2485657203445],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -108,7 +252,9 @@ export const dangerArr = [
       [114.07970969314668, 38.249177870760086],
       [114.07968503158452, 38.249621022521914],
     ],
-    data: {},
+    data: {
+      fxlb: "较高风险"
+    },
     colorNum: 2,
   },
   {
@@ -119,7 +265,9 @@ export const dangerArr = [
       [114.07937025504728, 38.24986209608138],
       [114.07932854865001, 38.25049906057526],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -130,7 +278,9 @@ export const dangerArr = [
       [114.0793149258221, 38.24950495448654],
       [114.07929156270377, 38.24989004286162],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -142,7 +292,9 @@ export const dangerArr = [
       [114.0781915677119, 38.24883479798143],
       [114.07818775308438, 38.24904718615451],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
   },
   {
     name: "2400氨合成",
@@ -155,7 +307,9 @@ export const dangerArr = [
       [114.07824052605362, 38.24826869585147],
       [114.07822516569071, 38.24873709204756],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
   },
   {
     name: "大颗粒",
@@ -165,7 +319,9 @@ export const dangerArr = [
       [114.07793868895763, 38.24933718425533],
       [114.0778791617466, 38.24978811628299],
     ],
-    data: {},
+    data: {
+      fxlb: "较高风险"
+    },
     colorNum: 2,
   },
   {
@@ -177,7 +333,9 @@ export const dangerArr = [
       [114.07816742485505, 38.25042773313157],
       [114.07811902680491, 38.25084109067064],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
   },
   {
     name: "1#脱碳",
@@ -187,7 +345,9 @@ export const dangerArr = [
       [114.07813313619934, 38.25025368152452],
       [114.07816939918499, 38.250464604821424],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -201,7 +361,9 @@ export const dangerArr = [
       [114.07689683035566, 38.24851199022575],
       [114.07655032796976, 38.24855692071795],
     ],
-    data: {},
+    data: {
+      fxlb: "较高风险"
+    },
   },
   {
     name: "尿素生产装置",
@@ -212,7 +374,9 @@ export const dangerArr = [
       [114.07730309157522, 38.24926803285693],
       [114.07645852296761, 38.249258052783055],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
   },
   {
     name: "冰机",
@@ -222,7 +386,9 @@ export const dangerArr = [
       [114.07674899410013, 38.24986759777573],
       [114.07673177371679, 38.24999869046041],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -233,7 +399,9 @@ export const dangerArr = [
       [114.07736221268445, 38.250066057714115],
       [114.07638572203807, 38.250006593486276],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -244,7 +412,9 @@ export const dangerArr = [
       [114.07729932027942, 38.25065483348539],
       [114.0763611632972, 38.2506105391965],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -255,7 +425,9 @@ export const dangerArr = [
       [114.07673732219793, 38.25122243174297],
       [114.07648591573471, 38.25119899039575],
     ],
-    data: {},
+    data: {
+      fxlb: "低风险"
+    },
     colorNum: 4,
   },
   {
@@ -267,7 +439,9 @@ export const dangerArr = [
       [114.07611396280011, 38.24941242465572],
       [114.07610863025666, 38.249559594773935],
     ],
-    data: {},
+    data: {
+      fxlb: "较高风险"
+    },
   },
   {
     name: "甲醇合成",
@@ -277,7 +451,9 @@ export const dangerArr = [
       [114.07631406585077, 38.249803953760804],
       [114.07629629633044, 38.249994075703896],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -288,7 +464,9 @@ export const dangerArr = [
       [114.07631539021173, 38.250133221900036],
       [114.07629852045858, 38.25036483868555],
     ],
-    data: {},
+    data: {
+      fxlb: "一般风险"
+    },
     colorNum: 3,
   },
   {
@@ -300,7 +478,9 @@ export const dangerArr = [
       [114.0762024779363, 38.25064622770106],
       [114.07614690640786, 38.250982027231906],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -311,7 +491,9 @@ export const dangerArr = [
       [114.0757575736981, 38.24940713702969],
       [114.07506815524074, 38.24935807751058],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -322,7 +504,9 @@ export const dangerArr = [
       [114.07578164985038, 38.24991737346083],
       [114.07575424777615, 38.25022009521355],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -333,7 +517,9 @@ export const dangerArr = [
       [114.07568783954892, 38.2503153993018],
       [114.07569321404614, 38.25050557141559],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -344,7 +530,9 @@ export const dangerArr = [
       [114.07537563494651, 38.25051872866674],
       [114.07533109169464, 38.25112532353275],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -355,7 +543,9 @@ export const dangerArr = [
       [114.07507479362056, 38.24967638869796],
       [114.07506400522227, 38.2498509809399],
     ],
-    data: {},
+    data: {
+      fxlb: "较高风险"
+    },
     colorNum: 2,
   },
   {
@@ -366,7 +556,9 @@ export const dangerArr = [
       [114.07509693683168, 38.24947090168923],
       [114.07507104315593, 38.249669088954406],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -378,7 +570,9 @@ export const dangerArr = [
       [114.07381546333403, 38.24962535790453],
       [114.07329016901807, 38.24975956466659],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
   },
   {
     name: "预脱硫",
@@ -388,7 +582,9 @@ export const dangerArr = [
       [114.074498874829, 38.24981217373876],
       [114.07449942174725, 38.25005976641145],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -399,7 +595,9 @@ export const dangerArr = [
       [114.07410013187993, 38.250246230088905],
       [114.07409377782558, 38.25057015884229],
     ],
-    data: {},
+    data: {
+      fxlb: "高风险"
+    },
     colorNum: 1,
   },
   {
@@ -410,7 +608,9 @@ export const dangerArr = [
       [114.0746029073167, 38.25098940998453],
       [114.07457634824875, 38.25117713367422],
     ],
-    data: {},
+    data: {
+      fxlb: "低风险"
+    },
     colorNum: 4,
   },
 ];

danger-manage-web/src/views/dangerScale/profile/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-06-16 15:03:40
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-10-12 09:20:17
+ * @LastEditTime: 2022-10-22 10:39:48
  * @FilePath: /danger-manage-web/src/views/bigwindow/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -224,13 +224,13 @@ export default {
     // this.data1.forEach((item) => {
     //   this.Cesium.addDevice(item, "pic", Video);
     // });
-    this.data2.forEach((item, index) => {
-      if (index == 0) {
-        this.Cesium.addDevice(item, "pic", weixiandian);
-      } else {
-        this.Cesium.addDevice(item, "pic", ydqt);
-      }
-    });
+    // this.data2.forEach((item, index) => {
+    //   if (index == 0) {
+    //     this.Cesium.addDevice(item, "pic", weixiandian);
+    //   } else {
+    //     this.Cesium.addDevice(item, "pic", ydqt);
+    //   }
+    // });
   },
   methods: {
     dangerChange() {

danger-manage-web/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-03 10:51:24
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-10-12 09:22:21
+ * @LastEditTime: 2022-10-20 10:25:41
  * @FilePath: /danger-manage-web/src/views/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -379,13 +379,13 @@ export default {
     // },
 
     init() {
-      this.data2.forEach((item, index) => {
-        if (index == 0) {
-          this.Cesium.addDevice(item, "pic", weixiandian);
-        } else {
-          this.Cesium.addDevice(item, "pic", ydqt);
-        }
-      });
+      // this.data2.forEach((item, index) => {
+      //   if (index == 0) {
+      //     this.Cesium.addDevice(item, "pic", weixiandian);
+      //   } else {
+      //     this.Cesium.addDevice(item, "pic", ydqt);
+      //   }
+      // });
       // 如果有缓存
       // const J =  localStorage.getItem("J");
       // if (J) {
@@ -413,7 +413,7 @@ export default {
           };
         })
         .forEach((item) => {
-          this.Cesium.addDanger(item, Danger2);
+          this.Cesium.addDanger(item, Danger);
         });
       // this.data11.forEach((item) => {
       //   item.config = { scale: 1, textHeight: -32 };

danger-manage-web/src/views/indexComponents/rightComponents/Xjtj.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-06 13:42:45
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-09-14 11:44:50
+ * @LastEditTime: 2022-10-22 11:36:35
  * @FilePath: /danger-manage-web/src/views/indexComponents/leftComponents/deviceYx.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -51,6 +51,7 @@ import Title from "@/views/indexComponents/allComponents/Title";
 import Chars from "@/components/allCharsCom/Chars";
 import rimg1 from "@/assets/indexImages/rimg1.png";
 import rimg2 from "@/assets/indexImages/rimg2.png";
+import { getxjtjYMD } from "@/api/indexChars/chars";
 
 export default {
   name: "",
@@ -62,8 +63,8 @@ export default {
     return {
       yearActive: "年",
       numData: [
-        { icon: rimg1, name: "发现隐患数量", num: 56 },
-        { icon: rimg2, name: "整改隐患数量", num: 50 },
+        // { icon: rimg1, name: "发现隐患数量", num: 2 },
+        // { icon: rimg2, name: "整改隐患数量", num: 1 },
       ],
       options: {
         xAxis: {
@@ -128,25 +129,45 @@ export default {
       },
     };
   },
+  created() {
+    this.getxjtjYMD({ type: "year" });
+  },
   methods: {
+    getxjtjYMD(query) {
+      getxjtjYMD(query).then((res) => {
+        if (res.code == 200) {
+          const { faxian, zhenggai } = res.data;
+          this.numData = [
+            { icon: rimg1, name: "发现隐患数量", num: faxian },
+            { icon: rimg2, name: "整改隐患数量", num: zhenggai },
+          ];
+        }
+      });
+    },
     timeChange(e) {
       if (this.yearActive == e) return;
       this.yearActive = e;
       if (this.yearActive == "日") {
-        this.numData = [
-          { icon: rimg1, name: "发现隐患数量", num: 3 },
-          { icon: rimg2, name: "整改隐患数量", num: 2 },
-        ];
+        this.getxjtjYMD({ type: "day" });
+
+        // this.numData = [
+        //   { icon: rimg1, name: "发现隐患数量", num: 3 },
+        //   { icon: rimg2, name: "整改隐患数量", num: 2 },
+        // ];
       } else if (this.yearActive == "月") {
-        this.numData = [
-          { icon: rimg1, name: "发现隐患数量", num: 6 },
-          { icon: rimg2, name: "整改隐患数量", num: 10 },
-        ];
+        this.getxjtjYMD({ type: "month" });
+
+        // this.numData = [
+        //   { icon: rimg1, name: "发现隐患数量", num: 6 },
+        //   { icon: rimg2, name: "整改隐患数量", num: 10 },
+        // ];
       } else {
-        this.numData = [
-          { icon: rimg1, name: "发现隐患数量", num: 56 },
-          { icon: rimg2, name: "整改隐患数量", num: 50 },
-        ];
+        this.getxjtjYMD({ type: "year" });
+
+        // this.numData = [
+        //   { icon: rimg1, name: "发现隐患数量", num: 56 },
+        //   { icon: rimg2, name: "整改隐患数量", num: 50 },
+        // ];
       }
     },
   },

danger-manage-web/src/views/newWorkPermit/index.vue

@@ -107,7 +107,7 @@
             v-hasPermi="['system:permit:edit']"
           >作业证申请</el-button>
           <el-button
-            v-if="scope.row.operator=='approval'"
+            v-if="scope.row.applyStatus=='1' && -1 != scope.row.approvals.findIndex(item => item === $store.state.user.userId)"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -115,15 +115,7 @@
             v-hasPermi="['system:permit:edit']"
           >作业证审核</el-button>
           <el-button
-            v-if="scope.row.operator=='review'"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="certificateApprovalApply(scope.row)"
-            v-hasPermi="['system:permit:edit']"
-          >作业证审批</el-button>
-          <el-button
-            v-if="scope.row.operator=='check'"
+            v-if="scope.row.applyStatus=='2' && scope.row.produceComfirm.monitorId ===  $store.state.user.userId"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -131,29 +123,13 @@
             v-hasPermi="['system:permit:edit']"
           >事前检查</el-button>
           <el-button
-            v-if="scope.row.operator=='working'"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="certificateWorking(scope.row)"
-            v-hasPermi="['system:permit:edit']"
-          >作业中</el-button>
-          <el-button
-            v-if="scope.row.operator=='close'"
+            v-if="scope.row.applyStatus=='3' && scope.row.linkMan ==  $store.state.user.userId"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="closeCertificate(scope.row)"
             v-hasPermi="['system:permit:edit']"
           >关闭作业单</el-button>
-          <el-button
-            v-if="scope.row.applyStatus=='7'"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="dangerousAppraise(scope.row)"
-            v-hasPermi="['system:permit:edit']"
-          >风险评价</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -167,7 +143,7 @@
     />
 
     <!-- 添加或修改作业许可证对话框 -->
-    <el-dialog :title="title" :rules="rules" :visible.sync="open" width="880px" append-to-body>
+    <el-dialog :title="title" :rules="rules" :visible.sync="open" width="900px" append-to-body @close="cancel">
       <table>
         <tr>
           <td rowspan="4" colspan="2">作业许可申请人</td>
@@ -254,9 +230,50 @@
             <div><input type="checkbox" v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>
           </td>
         </tr>
+        <tr>
+          <td colspan="2">相关方填写</td>
+          <td colspan="4">
+            <div style="text-align: left">
+              承包商:
+              <textarea v-model="relationSign.contractor" style="height: 96px"></textarea>
+            </div>
 
+          </td>
+          <td colspan="4">
+            <div style="text-align: left">
+              负责人：
+              <textarea v-model="relationSign.personCharge" style="height: 96px"></textarea>
+            </div>
+          </td>
+        </tr>
       </table>
-
+      <el-row style="margin-top: 10px">
+        <el-col :span="5">
+          <div style="font-size: 18px;margin-top: 5px">生产组当班班长：</div>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="produceComfirm.leaderDeptId" filterable placeholder="请选择生产组当班班长部门" @change="switchDept()">
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="11">
+          <el-select v-model="produceComfirm.monitorId" filterable placeholder="请选择生产组当班班长">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="addCertificate">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -275,7 +292,8 @@
           <FlareUp v-if="item.mark == 'flareUp'"
                    :ref="item.mark"
                    :workPermitId = "item.workPermitId"
-                   :licenceNum = "item.licenceNum"/>
+                   :licenceNum = "item.licenceNum"
+                   applyStatus = "0"/>
 
         </div>
       </div>
@@ -285,18 +303,160 @@
       </div>
     </el-dialog>
 
+    <!-- 作业单审核 -->
+    <el-dialog title="作业单审核" :visible.sync="certificateApprovalOpen" append-to-body :close-on-click-modal="false">
+      <div class="tags_box">
+        <div v-for="item in specialWorkPermits" class="tags">
+          <div :class="{isActive:item.specialWorkType==approvalActive}" @click="handelToogel(item.specialWorkType)">{{ getTagName(item.specialWorkType) }}</div>
+        </div>
+      </div>
+      <div class="con_box">
+        <div v-for="item in specialWorkPermits" v-if="approvalActive == item.specialWorkType">
+          <FlareUp v-if="item.specialWorkType == 'flareUp'"
+                   :ref="item.specialWorkType"
+                   :workPermitId = "item.workPermitId"
+                   :licenceNum = "item.licenceNum"
+                   applyStatus="1"/>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 事前检查 -->
+    <el-dialog title="事前检查" :visible.sync="checkOpen" width="900px" append-to-body @close="checkCancel">
+      <table>
+        <tr>
+          <td rowspan="4" colspan="2">作业许可申请人</td>
+          <td colspan="2">申请部门/单位</td>
+          <td colspan="2"><input disabled v-model="certificateData.applyDept" class="editInput"/></td>
+          <td colspan="2">申请人及联系方式</td>
+          <td colspan="2"><input v-model="certificateData.linkMan" disabled class="editInput" style="width: 47%"/>|<input disabled v-model="certificateData.linkPhone" class="editInput" style="width: 50%"/></td>
+        </tr>
+        <tr>
+          <td colspan="2">作业区域范围</td>
+          <td colspan="2"><input disabled v-model="certificateData.workBound" class="editInput"/></td>
+          <td colspan="2">设备名称及编号</td>
+          <td colspan="2"><input disabled v-model="certificateData.deviceName" class="editInput" style="width: 47%"/>|<input disabled v-model="certificateData.deviceNum" class="editInput" style="width: 50%"/></td>
+        </tr>
+        <tr>
+          <td colspan="2">申请作业时间</td>
+          <td colspan="6">
+            {{ certificateData.applyWorkStartTime == null ? "-" :certificateData.applyWorkStartTime.split(" ")[0].split("-")[1]}}月{{certificateData.applyWorkStartTime == null ? "-" :certificateData.applyWorkStartTime.split(" ")[0].split("-")[2]}}日{{certificateData.applyWorkStartTime == null ? "-" :certificateData.applyWorkStartTime.split(" ")[1].split(":")[0]}}时{{certificateData.applyWorkStartTime == null ? "-" :certificateData.applyWorkStartTime.split(" ")[1].split(":")[1]}}分至{{certificateData.applyWorkEndTime == null ? "-" :certificateData.applyWorkEndTime.split(" ")[0].split("-")[1]}}月{{certificateData.applyWorkEndTime == null ? "-" :certificateData.applyWorkEndTime.split(" ")[0].split("-")[2]}}日{{certificateData.applyWorkEndTime == null ? "-" :certificateData.applyWorkEndTime.split(" ")[1].split(":")[0]}}时{{certificateData.applyWorkEndTime == null ? "-" :certificateData.applyWorkEndTime.split(" ")[1].split(":")[1]}}分
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">作业内容</td>
+          <td colspan="6"><input disabled v-model="certificateData.workContent" class="editInput"/></td>
+        </tr>
+        <tr>
+          <td colspan="2">所有相关方讨论</td>
+          <td>工作安全分析</td>
+          <td style="writing-mode: vertical-rl;">危害识别</td>
+          <td colspan="6" style="text-align: left">
+            <div><input type="checkbox" disabled v-model="mainDangerousMark.burn">灼伤（低温/高温/化学品灼伤,电弧烧伤,火灾，易燃气/液体，蒸汽，电焊、动火、射线等）</div>
+            <div><input type="checkbox" disabled v-model="mainDangerousMark.electricShock">电击（触电，电压，不适当的接地，电气热作业，地下/暗线等）。</div>
+            <div><input type="checkbox" disabled v-model="mainDangerousMark.objectStrike">物体打击（爆炸，压力，能量释放，移动/坠落的物体，不正确的存放,设备）</div>
+            <div><input type="checkbox" disabled v-model="mainDangerousMark.stifle">窒息/中毒（惰性气体，有毒气体，易挥发的液体溶剂等）</div>
+            <div><input type="checkbox" disabled v-model="mainDangerousMark.drop">坠落（高处作业，没有防护的开口，没有固定的梯子，脚手架搭设，无防护的平台等）</div>
+            <div><input type="checkbox" disabled v-model="mainDangerousMark.vehicleInjury">车辆伤害（速度过快,疲劳驾驶,车辆故障,缺乏防御性驾驶,能见度差,不寻常的路状，分心等）</div>
+            <div><input type="checkbox" disabled v-model="mainDangerousMark.other">其它危害。</div>
+            <div>注：如存在以上任一情况，请填写安全措施。</div>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="4" colspan="2">批准人填写</td>
+          <td rowspan="4" colspan="2">许可证</td>
+          <td colspan="6" style="text-align: left">是否需要进一步的JSA: <input disabled type="checkbox" v-model="licenceInfo.jsa.yes"/>否<input type="checkbox" disabled v-model="licenceInfo.jsa.no"/>是  JSA[<input class="editInput" disabled v-model="licenceInfo.jsa.num" style="width: 250px" placeholder="填写JSA编号"/>]</td>
+        </tr>
+        <tr>
+          <td colspan="6" style="text-align: left"><input disabled type="checkbox" v-model="licenceInfo.specialLicence"/>0无需特殊工作许可</td>
+        </tr>
+        <tr>
+          <td colspan="6" style="text-align: left">
+            <div><input type="checkbox" disabled v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" disabled v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" disabled v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" disabled v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="6" style="text-align: left;">
+            <div><input type="checkbox" disabled v-model="licenceInfo.flareUp.isChecked"/>2动火作业许可证 [<input class="editInput" disabled v-model="licenceInfo.flareUp.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" disabled v-model="licenceInfo.heightWork.isChecked"/>3高处作业许可证 [<input class="editInput" disabled v-model="licenceInfo.heightWork.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" disabled v-model="licenceInfo.breakGround.isChecked"/>4动土作业许可证 [<input class="editInput" disabled v-model="licenceInfo.breakGround.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" disabled v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" disabled v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" disabled v-model="licenceInfo.limitSpace.isChecked"/>6受限空间作业许可证 [<input class="editInput" disabled v-model="licenceInfo.limitSpace.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" disabled v-model="licenceInfo.electricityUse.isChecked"/>7临时用电许可证 [<input class="editInput" disabled v-model="licenceInfo.electricityUse.num" style="width: 250px" placeholder="填写编号"/>]</div>
+            <div><input type="checkbox" disabled v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" disabled v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">相关方填写</td>
+          <td colspan="4">
+            <div style="text-align: left">
+              承包商:
+              <textarea disabled v-model="relationSign.contractor" style="height: 96px"></textarea>
+            </div>
+
+          </td>
+          <td colspan="4">
+            <div style="text-align: left">
+              负责人：
+              <textarea disabled v-model="relationSign.personCharge" style="height: 96px"></textarea>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">生产班组确认</td>
+          <td colspan="8">
+            <el-row>
+              <el-col :span="8" style="text-align: left">本人已知晓此工作许可证的内容</el-col>
+              <el-col :span="8" style="text-align: right">确认签字（当班班长）：</el-col>
+              <el-col :span="8"><NewEsign :resultImg.sync ="produceComfirm.monitorName" :width="918" :height="100"/></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24" style="text-align: right">日期/时间：<input style="width: 228px" v-model="produceComfirm.date" class="editInput"/></el-col>
+            </el-row>
+          </td>
+        </tr>
+      </table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="checkSubmit">确 定</el-button>
+        <el-button @click="checkCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 作业单关闭 -->
+    <el-dialog title="作业单关闭" :visible.sync="certificateCompleteOpen" width="900px" append-to-body @close="completeCancel">
+      <div>关闭意见：</div>
+      <Editor v-model="workDeal.suggestion" :min-height="192" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="completeSubmit">确 定</el-button>
+        <el-button @click="completeCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <NewWorkPermitDetail :certificateDetailOpen.sync="certificateDetailOpen"
+                         :certificateData="certificateDataDetail"/>
+
   </div>
 </template>
 
 <script>
-  import { listPermit, getPermit, delPermit, addPermit, updatePermit, exportPermit } from "@/api/workPermit/permit";
-  import { getAllUserName } from "@/api/system/user";
+  import { listPermit, selectTWorkPermitListByLoginUser, getPermit, delPermit, addPermit, updatePermit, exportPermit } from "@/api/workPermit/permit";
+  import { getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
+  import { listUser,getAllUserName } from "@/api/system/user";
   import { listAll } from "@/api/contractor/contractorInfo";
   import FlareUp from "@/components/NewSaftyWork/FlareUp";
+  import { listSign } from "@/api/workPermit/workPermitSign";
+  import { listDept } from "@/api/system/dept";
+  import NewEsign from "@/components/SaftyWork/NewEsign";
+  import Editor from '@/components/Editor';
+  import NewWorkPermitDetail from '@/components/DangerousMark/NewWorkPermitDetail';
   export default {
     name: "index",
     components:{
-      FlareUp
+      FlareUp,
+      NewEsign,
+      Editor,
+      NewWorkPermitDetail
     },
     data() {
       return {
@@ -322,51 +482,51 @@
         open: false,
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          applyDept: null,
-          linkMan: null,
-          linkPhone: null,
-          workBound: null,
-          deviceName: null,
-          deviceNum: null,
-          applyWorkStartTime: null,
-          applyWorkEndTime: null,
-          workContent: null,
-          contractor: null,
-          ratifier: null,
-          mainDangerousMark: null,
-          dangerousMarkDetial: null,
-          licenceInfo: null,
-          relationSign: null,
-          produceComfirm: null,
-          workDeal: null,
-          applyStatus: null,
-          remarks: null
+           pageNum: 1,
+            pageSize: 10,
+            applyDept: null,
+            linkMan: null,
+            linkPhone: null,
+            workBound: null,
+            deviceName: null,
+            deviceNum: null,
+            applyWorkStartTime: null,
+            applyWorkEndTime: null,
+            workContent: null,
+            contractor: null,
+            ratifier: null,
+            mainDangerousMark: null,
+            dangerousMarkDetial: null,
+            licenceInfo: null,
+            relationSign: null,
+            produceComfirm: null,
+            workDeal: null,
+            applyStatus: null,
+            remarks: null
         },
-        // 表单参数
+       // 表单参数
         form: {},
         // 表单校验
         rules: {
-          applyDept: [
-            { required: true, message: "申请人不能为空", trigger: "blur" }
-          ],
+        applyDept: [
+          { required: true, message: "申请人不能为空", trigger: "blur" }
+        ],
           linkPhone: [
-            { required: true, message: "联系电话不能为空", trigger: "blur" }
-          ],
+          { required: true, message: "联系电话不能为空", trigger: "blur" }
+        ],
           workBound: [
-            { required: true, message: "工作范围不能为空", trigger: "blur" }
-          ],
+          { required: true, message: "工作范围不能为空", trigger: "blur" }
+        ],
           applyWorkStartTime: [
-            { required: true, message: "开始时间不能为空", trigger: "blur" }
-          ],
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
           applyWorkEndTime: [
-            { required: true, message: "结束时间不能为空", trigger: "blur" }
-          ],
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
           workContent: [
-            { required: true, message: "工作内容不能为空", trigger: "blur" }
-          ],
-        },
+          { required: true, message: "工作内容不能为空", trigger: "blur" }
+        ],
+      },
         certificateStatus:[],
         approvalList:[],
         //承包商信息
@@ -375,126 +535,198 @@
         certificateData : {},
         mainDangerousMark :{
           burn : false,
-          electricShock : false,
-          objectStrike : false,
-          stifle : false,
-          drop : false,
-          vehicleInjury : false,
-          other : false
+            electricShock : false,
+            objectStrike : false,
+            stifle : false,
+            drop : false,
+            vehicleInjury : false,
+            other : false
         },
         licenceInfo : {
           lockListing: {
             num: "",
-            isChecked: false
+              isChecked: false
           },
           blindPlate: {
             num: "",
-            isChecked: false,
-            status: "0"
+              isChecked: false,
+              status: "0"
           },
           breakGround: {
             num: "",
-            isChecked: false,
-            status: "0"
+              isChecked: false,
+              status: "0"
           },
           limitSpace: {
             num: "",
-            isChecked: false,
-            status: "0"
+              isChecked: false,
+              status: "0"
           },
           jsa: {
             no: false,
-            yes: false,
-            num: ""
+              yes: false,
+              num: ""
           },
           specialLicence: false,
-          flareUp: {
+            flareUp: {
             num: "",
-            isChecked: false,
-            status: "0"
+              isChecked: false,
+              status: "0"
           },
           hoisting: {
             num: "",
-            isChecked: false,
-            status: "0"
+              isChecked: false,
+              status: "0"
           },
           ray: {
             num: "",
-            isChecked: false,
-            status: "0"
+              isChecked: false,
+              status: "0"
           },
           electricityUse: {
             num: "",
-            isChecked: false,
-            status: "0"
+              isChecked: false,
+              status: "0"
           },
           heightWork: {
             num: "",
-            isChecked: false,
-            status: "0"
+              isChecked: false,
+              status: "0"
           }
         },
+        relationSign:{
+          contractor:"",
+          personCharge:""
+        },
+        produceComfirm:{
+          leaderDeptId:"",
+          monitorId:"",
+          monitorName:"",
+          date:""
+        },
+        workDeal:{
+          suggestion:""
+        },
+        leaderDeptId:"",
         tags:[],
         active:"",
-        certificateApprovalApplyOpen : false
+        certificateApprovalApplyOpen : false,
+        certificateApprovalOpen:false,
+        specialWorkPermits:[],
+        approvalActive:"",
+        deptList:[],
+        userList:[],
+        checkOpen:false,
+        certificateCompleteOpen:false,
+        workPermitId:"",
+        certificateDetailOpen:false,
+        certificateDataDetail:{}
+      };
+  },
+  created() {
+    this.getList();
+    this.getAllContractorInfo();
+    this.getDicts("t_new_permitWork_status").then(response => {
+        this.certificateStatus = response.data;
+    });
+    this.getApproval();
+    this.getDeptList();
+  },
+  methods: {
+    /** 查询作业许可证列表 */
+    getList() {
+      this.loading = true;
+      selectTWorkPermitListByLoginUser(this.queryParams).then(response => {
+        this.permitList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.certificateData = {};
+      this.mainDangerousMark = {
+        burn : false,
+          electricShock : false,
+          objectStrike : false,
+          stifle : false,
+          drop : false,
+          vehicleInjury : false,
+          other : false
+      };
+      this.licenceInfo = {
+        lockListing: {
+          num: "",
+            isChecked: false
+        },
+        blindPlate: {
+          num: "",
+            isChecked: false,
+            status: "0"
+        },
+        breakGround: {
+          num: "",
+            isChecked: false,
+            status: "0"
+        },
+        limitSpace: {
+          num: "",
+            isChecked: false,
+            status: "0"
+        },
+        jsa: {
+          no: false,
+            yes: false,
+            num: ""
+        },
+        specialLicence: false,
+          flareUp: {
+          num: "",
+            isChecked: false,
+            status: "0"
+        },
+        hoisting: {
+          num: "",
+            isChecked: false,
+            status: "0"
+        },
+        ray: {
+          num: "",
+            isChecked: false,
+            status: "0"
+        },
+        electricityUse: {
+          num: "",
+            isChecked: false,
+            status: "0"
+        },
+        heightWork: {
+          num: "",
+            isChecked: false,
+            status: "0"
+        }
+      };
+      this.relationSign = {
+        contractor:"",
+          personCharge:""
       };
+      this.produceComfirm = {
+        leaderDeptId:"",
+          monitorId:"",
+          monitorName:"",
+          date:""
+      }
     },
-    created() {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
-      this.getAllContractorInfo();
-      this.getDicts("certificateStatus").then(response => {
-          this.certificateStatus = response.data;
-      });
-      this.getApproval();
     },
-    methods: {
-      /** 查询作业许可证列表 */
-      getList() {
-        this.loading = true;
-        listPermit(this.queryParams).then(response => {
-          this.permitList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          workPermitId: null,
-          applyDept: null,
-          linkMan: null,
-          linkPhone: null,
-          workBound: null,
-          deviceName: null,
-          deviceNum: null,
-          applyWorkStartTime: null,
-          applyWorkEndTime: null,
-          workContent: null,
-          contractor: null,
-          ratifier: null,
-          mainDangerousMark: null,
-          dangerousMarkDetial: null,
-          licenceInfo: null,
-          relationSign: null,
-          produceComfirm: null,
-          workDeal: null,
-          applyStatus: "0",
-          createTime: null,
-          updateTime: null,
-          remarks: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
@@ -519,18 +751,22 @@
         this.reset();
         const workPermitId = row.workPermitId || this.ids
         getPermit(workPermitId).then(response => {
-          this.certificateData = response.data;
-          this.certificateData.linkManName = this.applyNameFormate(this.certificateData);
-          this.mainDangerousMark = JSON.parse(this.certificateData.mainDangerousMark);
-          this.licenceInfo = JSON.parse(this.certificateData.licenceInfo);
-          this.open = true;
-          this.title = "修改作业许可证";
-      });
+            this.certificateData = response.data;
+            this.certificateData.linkManName = this.applyNameFormate(this.certificateData);
+            this.mainDangerousMark = JSON.parse(this.certificateData.mainDangerousMark);
+            this.licenceInfo = JSON.parse(this.certificateData.licenceInfo);
+            this.relationSign = JSON.parse(this.certificateData.relationSign);
+            this.produceComfirm = JSON.parse(this.certificateData.produceComfirm);
+            this.open = true;
+            this.title = "修改作业许可证";
+        });
       },
       /** 提交按钮 */
       addCertificate() {
         this.certificateData.mainDangerousMark = JSON.stringify(this.mainDangerousMark);
         this.certificateData.licenceInfo = JSON.stringify(this.licenceInfo);
+        this.certificateData.relationSign = JSON.stringify(this.relationSign);
+        this.certificateData.produceComfirm = JSON.stringify(this.produceComfirm);
         if(this.certificateData.workPermitId != null){
           updatePermit(this.certificateData).then(response => {
             this.msgSuccess("修改成功");
@@ -656,12 +892,101 @@
         });
         //更新作业单状态
         if(flag){
-          updatePermit({workPermitId:this.tags[0].workPermitId,applyStatus:"2"});
+          updatePermit({workPermitId:this.tags[0].workPermitId,applyStatus:"1"});
           this.certificateApprovalApplyOpen = false;
+          this.getList();
         }
+      },
+      //作业单审核
+      certificateApproval(row){
+        this.certificateApprovalOpen = true;
+        getSpecialWorkPermitByWorkPermitId({workPermitId:row.workPermitId}).then(res =>{
+          //this.specialWorkPermits = res.data.specialWorkPermits;
+          let specialWorkPermits = res.data.specialWorkPermits;
+          this.$nextTick(() => {
+            for(let key in specialWorkPermits ){
+              listSign({ pageNum: 1,pageSize: 99999,permitId:specialWorkPermits[key].specialWorkPermitId}).then(res =>{
+                if(-1 != res.rows.findIndex(item => item.staffId === $store.state.user.userId)){
+                    this.specialWorkPermits.push(specialWorkPermits[key]);
+                    this.$refs[specialWorkPermits[key].specialWorkType][0][specialWorkPermits[key].specialWorkType] = JSON.parse(specialWorkPermits[key].specialWorkData);
+                    this.$refs[specialWorkPermits[key].specialWorkType][0].specialWorkPermitId = specialWorkPermits[key].specialWorkPermitId;
+                    this.$refs[specialWorkPermits[key].specialWorkType][0].specialWorkPermitSigns = res.rows;
+                 }
+              })
+            }
+          })
+          this.approvalActive = this.specialWorkPermits[0].specialWorkType;
+        })
+      },
+      cancelCertificateApproval(){
+        this.certificateApprovalOpen = false;
+      },
+      //作业前检查
+      certificateCheck(row){
+        this.checkOpen=true;
+        this.workPermitTitle = "事前检查";
+        const workPermitId = row.workPermitId;
+        getPermit(workPermitId).then(response => {
+          this.certificateData = response.data;
+          this.certificateData.linkMan = this.applyNameFormate( this.certificateData);
+          this.mainDangerousMark = JSON.parse(this.certificateData.mainDangerousMark);
+          this.licenceInfo = JSON.parse(this.certificateData.licenceInfo);
+          this.relationSign = JSON.parse(this.certificateData.relationSign);
+        })
+      },
+      /** 查询部门列表 */
+      getDeptList() {
+        listDept().then(response => {
+            this.deptList = response.data;
+        });
+      },
+      //部门切换
+      switchDept(){
+        this.produceComfirm.monitorId = "";
+        listUser({ pageNum: 1,pageSize: 99999,deptId:this.produceComfirm.leaderDeptId}).then(response => {
+            this.userList = response.rows;
+        });
+      },
+      checkCancel(){
+        this.checkOpen=false;
+        this.reset();
+      },
+      checkSubmit(){
+        if(this.produceComfirm.monitorName == null || this.produceComfirm.monitorName == ''){
+          this.msgError("请签名！");
+          return;
+        }
+        let produceComfirm = JSON.stringify(this.produceComfirm);
+        updatePermit({workPermitId:this.certificateData.workPermitId,produceComfirm:produceComfirm,applyStatus:"3"}).then(response => {
+          this.msgSuccess("签名成功");
+          this.checkOpen = false;
+          this.getList();
+        });
+      },
+      //关闭作业单
+      closeCertificate(row){
+        this.workPermitId = row.workPermitId;
+        this.certificateCompleteOpen = true;
+      },
+      completeSubmit(){
+        updatePermit({workPermitId:this.workPermitId,workDeal:JSON.stringify(this.workDeal),applyStatus:"4"}).then(response => {
+          this.msgSuccess("作业单关闭！");
+          this.certificateCompleteOpen = false;
+          this.getList();
+        });
+      },
+      completeCancel(){
+        this.certificateCompleteOpen = false;
+      },
+      certificateDetail(row){
+        const workPermitId = row.workPermitId;
+        getPermit(workPermitId).then(res => {
+          this.certificateDataDetail = res.data;
+          this.certificateDataDetail.linkMan = this.applyNameFormate(this.certificateDataDetail);
+          this.certificateDetailOpen = true;
+        })
       }
-
-    }
+  }
   }
 </script>
 

danger-manage-web/src/views/system/statistics/index.vue

@@ -20,13 +20,29 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="开始时间" prop="applyWorkStartTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.applyWorkStartTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="applyWorkEndTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.applyWorkEndTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择结束时间">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-<!--    <el-row :gutter="10" class="mb8">-->
+    <el-row :gutter="10" class="mb8">
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
 <!--          type="primary"-->
@@ -59,19 +75,19 @@
 <!--          v-hasPermi="['system:setting:remove']"-->
 <!--        >删除</el-button>-->
 <!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--		  :loading="exportLoading"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['system:setting:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+		  :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:setting:export']"
+        >导出</el-button>
+      </el-col>
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
+    </el-row>
 
     <el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
       <el-table-column  width="250" label="巡检地点" align="center" prop="patrolAddress" />
@@ -146,7 +162,7 @@
 </template>
 
 <script>
-import { listSetting, getSetting, delSetting, addSetting, updateSetting, exportSetting } from "@/api/system/statistics.js";
+import { listSetting, getSetting, delSetting, addSetting, updateSetting, exportPunchClockList } from "@/api/system/statistics.js";
 
 export default {
   name: "Setting",
@@ -185,6 +201,8 @@ export default {
         patrolAddress: null,
         nfcNum: null,
         region:null,
+        applyWorkStartTime:null,
+        applyWorkEndTime:null
       },
       // 表单参数
       form: {},
@@ -313,7 +331,7 @@ export default {
           type: "warning"
         }).then(() => {
           this.exportLoading = true;
-          return exportSetting(queryParams);
+          return exportPunchClockList(queryParams);
         }).then(response => {
           this.download(response.msg);
           this.exportLoading = false;

danger-manage-web/src/views/system/tNfcSetting/index.vue

@@ -29,6 +29,22 @@
           />
         </el-select>
       </el-form-item>
+<!--      <el-form-item label="开始时间" prop="applyWorkStartTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--                        v-model="queryParams.applyWorkStartTime"-->
+<!--                        type="date"-->
+<!--                        value-format="yyyy-MM-dd"-->
+<!--                        placeholder="选择开始时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="结束时间" prop="applyWorkEndTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--                        v-model="queryParams.applyWorkEndTime"-->
+<!--                        type="date"-->
+<!--                        value-format="yyyy-MM-dd"-->
+<!--                        placeholder="选择结束时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -98,7 +114,8 @@
       <el-table-column label="nfc编号" align="center" prop="nfcNum" >
         <span slot-scope="scope" v-if="scope.row.nfcNum">{{scope.row.nfcNum}}</span>
         <span v-else>-</span>
-      </el-table-column>>
+      </el-table-column>
+<!--      <el-table-column label="创建时间" width="170" align="center" prop="createTime" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -128,7 +145,7 @@
     />
 
     <!-- 添加或修改setting对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" style="height: 150%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="排序" prop="patrolSort">
           <el-input v-model="form.patrolSort" placeholder="请输入排序" />
@@ -152,8 +169,8 @@
         <el-form-item label="nfc编号" prop="nfcNum">
           <el-input v-model="form.nfcNum" placeholder="请输入nfc编号" />
         </el-form-item>
-        <el-form-item label="巡检内容" prop="patrolComent" >
-          <el-input v-model="form.patrolComent" type="textarea" placeholder="请输入内容" height="100px"/>
+        <el-form-item label="巡检内容"   prop="patrolComent" >
+          <el-input v-model="form.patrolComent"  :autosize="{ minRows: 9, maxRows: 14}" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -203,6 +220,8 @@ export default {
         patrolAddress: null,
         nfcNum: null,
         region:null,
+        applyWorkStartTime:null,
+        applyWorkEndTime:null
       },
       // 表单参数
       form: {},

danger-manage-web/vue.config.js

@@ -36,6 +36,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         target: process.env.VUE_APP_TARGET,
         // target: `http://192.168.2.16:8908/dangerManage`,
+        // target: `http://192.168.2.17:8908/dangerManage`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''