TroubleAndRisk.git

			@@ -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>');
			// });