Merge remote-tracking branch 'origin/master'

.gitignore

@@ -29,6 +29,7 @@ target/
 *.class
 *.jar
 *.log
+*.zip
 /logs/*
 /target/*
 .settings*
@@ -74,3 +75,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+/log.path_IS_UNDEFINED/*.zip

danger-manage-admin/src/main/java/com/zehong/web/controller/entranceguard/TEntranceGuardPersonInfoController.java

+package com.zehong.web.controller.entranceguard;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TEntranceGuardPersonInfo;
+import com.zehong.system.service.ITEntranceGuardPersonInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 门禁人员信息Controller
+ * 
+ * @author zehong
+ * @date 2022-11-02
+ */
+@RestController
+@RequestMapping("/entranceGuardPerson/info")
+public class TEntranceGuardPersonInfoController extends BaseController
+{
+    @Autowired
+    private ITEntranceGuardPersonInfoService tEntranceGuardPersonInfoService;
+
+    /**
+     * 查询门禁人员信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TEntranceGuardPersonInfo tEntranceGuardPersonInfo)
+    {
+        startPage();
+        List<TEntranceGuardPersonInfo> list = tEntranceGuardPersonInfoService.selectTEntranceGuardPersonInfoList(tEntranceGuardPersonInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出门禁人员信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:export')")
+    @Log(title = "门禁人员信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TEntranceGuardPersonInfo tEntranceGuardPersonInfo)
+    {
+        List<TEntranceGuardPersonInfo> list = tEntranceGuardPersonInfoService.selectTEntranceGuardPersonInfoList(tEntranceGuardPersonInfo);
+        ExcelUtil<TEntranceGuardPersonInfo> util = new ExcelUtil<TEntranceGuardPersonInfo>(TEntranceGuardPersonInfo.class);
+        return util.exportExcel(list, "门禁人员信息数据");
+    }
+
+    /**
+     * 获取门禁人员信息详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:query')")
+    @GetMapping(value = "/{entranceGuardPersonId}")
+    public AjaxResult getInfo(@PathVariable("entranceGuardPersonId") Long entranceGuardPersonId)
+    {
+        return AjaxResult.success(tEntranceGuardPersonInfoService.selectTEntranceGuardPersonInfoById(entranceGuardPersonId));
+    }
+
+    /**
+     * 新增门禁人员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:add')")
+    @Log(title = "门禁人员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TEntranceGuardPersonInfo tEntranceGuardPersonInfo)
+    {
+        return toAjax(tEntranceGuardPersonInfoService.insertTEntranceGuardPersonInfo(tEntranceGuardPersonInfo));
+    }
+
+    /**
+     * 修改门禁人员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @Log(title = "门禁人员信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TEntranceGuardPersonInfo tEntranceGuardPersonInfo)
+    {
+        return toAjax(tEntranceGuardPersonInfoService.updateTEntranceGuardPersonInfo(tEntranceGuardPersonInfo));
+    }
+
+    /**
+     * 删除门禁人员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:remove')")
+    @Log(title = "门禁人员信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{entranceGuardPersonIds}")
+    public AjaxResult remove(@PathVariable Long[] entranceGuardPersonIds)
+    {
+        return toAjax(tEntranceGuardPersonInfoService.deleteTEntranceGuardPersonInfoByIds(entranceGuardPersonIds));
+    }
+
+    /**
+     * 二道门人员信息初始化
+     */
+    @GetMapping("/getEntranceGuardPersonInfo")
+    public AjaxResult getEntranceGuardPersonInfo(){
+        return AjaxResult.success(tEntranceGuardPersonInfoService.getEntranceGuardPersonInfo());
+    }
+}

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

 package com.zehong.web.controller.hiddenDanger;
 
 import java.util.List;
+
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.core.domain.model.LoginUser;
+import com.zehong.common.utils.ServletUtils;
+import com.zehong.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +37,8 @@ public class TStaningBookController extends BaseController
 {
     @Autowired
     private ITStaningBookService tStaningBookService;
-
+    @Autowired
+    private TokenService tokenService;
     /**
      * 查询隐患台账列表
      */
@@ -40,8 +46,10 @@ public class TStaningBookController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TStaningBook tStaningBook)
     {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
         startPage();
-        List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook);
+        List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook,user.getDeptId());
         return getDataTable(list);
     }
 
@@ -53,7 +61,10 @@ public class TStaningBookController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(TStaningBook tStaningBook)
     {
-        List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook);
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        startPage();
+        List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook,user.getDeptId());
         ExcelUtil<TStaningBook> util = new ExcelUtil<TStaningBook>(TStaningBook.class);
         return util.exportExcel(list, "隐患台账数据");
     }

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

@@ -111,4 +111,9 @@ public class TDeviceAlarmInfoController extends BaseController
     {
         return toAjax(tDeviceAlarmInfoService.deleteTDeviceAlarmInfoByIds(alarmIds));
     }
+
+    @GetMapping("/sumAlarmTotal")
+    public AjaxResult sumAlarmTotal(){
+        return AjaxResult.success(tDeviceAlarmInfoService.sumAlarmTotal());
+    }
 }

danger-manage-admin/src/main/java/com/zehong/web/controller/videomonitor/SubscriptionEventController.java

+package com.zehong.web.controller.videomonitor;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.util.StringUtil;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.redis.RedisCache;
+import com.zehong.system.domain.TDeviceAlarmInfo;
+import com.zehong.system.service.ITDeviceAlarmInfoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author geng
+ * 订阅海康事件信息接收
+ */
+@RestController
+@RequestMapping("/subscription")
+public class SubscriptionEventController {
+
+    private Logger logger = LoggerFactory.getLogger(SubscriptionEventController.class);
+
+    @Autowired
+    private RedisCache redisCache;
+    @Autowired
+    private ITDeviceAlarmInfoService tDeviceAlarmInfoService;
+
+    /**
+     * 烟雾检测订阅事件
+     * @param smoke 入参
+     * @return AjaxResult
+     */
+    @PostMapping("/smokeCheck")
+    public AjaxResult smokeCheck(@RequestBody Map<String,Object> smoke){
+        logger.info("烟雾检测信息："+ JSON.toJSONString(smoke));
+        return AjaxResult.success();
+    }
+
+    /**
+     * 烟火检测订阅事件
+     * @param pyrotechnic 入参
+     * @return AjaxResult
+     */
+    @PostMapping("/pyrotechnicCheck")
+    public AjaxResult pyrotechnicCheck(@RequestBody Map<String,Object> pyrotechnic){
+        logger.info("烟火检测信息："+ JSON.toJSONString(pyrotechnic));
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/faceVerification")
+    public AjaxResult faceVerification(@RequestBody Map<String,Object> faceVeriy){
+        logger.info("人脸验证信息："+ JSON.toJSONString(faceVeriy));
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/patrolCardCheck")
+    public AjaxResult patrolCardCheck(@RequestBody Map<String,Object> patrolCard){
+        logger.info("巡查卡比对信息信息："+ JSON.toJSONString(patrolCard));
+        return AjaxResult.success();
+    }
+
+    /**
+     * 设置订阅事件缓存
+     * @param deviceCode 设备编号
+     * @param imageUrl 报警图片信息
+     * @return boolean
+     */
+    private boolean getEventCacheInfo(String deviceCode,String imageUrl){
+        Map<String,TDeviceAlarmInfo> tDeviceAlarmInfoCache = redisCache.getCacheObject("dangroueSubsciription");
+        if(ObjectUtil.isNotNull(tDeviceAlarmInfoCache) && tDeviceAlarmInfoCache.containsKey(deviceCode)){
+            //更新设备预警图像信息
+            if(StringUtil.isNotEmpty(imageUrl)){
+                tDeviceAlarmInfoCache.get(deviceCode).setAlarmImageUrl(imageUrl);
+            }
+            tDeviceAlarmInfoCache.get(deviceCode).setAlarmBeginTime(new Date());
+            redisCache.setCacheObject("dangrousSubsciription",tDeviceAlarmInfoCache);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 设置订阅事件缓存
+     * @param deviceCode 设备编号
+     * @param imageUrl 报警图片信息
+     *
+     * @return boolean
+     */
+    private boolean setEventCacheInfo(String deviceCode,String imageUrl) throws Exception {
+        if(StringUtil.isEmpty(deviceCode)){
+            throw new Exception("设备编号为空！");
+        }
+        Map<String,TDeviceAlarmInfo> tDeviceAlarmInfoCache = redisCache.getCacheObject("dangrousSubsciription");
+        if(null !=tDeviceAlarmInfoCache && tDeviceAlarmInfoCache.containsKey(deviceCode)){
+            //更新设备预警图像信息
+            if(StringUtil.isNotEmpty(imageUrl)){
+                tDeviceAlarmInfoCache.get(deviceCode).setAlarmImageUrl(imageUrl);
+            }
+            tDeviceAlarmInfoCache.get(deviceCode).setAlarmBeginTime(new Date());
+            redisCache.setCacheObject("dangrousSubsciription",tDeviceAlarmInfoCache);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 初始化报警信息
+     * @param deviceCode 设备编号
+     * @param imageUrl 报警图片
+     * @param type 报警类型
+     * @return TDeviceAlarmInfo
+     */
+    private TDeviceAlarmInfo initAlarmInfo(String deviceCode,String imageUrl,int type){
+        TDeviceAlarmInfo alarmInfo = new TDeviceAlarmInfo();
+        alarmInfo.setRelationDeviceId(deviceCode);
+        alarmInfo.setAlarmContent(type);
+        alarmInfo.setAlarmBeginTime(new Date());
+        alarmInfo.setAlarmStatus("0");
+        if(StringUtil.isNotEmpty(imageUrl)){
+            alarmInfo.setAlarmImageUrl(imageUrl);
+        }
+        tDeviceAlarmInfoService.insertTDeviceAlarmInfo(alarmInfo);
+        Map<String,TDeviceAlarmInfo> tDeviceAlarmInfoCache = redisCache.getCacheObject("dangrousSubsciription");
+        if(null != tDeviceAlarmInfoCache){
+            tDeviceAlarmInfoCache.put(deviceCode,alarmInfo);
+            redisCache.setCacheObject("dangrousSubsciription",tDeviceAlarmInfoCache);
+        }else{
+            Map<String,TDeviceAlarmInfo> alarmInfoMap = new HashMap<>(16);
+            alarmInfoMap.put(deviceCode,alarmInfo);
+            redisCache.setCacheObject("dangrousSubsciription",alarmInfoMap);
+        }
+        return alarmInfo;
+    }
+
+}

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

 package com.zehong.web.controller.workPermit;
 
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +27,10 @@ import com.zehong.system.service.ITSpecialWorkPermitSignService;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.common.core.page.TableDataInfo;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 【请填写功能名称】Controller
  * 
@@ -68,6 +79,37 @@ public class TSpecialWorkPermitSignController extends BaseController
         return AjaxResult.success(tSpecialWorkPermitSignService.selectTSpecialWorkPermitSignById(signId));
     }
 
+    /**
+     * app添加
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sign:add')")
+    @Log(title = "批量添加", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/insertAll")
+    public AjaxResult addAll(HttpServletRequest req, HttpServletResponse resp) throws Exception
+    {
+        StringBuffer sb = new StringBuffer() ;
+        InputStream is = req.getInputStream();
+        BufferedReader br = new BufferedReader(new InputStreamReader(is,"utf-8"));
+        String s = "" ;
+        while((s=br.readLine())!=null){
+            sb.append(s) ;
+        }
+        if(sb.toString().length()<=0){
+            return toAjax(0);
+        }
+        Map<String,Object> map  = (Map<String,Object>) JSON.parseObject(sb.toString());
+
+        int a = 0;
+        List<Map<String,Object>> list =(List<Map<String,Object>>) JSON.parse((String) map.get("signList"));
+        for(Map<String,Object> m : list){
+            TSpecialWorkPermitSign t = new TSpecialWorkPermitSign();
+            t.setPermitId(((Integer) m.get("permitId")).longValue());
+            t.setStaffId(((Integer) m.get("staffId")).longValue());
+            t.setStaffType((String) m.get("staffType"));
+           a = tSpecialWorkPermitSignService.insertTSpecialWorkPermitSign(t);
+        }
+        return toAjax(1);
+    }
     /**
      * 新增【请填写功能名称】
      */

danger-manage-admin/src/main/resources/application-dev.yml

@@ -105,7 +105,7 @@ zehong:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /home/zehong/uploadPath）
-  profile: /home/zehong/uploadPath
+  profile: D:/zehong/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

danger-manage-admin/src/main/resources/application.yml

@@ -55,7 +55,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping:
 
 # 防止XSS攻击
 xss: 

danger-manage-common/pom.xml

@@ -119,6 +119,18 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <!-- websocket 支持 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.12</version>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file

danger-manage-common/src/main/java/com/zehong/common/config/WebSocketConfig.java

+package com.zehong.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+@Configuration
+public class WebSocketConfig {
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+
+}

danger-manage-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java

@@ -105,6 +105,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         "/**/*.css",
                         "/**/*.js"
                 ).permitAll()
+                .antMatchers(
+                        HttpMethod.POST,
+                        "/subscription/**"
+                ).permitAll()
                 .antMatchers("/profile/**").anonymous()
                 .antMatchers("/common/download**").anonymous()
                 .antMatchers("/common/download/resource**").anonymous()

danger-manage-quartz/src/main/java/com/zehong/quartz/task/SubscriptEventTask.java

+package com.zehong.quartz.task;
+
+import com.zehong.common.core.redis.RedisCache;
+import com.zehong.system.domain.TDeviceAlarmInfo;
+import com.zehong.system.service.ITDeviceAlarmInfoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * @author geng
+ * 订阅事件job
+ */
+
+@Component("subscriptEventTask")
+public class SubscriptEventTask {
+
+    private Logger logger = LoggerFactory.getLogger(SubscriptEventTask.class);
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @Autowired
+    private ITDeviceAlarmInfoService tDeviceAlarmInfoService;
+
+    /**
+     *  自动消警
+     */
+    public void automaticAlarmElimination(){
+        try {
+            logger.info("--------------- 自动消警开始 -------------");
+            //获取缓存信息
+            Map<String,TDeviceAlarmInfo> tDeviceAlarmInfoCache = redisCache.getCacheObject("dangrousSubsciription");
+            Iterator<Map.Entry<String, TDeviceAlarmInfo>> it = tDeviceAlarmInfoCache.entrySet().iterator();
+            boolean hasEndAlarm = false;
+            while(it.hasNext()){
+                TDeviceAlarmInfo alarmInfo = it.next().getValue();
+                Date day=new Date();
+                long timeSpace = (day.getTime() - alarmInfo.getAlarmBeginTime().getTime()) /(60 * 1000) ;
+                if(timeSpace > 5){
+                    TDeviceAlarmInfo alarm = tDeviceAlarmInfoService.selectTDeviceAlarmInfoById(alarmInfo.getAlarmId());
+                    if("0".equals(alarm.getAlarmStatus())){
+                        //更新报警结束时间
+                        alarmInfo.setAlarmEndTime(new Date());
+                        alarmInfo.setAlarmStatus("1");
+                        tDeviceAlarmInfoService.updateTDeviceAlarmInfo(alarmInfo);
+                    }
+                    //清除缓存
+                    it.remove();
+                    hasEndAlarm = true;
+                }
+            }
+            if(hasEndAlarm){
+                redisCache.setCacheObject("dangrousSubsciription",tDeviceAlarmInfoCache);
+            }
+
+        }catch (Exception e){
+            logger.error("自动消警开始失败：" + e);
+        }
+    }
+}

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

+package com.zehong.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 门禁人员信息对象 t_entrance_guard_person_info
+ * 
+ * @author zehong
+ * @date 2022-11-02
+ */
+public class TEntranceGuardPersonInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 门禁人员id */
+    private Long entranceGuardPersonId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String personName;
+
+    /** 人员编号 */
+    @Excel(name = "人员编号")
+    private String personNum;
+
+    /** 行为类型：0.进场 1.出场 */
+    @Excel(name = "行为类型：0.进场 1.出场")
+    private String actionType;
+
+    /** 进出场时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "进出场时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date actionTime;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    public void setEntranceGuardPersonId(Long entranceGuardPersonId) 
+    {
+        this.entranceGuardPersonId = entranceGuardPersonId;
+    }
+
+    public Long getEntranceGuardPersonId() 
+    {
+        return entranceGuardPersonId;
+    }
+    public void setPersonName(String personName) 
+    {
+        this.personName = personName;
+    }
+
+    public String getPersonName() 
+    {
+        return personName;
+    }
+    public void setPersonNum(String personNum) 
+    {
+        this.personNum = personNum;
+    }
+
+    public String getPersonNum() 
+    {
+        return personNum;
+    }
+    public void setActionType(String actionType) 
+    {
+        this.actionType = actionType;
+    }
+
+    public String getActionType() 
+    {
+        return actionType;
+    }
+    public void setActionTime(Date actionTime) 
+    {
+        this.actionTime = actionTime;
+    }
+
+    public Date getActionTime() 
+    {
+        return actionTime;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("entranceGuardPersonId", getEntranceGuardPersonId())
+            .append("personName", getPersonName())
+            .append("personNum", getPersonNum())
+            .append("actionType", getActionType())
+            .append("actionTime", getActionTime())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

 package com.zehong.system.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -140,6 +142,17 @@ public class TStaningBook extends BaseEntity
     /** 删除 0否 1是 */
     private Integer isDel;
 
+
+    private List<Long> deptList;
+
+    public List<Long> getDeptList() {
+        return deptList;
+    }
+
+    public void setDeptList(List<Long> deptList) {
+        this.deptList = deptList;
+    }
+
     public String getEscalationName() {
         return escalationName;
     }

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

@@ -28,6 +28,8 @@ public class TTrainCourse extends BaseEntity
     @Excel(name = "课程类型", readConverterExp = "培=训计划")
     private Long courseType;
 
+    private String planName;
+
     /** 课程内容 */
     @Excel(name = "课程内容")
     private String courseConent;
@@ -65,6 +67,14 @@ public class TTrainCourse extends BaseEntity
     @Excel(name = "0未删除 1已删除")
     private Integer isDel;
 
+    public String getPlanName() {
+        return planName;
+    }
+
+    public void setPlanName(String planName) {
+        this.planName = planName;
+    }
+
     public void setCourseId(Long courseId)
     {
         this.courseId = courseId;

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

+package com.zehong.system.domain;
+
+import javax.websocket.Session;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * <websocket信息对象>
+ * <用于存储secket连接信息>
+ * @author wzh
+ * @version 2018-07-08 18:49
+ * @see [相关类/方法] (可选)
+ **/
+public class WebSocketBean {
+
+    /**
+     * 连接session对象
+     */
+    private Session session;
+
+    /**
+     * 连接错误次数
+     */
+    private AtomicInteger erroerLinkCount = new AtomicInteger(0);
+
+    public int getErroerLinkCount() {
+        // 线程安全,以原子方式将当前值加1，注意：这里返回的是自增前的值
+        return erroerLinkCount.getAndIncrement();
+    }
+
+    public void cleanErrorNum()
+    {
+        // 清空计数
+        erroerLinkCount = new AtomicInteger(0);
+    }
+
+    public Session getSession() {
+        return session;
+    }
+
+    public void setSession(Session session) {
+        this.session = session;
+    }
+
+}
\ No newline at end of file

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

@@ -134,4 +134,7 @@ public interface SysDeptMapper
     public List<Map<String,Object>>  classification(Long deptId);
 
     public List<Map<String,Object>> classificationByList(@Param("list") List<Map<String,Object>> list);
+
+
+    public List<Long> selectDeptByParentId(@Param("deptList") List<Long> deptList);
 }

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

@@ -83,4 +83,22 @@ public interface TDeviceAlarmInfoMapper
      * @return
      */
     public List<Map<String,Object>> selectEveryDay();
+
+    /**
+     * 预警年累计
+     * @return
+     */
+    int sumAlarmByYear();
+
+    /**
+     * 预警月累计
+     * @return
+     */
+    int sumAlarmByMonth();
+
+    /**
+     * 预警日累计
+     * @return
+     */
+    int sumAlarmByDay();
 }

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TEntranceGuardPersonInfo;
+
+/**
+ * 门禁人员信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-11-02
+ */
+public interface TEntranceGuardPersonInfoMapper 
+{
+    /**
+     * 查询门禁人员信息
+     * 
+     * @param entranceGuardPersonId 门禁人员信息ID
+     * @return 门禁人员信息
+     */
+    public TEntranceGuardPersonInfo selectTEntranceGuardPersonInfoById(Long entranceGuardPersonId);
+
+    /**
+     * 查询门禁人员信息列表
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 门禁人员信息集合
+     */
+    public List<TEntranceGuardPersonInfo> selectTEntranceGuardPersonInfoList(TEntranceGuardPersonInfo tEntranceGuardPersonInfo);
+
+    /**
+     * 新增门禁人员信息
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 结果
+     */
+    public int insertTEntranceGuardPersonInfo(TEntranceGuardPersonInfo tEntranceGuardPersonInfo);
+
+    /**
+     * 修改门禁人员信息
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 结果
+     */
+    public int updateTEntranceGuardPersonInfo(TEntranceGuardPersonInfo tEntranceGuardPersonInfo);
+
+    /**
+     * 删除门禁人员信息
+     * 
+     * @param entranceGuardPersonId 门禁人员信息ID
+     * @return 结果
+     */
+    public int deleteTEntranceGuardPersonInfoById(Long entranceGuardPersonId);
+
+    /**
+     * 批量删除门禁人员信息
+     * 
+     * @param entranceGuardPersonIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEntranceGuardPersonInfoByIds(Long[] entranceGuardPersonIds);
+
+    /**
+     * 统计进出人员数量
+     * @return
+     */
+    List<Map<String,String>> statisticsPersonByActionType();
+
+    /**
+     * 统计在场人员
+     * @return
+     */
+    String statisticsStayInPersons();
+
+    /**
+     * 获取最新进出数据
+     * @return
+     */
+    List<TEntranceGuardPersonInfo> lastImportAndExportData();
+
+}

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

@@ -66,4 +66,10 @@ public interface ITDeviceAlarmInfoService
      * @return
      */
     public Map<String,Object> selectStatistics();
+
+    /**
+     * 预警累计量统计
+     * @return
+     */
+    Map<String,Integer> sumAlarmTotal();
 }

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

+package com.zehong.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TEntranceGuardPersonInfo;
+
+/**
+ * 门禁人员信息Service接口
+ * 
+ * @author zehong
+ * @date 2022-11-02
+ */
+public interface ITEntranceGuardPersonInfoService 
+{
+    /**
+     * 查询门禁人员信息
+     * 
+     * @param entranceGuardPersonId 门禁人员信息ID
+     * @return 门禁人员信息
+     */
+    public TEntranceGuardPersonInfo selectTEntranceGuardPersonInfoById(Long entranceGuardPersonId);
+
+    /**
+     * 查询门禁人员信息列表
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 门禁人员信息集合
+     */
+    public List<TEntranceGuardPersonInfo> selectTEntranceGuardPersonInfoList(TEntranceGuardPersonInfo tEntranceGuardPersonInfo);
+
+    /**
+     * 新增门禁人员信息
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 结果
+     */
+    public int insertTEntranceGuardPersonInfo(TEntranceGuardPersonInfo tEntranceGuardPersonInfo);
+
+    /**
+     * 修改门禁人员信息
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 结果
+     */
+    public int updateTEntranceGuardPersonInfo(TEntranceGuardPersonInfo tEntranceGuardPersonInfo);
+
+    /**
+     * 批量删除门禁人员信息
+     * 
+     * @param entranceGuardPersonIds 需要删除的门禁人员信息ID
+     * @return 结果
+     */
+    public int deleteTEntranceGuardPersonInfoByIds(Long[] entranceGuardPersonIds);
+
+    /**
+     * 删除门禁人员信息信息
+     * 
+     * @param entranceGuardPersonId 门禁人员信息ID
+     * @return 结果
+     */
+    public int deleteTEntranceGuardPersonInfoById(Long entranceGuardPersonId);
+
+    /**
+     * 二道门人员信息初始化
+     */
+    Map<String,Object> getEntranceGuardPersonInfo();
+}

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

@@ -27,7 +27,7 @@ public interface ITStaningBookService
      * @param tStaningBook 隐患台账
      * @return 隐患台账集合
      */
-    public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook);
+    public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook,Long deptId);
 
     /**
      * 新增隐患台账

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

+package com.zehong.system.service;
+
+import javax.websocket.EndpointConfig;
+import javax.websocket.Session;
+
+/**
+ * <基于javax websocket通讯>
+ * <功能详细描述>
+ * @author wzh
+ * @version 2018-07-08 17:11
+ * @see [相关类/方法] (可选)
+ **/
+public interface WebSocketServer {
+
+    /**
+     * 连接建立成功调用的方法
+     * @param session session 对象
+     */
+    public void onOpen(Session session, EndpointConfig config);
+
+    /**
+     * 断开连接方法
+     */
+    public void onClose(Session session);
+
+    /**
+     * 收到客户端消息后调用的方法
+     * @param session session 对象
+     * @param message 返回客户端的消息
+     */
+    public void onMessage(Session session, String message);
+
+    /**
+     * 发生异常时触发的方法
+     * @param session session 对象
+     * @param throwable 抛出的异常
+     */
+    public void onError(Session session, Throwable throwable);
+
+    /**
+     * 向单个客户端发送消息
+     * @param session session 对象
+     * @param message 发送给客户端的消息
+     */
+    public void sendMessage(Session session, String message);
+
+    /**
+     * 向所有在线用户群发消息
+     * @param message 发送给客户端的消息
+     */
+    public void batchSendMessage(String message);
+}
\ No newline at end of file

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

@@ -177,4 +177,17 @@ public class TDeviceAlarmInfoServiceImpl implements ITDeviceAlarmInfoService
         }
         return list;
     }
+
+    /**
+     * 预警累计量统计
+     * @return
+     */
+    @Override
+    public Map<String,Integer> sumAlarmTotal(){
+        Map<String,Integer> total = new HashMap<>();
+        total.put("yearTotal",tDeviceAlarmInfoMapper.sumAlarmByYear());
+        total.put("monthTotal",tDeviceAlarmInfoMapper.sumAlarmByMonth());
+        total.put("dayTotal",tDeviceAlarmInfoMapper.sumAlarmByDay());
+        return total;
+    }
 }

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

+package com.zehong.system.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TEntranceGuardPersonInfoMapper;
+import com.zehong.system.domain.TEntranceGuardPersonInfo;
+import com.zehong.system.service.ITEntranceGuardPersonInfoService;
+
+/**
+ * 门禁人员信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-11-02
+ */
+@Service
+public class TEntranceGuardPersonInfoServiceImpl implements ITEntranceGuardPersonInfoService 
+{
+    @Autowired
+    private TEntranceGuardPersonInfoMapper tEntranceGuardPersonInfoMapper;
+
+    /**
+     * 查询门禁人员信息
+     * 
+     * @param entranceGuardPersonId 门禁人员信息ID
+     * @return 门禁人员信息
+     */
+    @Override
+    public TEntranceGuardPersonInfo selectTEntranceGuardPersonInfoById(Long entranceGuardPersonId)
+    {
+        return tEntranceGuardPersonInfoMapper.selectTEntranceGuardPersonInfoById(entranceGuardPersonId);
+    }
+
+    /**
+     * 查询门禁人员信息列表
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 门禁人员信息
+     */
+    @Override
+    public List<TEntranceGuardPersonInfo> selectTEntranceGuardPersonInfoList(TEntranceGuardPersonInfo tEntranceGuardPersonInfo)
+    {
+        return tEntranceGuardPersonInfoMapper.selectTEntranceGuardPersonInfoList(tEntranceGuardPersonInfo);
+    }
+
+    /**
+     * 新增门禁人员信息
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 结果
+     */
+    @Override
+    public int insertTEntranceGuardPersonInfo(TEntranceGuardPersonInfo tEntranceGuardPersonInfo)
+    {
+        tEntranceGuardPersonInfo.setCreateTime(DateUtils.getNowDate());
+        return tEntranceGuardPersonInfoMapper.insertTEntranceGuardPersonInfo(tEntranceGuardPersonInfo);
+    }
+
+    /**
+     * 修改门禁人员信息
+     * 
+     * @param tEntranceGuardPersonInfo 门禁人员信息
+     * @return 结果
+     */
+    @Override
+    public int updateTEntranceGuardPersonInfo(TEntranceGuardPersonInfo tEntranceGuardPersonInfo)
+    {
+        tEntranceGuardPersonInfo.setUpdateTime(DateUtils.getNowDate());
+        return tEntranceGuardPersonInfoMapper.updateTEntranceGuardPersonInfo(tEntranceGuardPersonInfo);
+    }
+
+    /**
+     * 批量删除门禁人员信息
+     * 
+     * @param entranceGuardPersonIds 需要删除的门禁人员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEntranceGuardPersonInfoByIds(Long[] entranceGuardPersonIds)
+    {
+        return tEntranceGuardPersonInfoMapper.deleteTEntranceGuardPersonInfoByIds(entranceGuardPersonIds);
+    }
+
+    /**
+     * 删除门禁人员信息信息
+     * 
+     * @param entranceGuardPersonId 门禁人员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEntranceGuardPersonInfoById(Long entranceGuardPersonId)
+    {
+        return tEntranceGuardPersonInfoMapper.deleteTEntranceGuardPersonInfoById(entranceGuardPersonId);
+    }
+
+    /**
+     * 二道门人员信息初始化
+     */
+    @Override
+    public Map<String,Object> getEntranceGuardPersonInfo(){
+        Map<String,Object> result = new HashMap<>(16);
+        //出入人数统计
+        List<Map<String,String>> actionCount = tEntranceGuardPersonInfoMapper.statisticsPersonByActionType();
+        for(Map map : actionCount){
+            if("0".equals(map.get("actionType"))){
+                result.put("importCount",map.get("counts"));
+            }
+            if("1".equals(map.get("actionType"))){
+                result.put("exportCount",map.get("counts"));
+            }
+        }
+        //在场人数统计
+        result.put("stayInCount",tEntranceGuardPersonInfoMapper.statisticsStayInPersons());
+        //出入场最新数据
+        List<TEntranceGuardPersonInfo> lastImportAndExportData = tEntranceGuardPersonInfoMapper.lastImportAndExportData();
+        for(TEntranceGuardPersonInfo tEntranceGuardPersonInfo : lastImportAndExportData){
+            if("0".equals(tEntranceGuardPersonInfo.getActionType())){
+                result.put("lastImportData",tEntranceGuardPersonInfo);
+            }
+            if("1".equals(tEntranceGuardPersonInfo.getActionType())){
+                result.put("lastExportData",tEntranceGuardPersonInfo);
+            }
+        }
+        return result;
+
+    }
+}

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

 package com.zehong.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -49,20 +50,23 @@ public class TStaningBookServiceImpl implements ITStaningBookService
      * @return 隐患台账
      */
     @Override
-    public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook)
+    public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook,Long deptId)
     {
+        List<Long> oneList = new ArrayList<>();
+        oneList.add(deptId);
+        List<Long> deptIds = selectDeptIds(new ArrayList<>(),oneList);
+        tStaningBook.setDeptList(deptIds);
         List<TStaningBook> list = tStaningBookMapper.selectTStaningBookList(tStaningBook);
-//        for(TStaningBook book: list){
-//            if(book.getDeptId()!=null){
-//                SysDept dept = deptMapper.selectDeptById(book.getDeptId());
-//                if(dept!=null){
-//                    book.setDeptName(dept.getDeptName());
-//                }
-//            }
-//        }
         return  list;
     }
-
+    public List<Long> selectDeptIds(List<Long> list,List<Long> deptIds){
+        List<Long> resultlist = deptMapper.selectDeptByParentId(deptIds);
+        if(resultlist.size()==0){
+            return list;
+        }
+        list.addAll(resultlist);
+        return selectDeptIds(list,resultlist);
+    }
     /**
      * 新增隐患台账
      * 

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

+package com.zehong.system.service.impl;
+
+import com.zehong.system.domain.WebSocketBean;
+import com.zehong.system.service.WebSocketServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.ServerEndpoint;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * <基于javax websocket通讯>
+ * <各个方法的参数都是可以根据项目的实际情况改的>
+ * @author wzh
+ * @version 2018-07-08 17:11
+ * @see [相关类/方法] (可选)
+ **/
+@ServerEndpoint(value = "/websocketServer")
+@Component("webSocketService")
+public class WebSocketServiceImpl implements WebSocketServer {
+
+    private Logger log = LoggerFactory.getLogger(WebSocketServiceImpl.class);
+
+    /**
+     * 错误最大重试次数
+     */
+    private static final int MAX_ERROR_NUM = 10;
+
+    /**
+     * 用来存放每个客户端对应的webSocket对象。
+     */
+    private static Map<String,WebSocketBean> webSocketInfo;
+
+    static
+    {
+        // concurrent包的线程安全map
+        webSocketInfo = new ConcurrentHashMap<>();
+    }
+
+    @OnOpen
+    @Override
+    public void onOpen(Session session, EndpointConfig config) {
+
+        // 如果是session没有激活的情况，就是没有请求获取或session，这里可能会取出空，需要实际业务处理
+       /* HttpSession httpSession= (HttpSession) config.getUserProperties().get(HttpSession.class.getName());
+        if(httpSession != null)
+        {
+            log.info("获取到httpsession" + httpSession.getId());
+        }else {
+            log.error("未获取到httpsession");
+        }*/
+
+        // 连接成功当前对象放入websocket对象集合
+        WebSocketBean bean = new WebSocketBean();
+        bean.setSession(session);
+        webSocketInfo.put(session.getId(),bean);
+
+        log.info("客户端连接服务器session id :"+session.getId()+"，当前连接数：" + webSocketInfo.size());
+    }
+
+    @OnClose
+    @Override
+    public void onClose(Session session) {
+
+        // 客户端断开连接移除websocket对象
+        webSocketInfo.remove(session.getId());
+        log.info("客户端断开连接，当前连接数：" + webSocketInfo.size());
+
+    }
+
+    @OnMessage
+    @Override
+    public void onMessage(Session session, String message) {
+
+        log.info("客户端 session id: "+session.getId()+"，消息:" + message);
+
+        // 此方法为客户端给服务器发送消息后进行的处理，可以根据业务自己处理，这里返回页面
+        sendMessage(session, "服务端返回" + message);
+
+    }
+
+    @OnError
+    @Override
+    public void onError(Session session, Throwable throwable) {
+
+        log.error("发生错误"+ throwable.getMessage(),throwable);
+    }
+
+    @Override
+    public void sendMessage(Session session, String message) {
+
+        try
+        {
+            // 发送消息
+            session.getBasicRemote().sendText(message);
+
+            // 清空错误计数
+            webSocketInfo.get(session.getId()).cleanErrorNum();
+        }
+        catch (Exception e)
+        {
+            log.error("发送消息失败"+ e.getMessage(),e);
+            int errorNum = webSocketInfo.get(session.getId()).getErroerLinkCount();
+
+            // 小于最大重试次数重发
+            if(errorNum <= MAX_ERROR_NUM)
+            {
+                sendMessage(session, message);
+            }
+            else{
+                log.error("发送消息失败超过最大次数");
+                // 清空错误计数
+                webSocketInfo.get(session.getId()).cleanErrorNum();
+            }
+        }
+    }
+
+    @Override
+    public void batchSendMessage(String message) {
+        Set<Map.Entry<String, WebSocketBean>> set = webSocketInfo.entrySet();
+        for (Map.Entry<String, WebSocketBean> map : set)
+        {
+            sendMessage(map.getValue().getSession(),message);
+        }
+    }
+}

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

@@ -193,4 +193,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</foreach>
 			GROUP BY d.`dept_id`
 	</select>
+	<select id="selectDeptByParentId" resultType="java.lang.Long">
+		SELECT dept_id FROM sys_dept WHERE parent_id IN
+		<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+			#{deptId}
+		</foreach>
+	</select>
 </mapper> 
\ No newline at end of file

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alarmEndTime != null "> and alarm_end_time = #{alarmEndTime}</if>
             <if test="alarmStatus != null  and alarmStatus != ''"> and alarm_status = #{alarmStatus}</if>
         </where>
+        ORDER BY create_time DESC
     </select>
     
     <select id="selectTDeviceAlarmInfoById" parameterType="Long" resultMap="TDeviceAlarmInfoResult">
@@ -136,4 +137,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         alarm_begin_time > (SELECT DATE_SUB(CURDATE(), INTERVAL '29 0:0:0' DAY_SECOND))
         GROUP BY beginTime
     </select>
+
+    <select id="sumAlarmByYear" resultType="java.lang.Integer">
+        SELECT
+            COUNT(alarm_id)
+        FROM
+            t_device_alarm_info alarm
+        WHERE year(create_time) = year(now())
+    </select>
+
+    <select id="sumAlarmByMonth" resultType="java.lang.Integer">
+        SELECT
+          COUNT(alarm_id)
+        FROM
+          t_device_alarm_info alarm
+        WHERE month(create_time) = month(now())
+    </select>
+
+    <select id="sumAlarmByDay" resultType="java.lang.Integer">
+        SELECT
+          COUNT(alarm_id)
+        FROM
+          t_device_alarm_info alarm
+        WHERE day(create_time) = day(now())
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -32,7 +32,7 @@
     <select id="selectTEnterpriseSystemList" parameterType="TEnterpriseSystem" resultMap="TEnterpriseSystemResult">
         <include refid="selectTEnterpriseSystemVo"/>
         <where>
-            <if test="systemTitle != null  and systemTitle != ''"> and system_title = #{systemTitle}</if>
+            <if test="systemTitle != null  and systemTitle != ''"> and system_title like concat('%', #{systemTitle}, '%')</if>
             <if test="systemType != null  and systemType != ''"> and system_type = #{systemType}</if>
             <if test="hierarchy != null  and hierarchy != ''"> and hierarchy = #{hierarchy}</if>
             <if test="referenceNum != null  and referenceNum != ''"> and reference_num = #{referenceNum}</if>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TEntranceGuardPersonInfoMapper">
+    
+    <resultMap type="TEntranceGuardPersonInfo" id="TEntranceGuardPersonInfoResult">
+        <result property="entranceGuardPersonId"    column="entrance_guard_person_id"    />
+        <result property="personName"    column="person_name"    />
+        <result property="personNum"    column="person_num"    />
+        <result property="actionType"    column="action_type"    />
+        <result property="actionTime"    column="action_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <resultMap id="statisticsPersonByActionTypeResult"   type="HashMap">
+        <result property="actionType" column="action_type" jdbcType="VARCHAR" />
+        <result property="counts" column="counts" jdbcType="DATE"/>
+    </resultMap>
+
+    <sql id="selectTEntranceGuardPersonInfoVo">
+        select entrance_guard_person_id, person_name, person_num, action_type, action_time, create_by, create_time, update_by, update_time, is_del, remark from t_entrance_guard_person_info
+    </sql>
+
+    <select id="selectTEntranceGuardPersonInfoList" parameterType="TEntranceGuardPersonInfo" resultMap="TEntranceGuardPersonInfoResult">
+        <include refid="selectTEntranceGuardPersonInfoVo"/>
+        <where>  
+            <if test="personName != null  and personName != ''"> and person_name like concat('%', #{personName}, '%')</if>
+            <if test="personNum != null  and personNum != ''"> and person_num = #{personNum}</if>
+            <if test="actionType != null  and actionType != ''"> and action_type = #{actionType}</if>
+            <if test="actionTime != null "> and action_time = #{actionTime}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectTEntranceGuardPersonInfoById" parameterType="Long" resultMap="TEntranceGuardPersonInfoResult">
+        <include refid="selectTEntranceGuardPersonInfoVo"/>
+        where entrance_guard_person_id = #{entranceGuardPersonId}
+    </select>
+        
+    <insert id="insertTEntranceGuardPersonInfo" parameterType="TEntranceGuardPersonInfo" useGeneratedKeys="true" keyProperty="entranceGuardPersonId">
+        insert into t_entrance_guard_person_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="personName != null">person_name,</if>
+            <if test="personNum != null">person_num,</if>
+            <if test="actionType != null">action_type,</if>
+            <if test="actionTime != null">action_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="personName != null">#{personName},</if>
+            <if test="personNum != null">#{personNum},</if>
+            <if test="actionType != null">#{actionType},</if>
+            <if test="actionTime != null">#{actionTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTEntranceGuardPersonInfo" parameterType="TEntranceGuardPersonInfo">
+        update t_entrance_guard_person_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="personName != null">person_name = #{personName},</if>
+            <if test="personNum != null">person_num = #{personNum},</if>
+            <if test="actionType != null">action_type = #{actionType},</if>
+            <if test="actionTime != null">action_time = #{actionTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where entrance_guard_person_id = #{entranceGuardPersonId}
+    </update>
+
+    <delete id="deleteTEntranceGuardPersonInfoById" parameterType="Long">
+        delete from t_entrance_guard_person_info where entrance_guard_person_id = #{entranceGuardPersonId}
+    </delete>
+
+    <delete id="deleteTEntranceGuardPersonInfoByIds" parameterType="String">
+        delete from t_entrance_guard_person_info where entrance_guard_person_id in 
+        <foreach item="entranceGuardPersonId" collection="array" open="(" separator="," close=")">
+            #{entranceGuardPersonId}
+        </foreach>
+    </delete>
+    
+    <select id="statisticsPersonByActionType" resultMap="statisticsPersonByActionTypeResult">
+        SELECT
+          action_type,
+          COUNT(*)AS counts
+        FROM
+            t_entrance_guard_person_info
+        GROUP BY
+            action_type
+    </select>
+    
+    <select id="statisticsStayInPersons" resultType="java.lang.String">
+        SELECT
+            COUNT(*)
+        FROM
+            (
+                (
+                    SELECT
+                      *
+                    FROM
+                     (
+                       SELECT
+                                action_time AS importTime,
+                                person_num
+                        FROM
+                                t_entrance_guard_person_info
+                        WHERE
+                                action_type = '0'
+                        ORDER BY action_time DESC
+                     )a
+                     GROUP BY a.person_num
+                )import,
+                (
+                   SELECT
+                     *
+                    FROM
+                    (
+                      SELECT
+                            action_time AS exportTime,
+                            person_num
+                      FROM
+                            t_entrance_guard_person_info
+                      WHERE
+                            action_type = '1'
+                      ORDER BY action_time DESC
+                     )b
+                    GROUP BY b.person_num
+                )export
+          )
+        WHERE import.person_num = export.person_num AND (export.exportTime - import.importTime) > 0
+    </select>
+
+    <select id="lastImportAndExportData"  resultMap="TEntranceGuardPersonInfoResult">
+        SELECT
+          present.*
+        FROM(
+            SELECT
+                *
+            FROM
+                t_entrance_guard_person_info
+            ORDER BY action_time DESC
+        )present
+        GROUP BY
+            present.action_type
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTRiskManagerList" parameterType="TRiskManager" resultMap="TRiskManagerResult">
         <include refid="selectTRiskManagerVo"/>
         <where>  
-            <if test="riskPart != null  and riskPart != ''"> and risk_part = #{riskPart}</if>
+            <if test="riskPart != null  and riskPart != ''"> and risk_part LIKE concat('%',#{riskPart},'%')</if>
             <if test="riskContent != null  and riskContent != ''"> and risk_content = #{riskContent}</if>
             <if test="riskLevel != null  and riskLevel != ''"> and risk_level = #{riskLevel}</if>
             <if test="riskType != null  and riskType != ''"> and risk_type = #{riskType}</if>

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

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_post p on t.post_id = p.post_id
         <where>  t.is_del = '0' and t.user_staff='1'
             <if test="staffName != null  and staffName != ''"> and t.staff_name like concat('%', #{staffName}, '%')</if>
-            <if test="staffCode != null  and staffCode != ''"> and t.staff_code = #{staffCode}</if>
+            <if test="staffCode != null  and staffCode != ''"> and t.staff_code like concat('%', #{staffCode}, '%')</if>
             <if test="sex != null  and sex != ''"> and t.sex = #{sex}</if>
             <if test="deptId != null "> and t.dept_id = #{deptId}</if>
             <if test="phonenumber != null and phonenumber != ''">

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

@@ -56,6 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN t_staff s3 ON b.`person_liable` = s3.`staff_id`
         LEFT JOIN sys_dept d ON d.`dept_id` = b.`dept_id`
         <where>
+            AND s1.dept_id in
+            <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
             <if test="troubleName != null  and troubleName != ''"> and b.trouble_name like concat('%', #{troubleName}, '%')</if>
             <if test="findTime != null "> and b.find_time &gt; #{findTime}</if>
             <if test="rectificationTime != null "> and b.find_time &lt; #{rectificationTime}</if>

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseId"    column="course_id"    />
         <result property="courseName"    column="course_name"    />
         <result property="courseType"    column="course_type"    />
+        <result property="planName"    column="plan_name"    />
         <result property="courseConent"    column="course_conent"    />
         <result property="status"    column="status"    />
         <result property="releaseTime"    column="release_time"    />
@@ -25,18 +26,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTTrainCourseList" parameterType="TTrainCourse" resultMap="TTrainCourseResult">
-        <include refid="selectTTrainCourseVo"/>
+        select c.*,p.plan_name from t_train_course c
+        LEFT JOIN t_train_plan p on p.plan_id = c.course_type
+
         <where>  
-            <if test="courseName != null  and courseName != ''"> and course_name like concat('%', #{courseName}, '%')</if>
-            <if test="courseType != null "> and course_type = #{courseType}</if>
-            <if test="courseConent != null  and courseConent != ''"> and course_conent = #{courseConent}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="enclosure != null  and enclosure != ''"> and enclosure = #{enclosure}</if>
-            <if test="video != null  and video != ''"> and video = #{video}</if>
-            <if test="qualifiedNum != null "> and qualified_num = #{qualifiedNum}</if>
-            <if test="topicNum != null "> and topic_num = #{topicNum}</if>
-            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
-            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="courseName != null  and courseName != ''"> and c.course_name like concat('%', #{courseName}, '%')</if>
+            <if test="courseType != null "> and c.course_type = #{courseType}</if>
+            <if test="courseConent != null  and courseConent != ''"> and c.course_conent = #{courseConent}</if>
+            <if test="status != null "> and c.status = #{status}</if>
+            <if test="enclosure != null  and enclosure != ''"> and c.enclosure = #{enclosure}</if>
+            <if test="video != null  and video != ''"> and c.video = #{video}</if>
+            <if test="qualifiedNum != null "> and c.qualified_num = #{qualifiedNum}</if>
+            <if test="topicNum != null "> and c.topic_num = #{topicNum}</if>
+            <if test="createUser != null  and createUser != ''"> and c.create_user = #{createUser}</if>
+            <if test="isDel != null "> and c.is_del = #{isDel}</if>
         </where>
     </select>
     

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

@@ -181,12 +181,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          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 (
+        <where>
+            (
             permit.link_man = #{currentLoginUser}
             OR sign.sign_id = #{currentLoginUser}
             )
-        <where>
-            <if test="applyDept != null  and applyDept != ''"> and apply_dept = #{applyDept}</if>
+            <if test="applyDept != null  and applyDept != ''">and apply_dept like concat('%', #{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>

danger-manage-web/src/api/entranceguard/entranceguardPerson.js

+import request from '@/utils/request'
+
+// 查询门禁人员信息列表
+export function listInfo(query) {
+  return request({
+    url: '/entranceGuardPerson/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//二道门数据初始化
+export function getEntranceGuardPersonInfo() {
+  return request({
+    url: '/entranceGuardPerson/info/getEntranceGuardPersonInfo',
+    method: 'get'
+  })
+}
+
+// 查询门禁人员信息详细
+export function getInfo(entranceGuardPersonId) {
+  return request({
+    url: '/entranceGuardPerson/info/' + entranceGuardPersonId,
+    method: 'get'
+  })
+}
+
+// 新增门禁人员信息
+export function addInfo(data) {
+  return request({
+    url: '/entranceGuardPerson/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改门禁人员信息
+export function updateInfo(data) {
+  return request({
+    url: '/entranceGuardPerson/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除门禁人员信息
+export function delInfo(entranceGuardPersonId) {
+  return request({
+    url: '/entranceGuardPerson/info/' + entranceGuardPersonId,
+    method: 'delete'
+  })
+}
+
+// 导出门禁人员信息
+export function exportInfo(query) {
+  return request({
+    url: '/entranceGuardPerson/info/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -15,6 +15,13 @@ export function getStatistics() {
     method: 'get',
   })
 }
+
+export function sumAlarmTotal() {
+  return request({
+    url: '/system/alarm/sumAlarmTotal',
+    method: 'get',
+  })
+}
 // 查询报警记录详细
 export function getAlarm(alarmId) {
   return request({

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

@@ -117,6 +117,16 @@
                  :workPermitId = "item.workPermitId"
                  :licenceNum = "item.licenceNum"
                  applyStatus="4"/>
+        <HeightWork v-if="item.specialWorkType == 'heightWork'"
+                    :ref="item.specialWorkType"
+                    :workPermitId = "item.workPermitId"
+                    :licenceNum = "item.licenceNum"
+                    applyStatus="4"/>
+        <BreakGround v-if="item.specialWorkType == 'breakGround'"
+                     :ref="item.specialWorkType"
+                     :workPermitId = "item.workPermitId"
+                     :licenceNum = "item.licenceNum"
+                     applyStatus="4"/>
       </div>
 
     </div>
@@ -129,13 +139,17 @@
   import NewEsign from "@/components/SaftyWork/NewEsign";
   import FlareUp from "@/components/NewSaftyWork/FlareUp";
   import BlindPlate from "@/components/NewSaftyWork/BlindPlate";
+  import HeightWork from "@/components/NewSaftyWork/HeightWork";
+  import BreakGround from "@/components/NewSaftyWork/BreakGround";
   import { getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
   import { listSign } from "@/api/workPermit/workPermitSign";
     export default {
       components: {
         NewEsign,
         FlareUp,
-        BlindPlate
+        BlindPlate,
+        HeightWork,
+        BreakGround
       },
       name: "new-work-permit-detail",
       props:{

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

 <template>
   <div>
-    <table>
+    <table id="blindPlatePrint">
       <tr>
         <td colspan="2">申请单位</td>
         <td colspan="2"><input :disabled="(applyStatus-0) > 0" v-model="blindPlate.applyUnit" class="editInput"/></td>
@@ -253,7 +253,7 @@
           <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-select v-model="leaderDeptId" filterable placeholder="请选择作业负责人部门" @change="switchDept(leaderDeptId,1)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -266,7 +266,7 @@
         <el-col :span="12">
           <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in leaderUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -281,7 +281,7 @@
           <div style="font-size: 18px;margin-top: 5px">作业单位：</div>
         </el-col>
         <el-col :span="8">
-          <el-select v-model="workDeptId" filterable placeholder="请选择作业单位" @change="switchDept(workDeptId)">
+          <el-select v-model="workDeptId" filterable placeholder="请选择作业单位" @change="switchDept(workDeptId,2)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -294,7 +294,7 @@
         <el-col :span="12">
           <el-select v-model="workAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in workUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -309,7 +309,7 @@
           <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-select v-model="auditDeptDeptId" filterable placeholder="请选择审核部门" @change="switchDept(auditDeptDeptId,3)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -322,7 +322,7 @@
         <el-col :span="12">
           <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in auditUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -337,7 +337,7 @@
           <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-select v-model="approvalDeptId" filterable placeholder="请选择审批部门" @change="switchDept(approvalDeptId,4)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -350,7 +350,7 @@
         <el-col :span="12">
           <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in approvalUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -365,7 +365,7 @@
           <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-select v-model="completeDeptId" filterable placeholder="请选择验收部门" @change="switchDept(completeDeptId,5)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -378,7 +378,7 @@
         <el-col :span="12">
           <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in completeUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -395,7 +395,7 @@
       <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>
+    <div style="margin-top:10px;float: right" v-if="(applyStatus-0) > '1'"><el-button type="primary" v-print="'#blindPlatePrint'">打印</el-button></div>
 
   </div>
 
@@ -495,7 +495,11 @@
             recipient: "",//接收人
           },
           deptList:[],
-          userList:[],
+          leaderUserList:[],
+          workUserList:[],
+          auditUserList:[],
+          approvalUserList:[],
+          completeUserList:[],
           leaderDeptId:"",
           workDeptId:"",
           auditDeptDeptId:"",
@@ -524,9 +528,23 @@
         });
         },
         //部门切换
-        switchDept(deptId){
+        switchDept(deptId,type){
           listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
-            this.userList = response.rows;
+            if(type == 1){
+              this.leaderUserList = response.rows;
+            }
+            if(type == 2){
+              this.workUserList = response.rows;
+            }
+            if(type == 3){
+              this.auditUserList = response.rows;
+            }
+            if(type == 4){
+              this.approvalUserList = response.rows;
+            }
+            if(type == 5){
+              this.completeUserList = response.rows;
+            }
         });
         },
         //新增特殊作业单
@@ -644,7 +662,6 @@
         signName(imageSrc){
           this.sign = imageSrc;
           this.signOpen = true;
-
         },
       }
     }

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

@@ -181,7 +181,7 @@
       </tr>
       <tr>
         <td colspan="4">动火作业实施时间</td>
-        <td colspan="16" v-if="(applyStatus-0) ==1">
+        <td colspan="16" v-if="(applyStatus-0) == 0">
         <el-row>
           <el-col :span="11">
             <el-date-picker clearable size="small"
@@ -206,8 +206,8 @@
           </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 colspan="16" v-if="(applyStatus-0) > 0">
+          自{{ (flareUp.executeStartTime == null || flareUp.executeStartTime =='') ? "-" :flareUp.executeStartTime.split(" ")[0].split("-")[0]}}年{{ (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("-")[0]}}年{{(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>
@@ -359,7 +359,7 @@
           <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-select v-model="leaderDeptId" filterable placeholder="请选择作业负责人部门" @change="switchDept(leaderDeptId,1)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -372,7 +372,7 @@
         <el-col :span="12">
           <el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in leaderUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -387,7 +387,7 @@
           <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-select v-model="beyondUnitDeptId" filterable placeholder="请选择所在单位" @change="switchDept(beyondUnitDeptId,2)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -400,7 +400,7 @@
         <el-col :span="12">
           <el-select v-model="beyondUnitAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in beyondUnitUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -415,7 +415,7 @@
           <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-select v-model="auditDeptDeptId" filterable placeholder="请选择审核部门" @change="switchDept(auditDeptDeptId,3)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -428,7 +428,7 @@
         <el-col :span="12">
           <el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in auditDeptUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -443,7 +443,7 @@
           <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-select v-model="approvalDeptId" filterable placeholder="请选择动火审批人" @change="switchDept(approvalDeptId,4)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -456,7 +456,7 @@
         <el-col :span="12">
           <el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in approvalUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -471,7 +471,7 @@
           <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-select v-model="fireBeforeDeptId" filterable placeholder="请选择岗位当班班长部门" @change="switchDept(fireBeforeDeptId,5)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -484,7 +484,7 @@
         <el-col :span="12">
           <el-select v-model="fireBeforeAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in fireBeforeUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -499,7 +499,7 @@
           <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-select v-model="completeDeptId" filterable placeholder="请选择验收部门" @change="switchDept(completeDeptId,6)">
             <el-option
               v-for="item in deptList"
               :key="item.deptId"
@@ -512,7 +512,7 @@
         <el-col :span="12">
           <el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
             <el-option
-              v-for="item in userList"
+              v-for="item in completeUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -694,7 +694,12 @@
           guardian:""
         },
         deptList:[],
-        userList:[],
+        leaderUserList:[],
+        beyondUnitUserList:[],
+        auditDeptUserList:[],
+        approvalUserList:[],
+        fireBeforeUserList:[],
+        completeUserList:[],
         leaderDeptId:"",
         beyondUnitDeptId:"",
         auditDeptDeptId:"",
@@ -725,9 +730,26 @@
         });
       },
       //部门切换
-      switchDept(deptId){
+      switchDept(deptId,type){
         listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
-          this.userList = response.rows;
+          if(type == 1){
+            this.leaderUserList = response.rows;
+          }
+          if(type == 2){
+            this.beyondUnitUserList = response.rows;
+          }
+          if(type == 3){
+            this.auditDeptUserList = response.rows;
+          }
+          if(type == 4){
+            this.approvalUserList = response.rows;
+          }
+          if(type == 5){
+            this.fireBeforeUserList = response.rows;
+          }
+          if(type == 6){
+            this.completeUserList = response.rows;
+          }
         });
       },
       //新增特殊作业单

danger-manage-web/src/components/Video/PlayVideo.vue

+<template>
+  <div :class="isChoice?'showVideo':'closeVideo'">
+    <div class="videoTitle">
+      <span style="margin-left: 15px;color: #334d6e">
+         <img src="@/assets/images/camera.png" alt="fold" style="width: 18px;height: 18px">
+        {{ videoName }}
+      </span>
+      <el-button v-if="videoName !=''" type="text" size="medium" style="margin-left: 8px;" @click="closeVideo">关闭</el-button>
+      <el-dropdown @command="videoSetting" trigger="click" style="float: right;margin-right: 15px">
+              <span class="el-dropdown-link">
+                <img src="@/assets/images/setting.png" alt="fold" style="width: 18px;height: 18px">
+              </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="1">全屏 </el-dropdown-item>
+          <el-dropdown-item command="2">抓图(.JPEG) </el-dropdown-item>
+          <el-dropdown-item command="3">抓图(.BMP) </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+    <div :id="playId" class="videoContent"></div>
+    <div class="mask" @dblclick="fullScreen"></div>
+  </div>
+</template>
+
+<script>
+import { getPreviewURLs } from "@/api/video/video";
+const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
+export default {
+  name: "play-video",
+  props:{
+    playId:{
+      type: String
+    },
+    isChoice:{
+      type: Boolean,
+      default: false
+    }
+  },
+  data(){
+    return{
+      showVideoNum: 1,
+      player: null,
+      cameraIndexCode: "",
+      videoName: ""
+    }
+  },
+  created(){
+   // console.log(this.playId,"gagaga")
+  },
+  mounted() {
+    if(!window.JSPlugin){
+      this.loadScript("/h5player/h5player.min.js").then(() =>{
+        this.createPlayer();
+      this.init()
+    })
+    }else{
+      this.createPlayer();
+      this.init()
+    }
+  },
+  methods:{
+    init() {
+      // 设置播放容器的宽高并监听窗口大小变化
+      window.addEventListener('resize', () => {
+        this.player.JS_Resize()
+      })
+    },
+    createPlayer() {
+      this.player = new window.JSPlugin({
+        szId: this.playId,
+        szBasePath: "/h5player",
+        iMaxSplit: 1,
+        iCurrentSplit: IS_MOVE_DEVICE ? 1 : 2,
+        openDebug: true,
+        oStyle: {
+          borderSelect: IS_MOVE_DEVICE ? '#000' : '#FFCC00',
+        }
+      });
+    },
+    loadScript(src){
+      return new Promise(reslove =>{
+        let scpritE1 = document.createElement("script");
+      scpritE1.type = "text/javascript";
+      scpritE1.src = src;
+      scpritE1.onload = () => {
+        reslove();
+      }
+      document.body.appendChild(scpritE1);
+    })
+    },
+    playVideo(data){
+      this.videoName = data.label;
+     /* if(this.cameraIndexCode == data.deviceNum){
+        return;
+      }*/
+      this.cameraIndexCode = data.deviceNum;
+      if(data.deviceNum){
+        getPreviewURLs({cameraIndexCode: data.deviceNum}).then(response =>{
+          if(response.data.code == '0'){
+            this.videoOpenNum++;
+            let url = response.data.data.url;
+            this.player.JS_Play(url,{playURL: url, mode: 0 }, 0).then(() => {
+                console.log('realplay success')
+            },
+              e => { console.error(e) }
+            )
+          }
+        });
+      }
+    },
+    videoSetting(val){
+      if(val== '1'){
+        this.fullScreen();
+      }
+      if(val == '2'){
+        this.capture("'JPEG'")
+      }
+      if(val == '3'){
+        this.capture("'BMP'")
+      }
+    },
+    //分屏设置自适应
+    fit(){
+      this.player.JS_Resize();
+    },
+    //全屏
+    fullScreen(){
+      this.player.JS_FullScreenDisplay(true).then(
+        () => { console.log(`wholeFullScreen success`) },
+        e => { console.error(e) }
+      )
+    },
+    //抓图
+    capture(imageType) {
+      this.player.JS_CapturePicture(0, 'img', imageType).then(
+          () => { console.log('capture success', imageType) },
+        e => { console.error(e) }
+      )
+    },
+    //关闭视频
+    closeVideo(){
+      this.player.JS_Stop().then(() => {
+            this.videoName = "";
+            console.log('stop realplay success')
+       },
+        e => { console.error(e) }
+      )
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .showVideo{
+    border: 2px solid #334d6e;
+    height: 100%;
+    position: relative;
+    border-radius: 5px;
+    box-shadow: 6px 0px 18px 1px rgba(0, 0, 0, 0.06);
+  }
+
+  .closeVideo{
+    //border: 1px solid blue;
+    height: 100%;
+    position: relative;
+    border-radius: 5px;
+    box-shadow: 6px 0px 6px 6px rgba(0, 0, 0, 0.06);
+  }
+
+  .videoTitle{
+    //border: 1px solid darkgreen;
+    height: 40px;
+    line-height: 36px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    background: #F5F7FA;
+  }
+
+  .el-dropdown-link {
+    cursor: pointer;
+    font-size: 20px;
+    color: blue;
+  }
+
+  .videoContent{
+    height: 100%;
+    padding: 40px 0px 0px 0px
+  }
+
+  .mask{
+    position: absolute;
+    top: 40px;
+    bottom: 0;
+    width: 100%;
+  }
+
+  .el-button--text{
+    color: #334d6e;
+  }
+
+</style>

danger-manage-web/src/components/Video/SplitVideoView.vue

+<template>
+    <div class="video">
+      <div style="height: 5%;padding: 6px;">
+        <el-dropdown @command="handleCommand" trigger="click">
+          <span class="el-dropdown-link">
+            <img src="@/assets/images/spilt.png" alt="spilt" style="width: 18px;height: 18px">
+            分屏设置
+          </span>
+          <el-dropdown-menu slot="dropdown" style="width:100px">
+            <el-dropdown-item command="1">1x1 </el-dropdown-item>
+            <el-dropdown-item command="4">2x2</el-dropdown-item>
+            <el-dropdown-item command="9">3x3</el-dropdown-item>
+            <el-dropdown-item command="16">4x4</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+
+      <div style="height: 95%;width: 100%;" ref="playVideo">
+        <div v-for="num in spiltNum" class="videoShow" :style="{'width': countWidth,'height':countHeight}" @click="changeVideo('play'+num,num)">
+          <PlayVideo
+            :playId="'play'+num"
+            :isChoice="showVideoNum == num"
+            :ref="'play'+num"
+            :key="Math.random()"
+          >
+          </PlayVideo>
+
+        </div>
+      </div>
+
+    </div>
+</template>
+
+<script>
+  import PlayVideo from "@/components/Video/PlayVideo"
+    export default {
+      name: "split-videoview",
+      components:{
+        PlayVideo
+      },
+      data(){
+        return{
+          spiltNum: 0,
+          showVideoNum: 1,
+          playId: "play1",
+        }
+      },
+      mounted(){
+        this.spiltNum = 4;
+      },
+      computed:{
+        countWidth(){
+          return (this.$refs.playVideo.offsetWidth-2)/Math.sqrt(this.spiltNum) + 'px';
+        },
+        countHeight(){
+          return (this.$refs.playVideo.offsetHeight-2)/Math.sqrt(this.spiltNum) + 'px';
+        }
+      },
+      methods:{
+        changeVideo(playId,num){
+          this.playId = playId;
+          this.showVideoNum = num;
+        },
+        handleCommand(val){
+          this.spiltNum = eval(val);
+          this.playId = "play1";
+          this.showVideoNum = 1;
+        },
+        playVideo(video){
+          this.$refs[this.playId][0].playVideo(video);
+        }
+      }
+    }
+</script>
+
+<style scoped lang="scss">
+  .videoShow{
+    float: left;
+    padding: 6px;
+  }
+  .video{
+    height: 100%;
+    width: 100%;
+    margin-left: 6px;
+    float: left;
+    background: #fff;
+  }
+
+</style>

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

@@ -94,7 +94,7 @@ export default {
       this.open();
     },
     open() {
-      this.queryParam.cameraIndexCode = "c3949900706942479d414998b4c2ee40";
+      this.queryParam.cameraIndexCode = this.deviceData.sbbh;
       getPreviewURLs(this.queryParam).then((response) => {
         if (response.data.code == "0") {
           this.videoOpenNum++;

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

@@ -51,8 +51,22 @@
 
     <el-table v-loading="loading" :data="contractorInfoList">
       <el-table-column label="单位名称" align="center" prop="contractorName" />
-      <el-table-column label="主要负责人" align="center" prop="keyPerson" />
-      <el-table-column label="主要负责人手机" align="center" prop="keyPersonPhone" />
+      <el-table-column label="主要负责人" align="center" prop="keyPerson" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.keyPerson != null && scope.row.keyPerson != ''">{{scope.row.keyPerson}}</span>
+          <span v-else>
+            -
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="主要负责人手机" align="center" prop="keyPersonPhone" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.keyPersonPhone != null && scope.row.keyPersonPhone != ''">{{scope.row.keyPersonPhone}}</span>
+          <span v-else>
+            -
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位资质" align="center" prop="certificateUrl" style="text-align:center;">
         <template slot-scope="scope">
           <span v-if="scope.row.certificateUrl != null && scope.row.certificateUrl != ''">

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

@@ -67,8 +67,13 @@
       <el-table-column label="设备编号" align="center" prop="deviceCode" />
       <el-table-column label="现场照片" align="center" prop="fileUrl" >
         <template slot-scope="scope">
+          <span v-if="scope.row.fileUrl != null && scope.row.fileUrl != ''">
             <img :src="scope.row.fileUrl" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(scope.row)"/>
             <el-image :ref="'a'+scope.row.id" :src="scope.row.fileUrl" v-show="false" :preview-src-list="[scope.row.fileUrl]" v-if="scope.row.fileUrl != '' && scope.row.fileUrl != null"></el-image>
+          </span>
+          <span v-else>
+            -
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="故障描述" align="center" prop="troubleDescribe" />

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

@@ -70,12 +70,17 @@
 
     <el-table v-loading="loading" :data="lessonsList">
       <el-table-column label="课程标题" align="center" prop="courseName" />
-      <el-table-column
-        label="课程类别"
-        align="center"
-        prop="courseType"
-        :formatter="formatter"
-      />
+      <el-table-column label="课程类别" align="center" prop="courseType">
+        <template v-slot="scope">
+          <div>
+            {{
+              courseOptions.filter(
+                (item) => item.planId == scope.row.courseType
+              )[0].planName
+            }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="课程状态" align="center" prop="status">
         <template v-slot="scope">
           <div>{{ ["未发布", "已发布"][scope.row.status] }}</div>
@@ -83,12 +88,13 @@
       </el-table-column>
       <el-table-column label="附件" align="center" prop="enclosure">
         <template v-slot="{ row: { enclosure } }">
-          <a :href="enclosure" class="down-load">下载附件</a>
+          <a v-if="enclosure.indexOf('.txt')>=0" @click="downloadText(enclosure)" class="down-load">下载附件</a>
+          <a v-else :href="enclosure" class="down-load">下载附件</a>
         </template>
       </el-table-column>
       <el-table-column label="视频" align="center" prop="video">
         <template v-slot="{ row: { courseName, video } }">
-          <a @click="downLoad(video, courseName)" class="down-load"
+          <a @click="downLoadVideo(video, courseName)" class="down-load"
             >下载视频</a
           >
         </template>
@@ -348,7 +354,45 @@ export default {
       if (!cellValue) return "-";
       else return cellValue;
     },
-    downLoad(url, name) {
+    downloadText(url) {
+      // url = url.replace(/\\/g, "/");
+      const xhr = new XMLHttpRequest();
+      xhr.open("GET", url, true);
+      xhr.responseType = "blob";
+      //xhr.setRequestHeader('Authorization', 'Basic a2VybWl0Omtlcm1pdA==');
+      xhr.onload = function () {
+        if (xhr.readyState === 4 && xhr.status === 200) {
+          let blob = this.response;
+          console.log(blob);
+          // 转换一个blob链接
+          // 注: URL.createObjectURL() 静态方法会创建一个 DOMString(DOMString 是一个UTF-16字符串)，
+          // 其中包含一个表示参数中给出的对象的URL。这个URL的生命周期和创建它的窗口中的document绑定
+          let downLoadUrl = window.URL.createObjectURL(
+            new Blob([blob], {
+              type: "txt",
+            })
+          );
+          // 视频的type是video/mp4，图片是image/jpeg
+          // 01.创建a标签
+          let a = document.createElement("a");
+          // 02.给a标签的属性download设定名称
+          a.download = name;
+          // 03.设置下载的文件名
+          a.href = downLoadUrl;
+          // 04.对a标签做一个隐藏处理
+          a.style.display = "none";
+          // 05.向文档中添加a标签
+          document.body.appendChild(a);
+          // 06.启动点击事件
+          a.click();
+          // 07.下载完毕删除此标签
+          a.remove();
+        }
+      };
+
+      xhr.send();
+    },
+    downLoadVideo(url, name) {
       var xhr = new XMLHttpRequest();
       xhr.open("GET", url, true);
       xhr.responseType = "arraybuffer"; // 返回类型blob

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

@@ -13,7 +13,7 @@
                                 </div>
                                 <div class="ru-in-r">
                                     <span>入场</span>
-                                    <div style="color: #0fb980;">0</div>
+                                    <div style="color: #0fb980;">{{importCount?importCount:0}}</div>
                                 </div>
                             </div>
                             <div class="ent-ru-in">
@@ -22,7 +22,7 @@
                                 </div>
                                 <div class="ru-in-r">
                                     <span>出场</span>
-                                    <div style="color: #f95f5f;">0</div>
+                                    <div style="color: #f95f5f;">{{exportCount?exportCount:0}}</div>
                                 </div>
                             </div>
                             <div class="ent-ru-in">
@@ -31,7 +31,7 @@
                                 </div>
                                 <div class="ru-in-r">
                                     <span>在场</span>
-                                    <div style="color: #3a65ed">0</div>
+                                    <div style="color: #3a65ed">{{stayInCount?stayInCount:0}}</div>
                                 </div>
                             </div>
                         </div>
@@ -103,9 +103,9 @@
                                 <img src="../../assets/img/biguser.png" alt="">
                             </div>
                             <div class="a-in2">
-                                <div>人员姓名：<span></span> </div>
-                                <div>员工ID：<span></span> </div>
-                                <div>入场时间：<span></span> </div>
+                                <div>人员姓名：<span>{{lastImportData?lastImportData.personName:"-"}}</span> </div>
+                                <div>员工ID：<span>{{lastImportData?lastImportData.personNum:"-"}}</span> </div>
+                                <div>入场时间：<span>{{lastImportData?lastImportData.actionTime:"-"}}</span> </div>
                             </div>
                         </div>
                     </div>
@@ -120,9 +120,9 @@
                                 <img src="../../assets/img/biguser.png" alt="">
                             </div>
                             <div class="a-in2">
-                                <div>人员姓名：<span></span> </div>
-                                <div>员工ID：<span></span> </div>
-                                <div>出场时间：<span></span> </div>
+                                <div>人员姓名：<span>{{lastExportData?lastExportData.personName:"-"}}</span> </div>
+                                <div>员工ID：<span>{{lastExportData?lastExportData.personNum:"-"}}</span> </div>
+                                <div>出场时间：<span>{{lastExportData?lastExportData.actionTime:"-"}}</span> </div>
                             </div>
                         </div>
                     </div>
@@ -189,6 +189,7 @@
   </template>
 
   <script>
+    import { getEntranceGuardPersonInfo } from "@/api/entranceguard/entranceguardPerson"
   export default {
     name: "",
     data() {
@@ -210,7 +211,36 @@
             // { date: '冀A66666',name: '小轿车',address: '2022-10-15 12:00:00'},
             // { date: '冀A66666',name: '小轿车',address: '2022-10-15 12:00:00'},
             // { date: '冀A66666',name: '小轿车',address: '2022-10-15 12:00:00'},
-        ]
+        ],
+          //入场人数
+          exportCount:"",
+          //出场人数
+          importCount:"",
+          //在场人数
+          stayInCount:"",
+          //最新入场信息
+          lastImportData:{},
+          //最新出场信息
+          lastExportData:{}
+        }
+      },
+    created(){
+      this.initPersonData();
+    },
+    methods:{
+      initPersonData(){
+        getEntranceGuardPersonInfo().then(res =>{
+          //入场人数
+          this.importCount = res.data.importCount;
+          //出场人数
+          this.exportCount = res.data.exportCount;
+          //在场人数
+          this.stayInCount = res.data.stayInCount;
+          //最新入场信息
+          this.lastImportData = res.data.lastImportData;
+          //最新出场信息
+          this.lastExportData = res.data.lastExportData;
+        })
       }
     }
   };

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-20 10:25:41
+ * @LastEditTime: 2022-11-22 14:16:37
  * @FilePath: /danger-manage-web/src/views/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -434,13 +434,16 @@ export default {
           .map((item) => {
             let obj;
             // 视频
+
             if (item.mapDeviceType == 5) {
+            console.log(item,"item");
               obj = {
                 latitude: item.latitude,
                 longitude: item.longitude,
                 deviceId: item.mapDeviceId,
                 shortNum: 10,
                 deviceType: item.mapDeviceType,
+                sbbh: item.mapDeviceNum,
                 title: item.mapDeviceName,
                 config: { scale: 1, textHeight: -32 },
               };
@@ -457,7 +460,7 @@ export default {
                 // 探测介质
                 tcjz: item.mapDeviceMedium,
                 sbzt: item.monitorDeviceStatus,
-                jcz: item.monitorValue + "" + item.mapDeviceUnit,
+                jcz:item.monitorValue?item.monitorValue + "" + item.mapDeviceUnit:'-',
                 shortNum: 12,
                 config: { scale: 1, textHeight: -94 },
               };

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

@@ -302,6 +302,16 @@
                    :workPermitId = "item.workPermitId"
                    :licenceNum = "item.licenceNum"
                    applyStatus = "0"/>
+          <HeightWork v-if="item.mark == 'heightWork'"
+                   :ref="item.mark"
+                   :workPermitId = "item.workPermitId"
+                   :licenceNum = "item.licenceNum"
+                   applyStatus = "0"/>
+          <BreakGround v-if="item.mark == 'breakGround'"
+                   :ref="item.mark"
+                   :workPermitId = "item.workPermitId"
+                   :licenceNum = "item.licenceNum"
+                   applyStatus = "0"/>
 
         </div>
       </div>
@@ -330,6 +340,17 @@
                       :workPermitId = "item.workPermitId"
                       :licenceNum = "item.licenceNum"
                       applyStatus="1"/>
+
+          <HeightWork v-if="item.specialWorkType == 'heightWork'"
+                   :ref="item.specialWorkType"
+                   :workPermitId = "item.workPermitId"
+                   :licenceNum = "item.licenceNum"
+                   applyStatus="1"/>
+          <BreakGround v-if="item.specialWorkType == 'breakGround'"
+                      :ref="item.specialWorkType"
+                      :workPermitId = "item.workPermitId"
+                      :licenceNum = "item.licenceNum"
+                      applyStatus="1"/>
         </div>
       </div>
     </el-dialog>
@@ -459,6 +480,8 @@
   import { listAll } from "@/api/contractor/contractorInfo";
   import FlareUp from "@/components/NewSaftyWork/FlareUp";
   import BlindPlate from "@/components/NewSaftyWork/BlindPlate";
+  import HeightWork from "@/components/NewSaftyWork/HeightWork";
+  import BreakGround from "@/components/NewSaftyWork/BreakGround";
   import { listSign } from "@/api/workPermit/workPermitSign";
   import { listDept } from "@/api/system/dept";
   import NewEsign from "@/components/SaftyWork/NewEsign";
@@ -469,6 +492,8 @@
     components:{
       FlareUp,
       BlindPlate,
+      HeightWork,
+      BreakGround,
       NewEsign,
       Editor,
       NewWorkPermitDetail

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

@@ -107,7 +107,7 @@
 
     <!-- 添加或修改投入台账对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="23">
             <el-form-item label="投入台账名称" prop="investmentName">
@@ -254,7 +254,10 @@ export default {
           { required: true, message: "请选择投入年度", trigger: "blur" }
         ],
         investmentFunds: [
-          { required: true, message: "请输入投入资金", trigger: "blur" }
+          { required: true, message: "投入资金数字总共不超过11位，小数点不超过2位", validator: this.investmentFundsValidate }
+        ],
+        income: [
+          { required: true, message: "同期收入数字总共不超过11位，小数点不超过2位", validator: this.incomeValidate }
         ],
         investmentType: [
           { required: true, message: "请选择投入类型", trigger: "blur" }
@@ -278,6 +281,38 @@ export default {
     });
   },
   methods: {
+    investmentFundsValidate(rule, value, callback){
+      let reg = /^([1-9]\d*\.?\d{0,2}|0\.\d{1,2}|0)$/;
+      if(value != '' && value != null){
+        if(value.replace(".","").length > 11){
+          console.log(value,"value");
+          callback(new Error('数字不能超过11位'));
+        }
+        if(reg.test(value)){
+          callback();
+        }else{
+          callback(new Error('请输入正确投入资金(小数点不超过2位)'));
+        }
+      }else{
+        callback(new Error('请输入投入资金(小数点不超过2位)'));
+      }
+    },
+    incomeValidate(rule, value, callback){
+      let reg = /^([1-9]\d*\.?\d{0,2}|0\.\d{1,2}|0)$/;
+      if(value != '' && value != null){
+        if(value.replace(".","").length > 11){
+          console.log(value,"value");
+          callback(new Error('数字不能超过11位'));
+        }
+        if(reg.test(value)){
+          callback();
+        }else{
+          callback(new Error('请输入正确同期收入(小数点不超过2位)'));
+        }
+      }else{
+        callback();
+      }
+    },
     // 投入类型
     investmentFormat(row, column) {
       return this.selectDictLabel(this.investmentOptions, row.investmentType);

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

@@ -394,6 +394,9 @@ export default {
     },
     MapdialogFun() {
       this.dialogTableVisible = true;
+      if(this.form.longitude!=null && this.form.longitude!=''){
+        this.devicePos = [this.form.longitude, this.form.latitude];
+      }
     },
     dialogcancelFun() {
       this.dialogTableVisible = false;
@@ -407,6 +410,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.devicePos = [];
       this.reset();
       this.open = true;
       this.title = "添加应急物资管理";

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

@@ -90,9 +90,9 @@
     </el-row>
 
     <el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
+      <el-table-column  width="180" label="巡检区域" align="center" prop="dictLabel" />
       <el-table-column  width="250" label="巡检地点" align="center" prop="patrolAddress" />
-      <el-table-column  width="200" label="巡检区域" align="center" prop="dictLabel" />
-      <el-table-column width="600"  label="巡检内容" align="center" prop="patrolComent" >
+      <el-table-column width="500"  label="巡检内容" align="center" prop="patrolComent" >
         <span slot-scope="scope" v-if="scope.row.patrolComent">{{scope.row.patrolComent}}</span>
         <span v-else>-</span>
       </el-table-column>
@@ -106,7 +106,7 @@
         <span slot-scope="scope" v-else-if="scope.row.isNormal==1">正常</span>
       </el-table-column>
       <el-table-column label="上报时间" align="center" prop="createTime" width="170" />
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -139,20 +139,23 @@
 <!--    </el-dialog>-->
 
     <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
-      <el-descriptions :model="form"    :column="2" border>
+      <el-descriptions :model="form" :column="4" border>
         <el-descriptions-item label="巡检区域">{{form.dictLabel}}</el-descriptions-item>
         <el-descriptions-item :span="2" label="巡检地点" >{{form.patrolAddress}}</el-descriptions-item>
-        <el-descriptions-item :span="2" label="巡检内容">{{form.patrolComent}}</el-descriptions-item>
         <el-descriptions-item label="巡检频次" >{{form.patrolFrequency}}</el-descriptions-item>
+        <el-descriptions-item :span="4" label="巡检内容">{{form.patrolComent}}</el-descriptions-item>
+
         <el-descriptions-item  label="巡检结果" >
           <el-tag v-if="form.isNormal==0" size="danger">异常</el-tag>
           <el-tag v-else-if="form.isNormal==1"  size="small">正常</el-tag>
         </el-descriptions-item>
-        <el-descriptions-item   label="图片" >
-          <el-image  size="small" :preview-src-list="srcList" :src="form.picture"  ></el-image>
-        </el-descriptions-item>
-        <el-descriptions-item :span="4" label="上报人">{{form.nickName}}</el-descriptions-item>
         <el-descriptions-item :span="2" label="上报时间">{{form.createTime}}</el-descriptions-item>
+        <el-descriptions-item label="上报人">{{form.nickName}}</el-descriptions-item>
+
+        <el-descriptions-item  :span="4" label="图片" >
+          <el-image style="padding-left:10px" size="small" :preview-src-list="srcList" :src="form.picture" ></el-image>
+        </el-descriptions-item>
+
         <el-descriptions-item  label="备注">{{form.remarks}}</el-descriptions-item>
       </el-descriptions>
             <div slot="footer" class="dialog-footer">

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

@@ -161,7 +161,7 @@
         <el-form-item label="任务描述" prop="workDescribe">
           <el-input type="textarea" v-model="form.workDescribe" placeholder="请输入任务描述" />
         </el-form-item>
-        <el-form-item label="巡检点多个" prop="pantrolId">
+        <el-form-item label="巡检点多个" prop="pantrolId" >
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
           <!--<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')" >父子联动</el-checkbox>-->
@@ -867,5 +867,9 @@ export default {
   ::v-deep .el-dialog{
     background: #f7f7f7;
   }
+  ::v-deep .el-tree{
+    height: 250px;
+    overflow:auto;
+  }
   /*el-pagination*/
 </style>