From 977a98876643947aca10fc5c0aa30f723ba6e48e Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 28 四月 2023 13:36:37 +0800
Subject: [PATCH] 添加包保责任制页面
---
src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java | 13 +
/dev/null | 132 ----------------------
src/main/resources/templates/tr/riskAndPeopleInfo/riskAndPeopleInfo.html | 148 ++++++++++++------------
src/main/java/com/ruoyi/project/system/user/controller/IndexController.java | 38 ++++++
src/main/resources/templates/tr/riskAndPeopleInfo/detailRiskAndPeopleInfo.html | 2
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java | 7
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 3
7 files changed, 125 insertions(+), 218 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
index c671d3b..dbe8f12 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
@@ -132,19 +132,18 @@
completeRatioOfMain = completeCheckJobLogListOfMain.size() / allCheckJobLogListOfMain.size();
}
respDTO.setRiskAndPeopleInfoDTO(riskAndPeopleList);
- //所有责任人
respDTO.setCount(allCheckJobLogList.size());
respDTO.setComplete(completeCheckJobLogList.size());
respDTO.setCompleteRatio(BigDecimal.valueOf(completeRatio));
- //操作责任人
+
respDTO.setCountOfHandle(allCheckJobLogListOfHandle.size());
respDTO.setCompleteOfHandle(completeCheckJobLogListOfHandle.size());
respDTO.setCompleteRatioOfHandle(BigDecimal.valueOf(completeRatioOfHandle));
- //技术责任人
+
respDTO.setCountOfTechnology(allCheckJobLogListOfTechnology.size());
respDTO.setCompleteOfTechnology(completeCheckJobLogListOfTechnology.size());
respDTO.setCompleteRatioOfTechnology(BigDecimal.valueOf(completeRatioOfTechnology));
- //主要责任人
+
respDTO.setCountOfMain(allCheckJobLogListOfMain.size());
respDTO.setCompleteOfMain(completeCheckJobLogListOfMain.size());
respDTO.setCompleteRatioOfMain(BigDecimal.valueOf(completeRatioOfMain));
diff --git a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java
index 95342ec..dea9ce7 100644
--- a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java
+++ b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java
@@ -8,6 +8,11 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.controller.RiskAndPeopleInfoController;
+import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
+import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
+import com.ruoyi.doublePrevention.service.baseService.RiskAndPeopleInfoService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.system.company.domain.Company;
import com.ruoyi.project.system.company.service.ICompanyService;
import com.ruoyi.project.system.role.domain.Role;
@@ -50,6 +55,9 @@
private IRoleService roleService;
@Autowired
private ReportMapper reportMapper;
+
+ @Autowired
+ private RiskAndPeopleInfoService riskAndPeopleInfoService;
// 系统首页
@GetMapping("/index")
public String index(ModelMap mmap)
@@ -288,8 +296,34 @@
@GetMapping("/system/riskAndPeopleInfo")
public String riskAndPeopleInfo(ModelMap mmap){
- mmap.put("version", ruoYiConfig.getVersion());
- return "riskAndPeopleInfo";
+ RiskAndPeopleInfoReqBO reqBO = new RiskAndPeopleInfoReqBO();
+ reqBO.setPageSize(10);
+ reqBO.setPageNum(1);
+ ResultVO<RiskAndPeopleInfoRespDTO> result = riskAndPeopleInfoService.listRiskAndPeoplePage(reqBO);
+// RiskAndPeopleInfoRespDTO data = (RiskAndPeopleInfoRespDTO) result.getData();
+// resultVO.setPageSize(result.getPageSize());
+// resultVO.setPageNum(result.getPageNum());
+// resultVO.setCount(result.getCount());
+// resultVO.setData(result.getData());
+
+// TableDataInfo dataTable = getDataTable(data.getRiskAndPeopleInfoDTO());
+// dataTable.setTotal(result.getCount());
+
+// mmap.put("riskAndPeopleInfo", ((RiskAndPeopleInfoRespDTO) result.getData()).getRiskAndPeopleInfoDTO());
+ mmap.put("count", ((RiskAndPeopleInfoRespDTO) result.getData()).getCount());
+ mmap.put("complete", ((RiskAndPeopleInfoRespDTO) result.getData()).getComplete());
+ mmap.put("completeRatio", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatio());
+ mmap.put("countOfHandle", ((RiskAndPeopleInfoRespDTO) result.getData()).getCountOfHandle());
+ mmap.put("completeOfHandle", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfHandle());
+ mmap.put("completeRatioOfHandle", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfHandle());
+ mmap.put("countOfTechnology", ((RiskAndPeopleInfoRespDTO) result.getData()).getCountOfTechnology());
+ mmap.put("completeOfTechnology", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfTechnology());
+ mmap.put("completeRatioOfTechnology", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfTechnology());
+ mmap.put("countOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCountOfMain());
+ mmap.put("completeOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfMain());
+ mmap.put("completeRatioOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfMain());
+// mmap.put("version", ruoYiConfig.getVersion());
+ return "tr/riskAndPeopleInfo/riskAndPeopleInfo";
}
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
index 4190b28..32f3fc0 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
@@ -362,6 +362,7 @@
return getDataTable(list);
}
+
//companyId下总的数据统计
public void getDangerDataStatistics(String companyId, ModelMap mmap) {
HiddenDangerCheckPoint hdcpQuery = new HiddenDangerCheckPoint();
@@ -513,7 +514,7 @@
}
/**
- * 列表页面（根据companyId） todo
+ * 列表页面（根据companyId）
*/
@GetMapping("/listByCompanyId/{companyId}")
public String listByCompanyId(@PathVariable("companyId") Long companyId, ModelMap mmap) {
diff --git a/src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java b/src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java
index 5638e2d..56364c4 100644
--- a/src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java
+++ b/src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java
@@ -9,14 +9,15 @@
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.dept.domain.Dept;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
-import java.math.BigDecimal;
import java.util.List;
/**
@@ -50,6 +51,7 @@
@GetMapping("/getCountInfo")
public String countInfo(RiskAndPeopleInfoReqBO reqBO, ModelMap mmap)
{
+ System.out.println("11111111111111111111111111111111111111111");
// ResultVO resultVO = new ResultVO<>();
// resultVO.setCode("200");
// resultVO.setMsg("查询成功");
@@ -65,7 +67,8 @@
// dataTable.setTotal(result.getCount());
// mmap.put("riskAndPeopleInfo", ((RiskAndPeopleInfoRespDTO) result.getData()).getRiskAndPeopleInfoDTO());
- mmap.put("count", ((RiskAndPeopleInfoRespDTO) result.getData()).getCount());
+// mmap.put("count", ((RiskAndPeopleInfoRespDTO) result.getData()).getCount());
+ mmap.put("count", 6);
mmap.put("complete", ((RiskAndPeopleInfoRespDTO) result.getData()).getComplete());
mmap.put("completeRatio", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatio());
mmap.put("countOfHandle", ((RiskAndPeopleInfoRespDTO) result.getData()).getCountOfHandle());
@@ -78,7 +81,7 @@
mmap.put("completeOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfMain());
mmap.put("completeRatioOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfMain());
- return prefix + "/getCountInfo";
+ return "riskAndPeopleInfo";
}
/**
diff --git a/src/main/resources/templates/riskAndPeopleInfo.html b/src/main/resources/templates/riskAndPeopleInfo.html
deleted file mode 100644
index aa90ae7..0000000
--- a/src/main/resources/templates/riskAndPeopleInfo.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
- <th:block th:include="include :: header('所有隐患列表')"/>
-</head>
-<body class="gray-bg">
-
-
-<div class="container-div">
- <div class="row">
- <div class="col-sm-12 search-collapse">
-
- <form id="formId">
- <div class="select-list">
- <ul>
- <li>
- <label>搜索：</label>
- <input type="text" name="hazardName" placeholder="请输入重大危险源名称"/>
- </li>
- <li>
- <label>重大危险源级别：</label>
- <select name="hazardRank">
- <option value="">所有</option>
- <option :value="1">1</option>
- <option :value="2">2</option>
- <option :value="3">3</option>
- <option :value="4">4</option>
- </select>
- </li>
-
- <li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
- class="fa fa-search"></i> 搜索</a>
- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
- class="fa fa-refresh"></i> 重置</a>
- </li>
- </ul>
- </div>
- </form>
- </div>
-
-<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
-<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()">-->
-<!-- <i class="fa fa-download"></i> 导出-->
-<!-- </a>-->
-<!-- </div>-->
-
-
- <div class="col-sm-12 select-table table-striped">
- <table id="bootstrap-table"></table>
- </div>
- </div>
-</div>
-<th:block th:include="include :: footer"/>
-<script th:inline="javascript">
- var prefix = ctx + "tr/selectRiskAndPeoplePage";
- // var common = [[${common}]];//用户角色 是否在公司管理员
- $(function () {
- var options = {
- url: prefix + "/list",
- // createUrl: prefix + "/add",
- // updateUrl: prefix + "/edit/{id}",
- // removeUrl: prefix + "/removeDangerLedger",
- // exportUrl: prefix + "/export",
- detailUrl: prefix + "/detail/{id}",
- modalName: "隐患列表",
- detailView: true,
- detailFormatter: detailFormatter,
- columns: [
- {
- field: 'id',
- title: 'id'
- },
- {
- field: 'areaCode',
- title: '行政区划'
- },
- {
- field: 'companyName',
- title: '企业名称',
- },
- {
- field: 'companyNatureName',
- title: '企业类型'
- },
- {
- field: 'hazardCode',
- title: '危险源编码'
- },
- {
- field: 'hazardName',
- title: '危险源名称'
- },
- {
- field: 'hazardRankName',
- title: '危险级别'
- },
- {
- field: 'parkName',
- title: '所在园区'
- },
- {
- title: '操作',
- align: 'center',
- formatter: function (value, row, index) {
- var actions = [];
- actions.push('<a class="btn btn-default btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>查看</a> ');
- return actions.join('');
- }
- }
- ]
- };
- $.table.init(options);
- });
- function detailFormatter(index, row) {
- var html = [];
- html.push('<p><b>id:</b> ' + row.id + '</p>');
- html.push('<p><b>行政区划:</b> ' + row.areaCode + '</p>');
- html.push('<p><b>企业名称:</b> ' + row.companyName + '</p>');
- html.push('<p><b>企业类型:</b> ' + row.companyNatureName + '</p>');
- html.push('<p><b>危险源编码:</b> ' + row.hazardCode + '</p>');
- html.push('<p><b>危险源名称:</b> ' + row.hazardName + '</p>');
- html.push('<p><b>危险级别：</b> ' + row.hazardRankName + '</p>');
- html.push('<p><b>所在园区:</b> ' + row.parkName + '</p>');
- // $.each(row, function(key, value) {
- // html.push('<p><b>' + key + ':</b> ' + value + '</p>');
- // });
- return html.join('');
- }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/detailRiskAndPeopleInfo.html b/src/main/resources/templates/tr/riskAndPeopleInfo/detailRiskAndPeopleInfo.html
similarity index 98%
rename from src/main/resources/templates/detailRiskAndPeopleInfo.html
rename to src/main/resources/templates/tr/riskAndPeopleInfo/detailRiskAndPeopleInfo.html
index adac365..3fce4bc 100644
--- a/src/main/resources/templates/detailRiskAndPeopleInfo.html
+++ b/src/main/resources/templates/tr/riskAndPeopleInfo/detailRiskAndPeopleInfo.html
@@ -62,7 +62,7 @@
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript">
- var prefix = ctx + "tr/riskCheckPoint";
+ var prefix = ctx + "/detailRiskAndPeopleInfo";
$("#form-riskCheckPoint-edit").validate({
focusCleanup: true
});
diff --git a/src/main/resources/templates/tr/riskAndPeopleInfo/riskAndPeopleInfo.html b/src/main/resources/templates/tr/riskAndPeopleInfo/riskAndPeopleInfo.html
index eac336a..56eed5b 100644
--- a/src/main/resources/templates/tr/riskAndPeopleInfo/riskAndPeopleInfo.html
+++ b/src/main/resources/templates/tr/riskAndPeopleInfo/riskAndPeopleInfo.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
- <th:block th:include="include :: header('所有隐患列表')"/>
+ <th:block th:include="include :: header('所有包保责任制列表')"/>
</head>
<body class="gray-bg">
@@ -9,54 +9,45 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
+ <div style="display: flow-root;padding: 20px 0">
+ <div class="form-group" style="font-size: 16px;color: #4CAF50;">
+ <label class="col-sm-3 control-label">所有责任人所有的任务：<span id="count"></span></label>
+ <label class="col-sm-3 control-label">所有责任人所有完成的任务：<span id="complete"></span></label>
+ <label class="col-sm-3 control-label">所有任务完成率：<span id="completeRatio"></span></label>
+ <label class="col-sm-3 control-label">操作责任人所有的任务：<span id="countOfHandle"></span></label>
+ </div>
+ <div class="form-group" style="font-size: 16px;color: #4CAF50;">
+ <label class="col-sm-3 control-label">操作责任人所有完成的任务：<span id="completeOfHandle"></span></label>
+ <label class="col-sm-3 control-label">操作任务完成率：<span id="completeRatioOfHandle"></span></label>
+ <label class="col-sm-3 control-label">技术责任人所有的任务：<span id="countOfTechnology"></span></label>
+ <label class="col-sm-3 control-label">技术责任人所有完成的任务：<span id="completeOfTechnology"></span></label>
+ </div>
+ <div class="form-group" style="font-size: 16px;color: #4CAF50;">
+ <label class="col-sm-3 control-label">技术任务完成率：<span id="completeRatioOfTechnology"></span></label>
+ <label class="col-sm-3 control-label">主要责任人所有的任务：<span id="countOfMain"></span></label>
+ <label class="col-sm-3 control-label">主要责任人所有完成的任务：<span id="completeOfMain"></span></label>
+ <label class="col-sm-3 control-label">主要任务完成率：<span id="completeRatioOfMain"></span></label>
+ </div>
+ </div>
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>搜索：</label>
- <input type="text" name="riskDep"/>
+ <input type="text" name="hazardName" placeholder="请输入重大危险源名称"/>
</li>
<li>
- <label>隐患级别：</label>
- <select name="riskLevel">
+ <label>重大危险源级别：</label>
+ <select name="hazardRank">
<option value="">所有</option>
- <option value="A级">A级</option>
- <option value="B级">B级</option>
- <option value="C级">C级</option>
+ <option value="1">一级</option>
+ <option value="2">二级</option>
+ <option value="3">三级</option>
+ <option value="4">四级</option>
</select>
</li>
- <li>
-<!-- <label>搜索：</label>-->
- <input type="text" name="findPeople" placeholder="请输入隐患发现人"/>
- </li>
- <li>
- <!-- <label>搜索：</label>-->
- <input type="text" name="reportPeople" placeholder="请输入上报人"/>
- </li>
- <li>
- <!-- <label>搜索：</label>-->
- <input type="text" name="acceptPeople" placeholder="请输入验收人"/>
- </li>
- <li>
- <label>专业：</label>
- <select name="major">
- <option value="">所有</option>
- <option value="安全基础专业">安全基础专业</option>
- <option value="工艺专业">工艺专业</option>
- <option value="设备专业">设备专业</option>
- <option value="电气专业">电气专业</option>
- <option value="仪表专业">仪表专业</option>
- <option value="消防专业">消防专业</option>
- <option value="其它">其它</option>
- </select>
- </li>
- <li class="select-time">
- <label>发现时间：</label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/>
- <span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
- </li>
+
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i> 搜索</a>
@@ -82,7 +73,22 @@
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
- var prefix = ctx + "tr/riskAndPeopleInfo";
+ var prefix = ctx + "tr/selectRiskAndPeoplePage";
+
+ $(function () {
+ $("#count").text([[${count}]]);
+ $("#complete").text([[${complete}]]);
+ $("#completeRatio").text([[${completeRatio}]]);
+ $("#countOfHandle").text([[${countOfHandle}]]);
+ $("#completeOfHandle").text([[${completeOfHandle}]]);
+ $("#completeRatioOfHandle").text([[${completeRatioOfHandle}]]);
+ $("#countOfTechnology").text([[${countOfTechnology}]]);
+ $("#completeOfTechnology").text([[${completeOfTechnology}]]);
+ $("#completeRatioOfTechnology").text([[${completeRatioOfTechnology}]]);
+ $("#countOfMain").text([[${countOfMain}]]);
+ $("#completeOfMain").text([[${completeOfMain}]]);
+ $("#completeRatioOfMain").text([[${completeRatioOfMain}]]);
+ });
// var common = [[${common}]];//用户角色 是否在公司管理员
$(function () {
var options = {
@@ -91,47 +97,44 @@
// updateUrl: prefix + "/edit/{id}",
// removeUrl: prefix + "/removeDangerLedger",
// exportUrl: prefix + "/export",
- // detailUrl: prefix + "/detail/{id}",
- modalName: "隐患列表",
+ detailUrl: prefix + "/detailRiskAndPeopleInfo/{id}",
+ modalName: "包保责任制",
detailView: true,
detailFormatter: detailFormatter,
columns: [
{
- field: 'id',
- title: 'id'
+ field: 'companyName',
+ title: '企业名称',
},
{
- field: 'riskLevel',
- title: '级别'
+ field: 'companyNatureName',
+ title: '企业类型'
},
{
- field: 'riskDep',
- title: '隐患所在部门',
+ field: 'hazardCode',
+ title: '危险源编码'
},
{
- field: 'findPeople',
- title: '发现人'
+ field: 'hazardName',
+ title: '危险源名称'
},
{
- field: 'reportPeople',
- title: '上报人'
+ field: 'hazardRankName',
+ title: '危险级别'
},
{
- field: 'liabilityPeople',
- title: '负责人'
+ field: 'parkName',
+ title: '所在园区'
},
- {
- field: 'acceptPeople',
- title: '验收人'
- },
- {
- field: 'riskDesc',
- title: '隐患内容'
- },
- {
- field: 'findTime',
- title: '隐患发现时间'
- }
+ // {
+ // title: '操作',
+ // align: 'center',
+ // formatter: function (value, row, index) {
+ // var actions = [];
+ // actions.push('<a class="btn btn-default btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>查看</a> ');
+ // return actions.join('');
+ // }
+ // }
]
};
$.table.init(options);
@@ -139,14 +142,13 @@
function detailFormatter(index, row) {
var html = [];
html.push('<p><b>id:</b> ' + row.id + '</p>');
- html.push('<p><b>级别:</b> ' + row.riskLevel + '</p>');
- html.push('<p><b>隐患所在部门:</b> ' + row.riskDep + '</p>');
- html.push('<p><b>发现人:</b> ' + row.findPeople + '</p>');
- html.push('<p><b>上报人:</b> ' + row.reportPeople + '</p>');
- html.push('<p><b>负责人:</b> ' + row.liabilityPeople + '</p>');
- html.push('<p><b>验收人：</b> ' + row.acceptPeople + '</p>');
- html.push('<p><b>隐患内容:</b> ' + row.riskDesc + '</p>');
- html.push('<p><b>隐患发现时间:</b> ' + row.findTime + '</p>');
+ html.push('<p><b>行政区划:</b> ' + row.areaCode + '</p>');
+ html.push('<p><b>企业名称:</b> ' + row.companyName + '</p>');
+ html.push('<p><b>企业类型:</b> ' + row.companyNatureName + '</p>');
+ html.push('<p><b>危险源编码:</b> ' + row.hazardCode + '</p>');
+ html.push('<p><b>危险源名称:</b> ' + row.hazardName + '</p>');
+ html.push('<p><b>危险级别：</b> ' + row.hazardRankName + '</p>');
+ html.push('<p><b>所在园区:</b> ' + row.parkName + '</p>');
// $.each(row, function(key, value) {
// html.push('<p><b>' + key + ':</b> ' + value + '</p>');
// });
--
Gitblit v1.9.2