From 9b54b971c3307d3db919b98e35d60ec000218d84 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 17 三月 2023 23:17:22 +0800
Subject: [PATCH] 页面改动，改为固有风险
---
src/main/resources/templates/tr/riskEvaluationList/edit.html | 10
src/main/resources/templates/tr/riskEvaluationList/riskEvaluationList.html | 20
src/main/resources/templates/tr/riskCheckPoint/edit.html | 10
src/main/resources/templates/tr/riskCheckPoint/editReviewByLS.html | 10
src/main/resources/templates/tr/riskCheckPoint/editReviewByMES.html | 10
src/main/resources/templates/tr/dataStatisticsByApp/ledgerByCompanyIdAndRiskLevel.html | 69 ++--
src/main/resources/templates/tr/riskCheckPoint/add.html | 10
src/main/resources/templates/tr/riskCheckPoint/editReviewByLEC.html | 10
src/main/resources/templates/tr/riskCheckPoint/detailByMES.html | 10
src/main/resources/templates/tr/hiddenDangerCheck/dangerPlanFormulate/editDangerPlanFormulate.html | 1
src/main/resources/templates/tr/riskCheckPoint/detailByLEC.html | 10
src/main/resources/templates/tr/riskCheckPoint/detailByRS.html | 10
src/main/resources/templates/tr/riskCheckPoint/ledger.html | 72 +++--
src/main/resources/templates/tr/dataStatisticsByApp/ledger.html | 69 ++--
src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLEC.html | 10
src/main/resources/templates/tr/riskCheckPoint/editEvaluationByMES.html | 10
src/main/resources/templates/tr/riskCheckPoint/editEvaluationByRS.html | 10
src/main/resources/templates/tr/riskCheckPoint/ledgerByCompanyIdAndRiskLevel.html | 68 ++--
src/main/resources/templates/tr/riskCheckPoint/detailByLS.html | 10
src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLS.html | 143 ++++++-----
src/main/resources/templates/tr/riskCheckPoint/riskCheckPoint.html | 20
src/main/resources/templates/tr/riskEvaluationList/add.html | 10
src/main/resources/templates/tr/dataStatisticsTotalByApp/ledgerTotalAndRiskLevel.html | 67 ++--
23 files changed, 340 insertions(+), 329 deletions(-)
diff --git a/src/main/resources/templates/tr/dataStatisticsByApp/ledger.html b/src/main/resources/templates/tr/dataStatisticsByApp/ledger.html
index a9550c8..90827bc 100644
--- a/src/main/resources/templates/tr/dataStatisticsByApp/ledger.html
+++ b/src/main/resources/templates/tr/dataStatisticsByApp/ledger.html
@@ -79,7 +79,7 @@
</select>
</li>
<li>
- <label>剩余风险评价风险级别：</label>
+ <label>固有风险评价风险级别：</label>
<select name="evaluationAfterFengxianJibie" >
<option value="">所有</option>
<option value="低">低</option>
@@ -189,6 +189,40 @@
return $.table.selectDictLabel(evaluationStatusDatas, value);
}
},
+ {
+ field: 'evaluationAfterFengxianzhi',
+ title: '固有风险评价风险值'
+ },
+ {
+ field: 'evaluationAfterJibie',
+ title: '固有风险评价级别'
+ },
+ {
+ field: 'evaluationAfterFengxianJibie',
+ title: '固有风险评价风险级别'
+ },
+ {
+ field: 'evaluationAfterFengxianse',
+ title: '固有风险评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationAfterFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationAfterFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationAfterFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationAfterFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationAfterGuankongCengji',
+ title: '固有风险评价管控层级'
+ },
{
field: 'evaluationNowFengxianzhi',
@@ -246,40 +280,7 @@
// title: '建议应急处置措施'
// },
- {
- field: 'evaluationAfterFengxianzhi',
- title: '剩余风险评价风险值'
- },
- {
- field: 'evaluationAfterJibie',
- title: '剩余风险评价级别'
- },
- {
- field: 'evaluationAfterFengxianJibie',
- title: '剩余风险评价风险级别'
- },
- {
- field: 'evaluationAfterFengxianse',
- title: '剩余风险评价风险色',
- formatter: function(value, row, index) {
- var actions = [];
- if (row.evaluationAfterFengxianse=='红色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
- }else if(row.evaluationAfterFengxianse=='橙色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
- }else if(row.evaluationAfterFengxianse=='黄色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
- }else if(row.evaluationAfterFengxianse=='蓝色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
- }
- return actions.join('');
- }
- },
- {
- field: 'evaluationAfterGuankongCengji',
- title: '剩余风险评价管控层级'
- },
{
field: 'reviewUser.userName',
title: '审核负责人'
diff --git a/src/main/resources/templates/tr/dataStatisticsByApp/ledgerByCompanyIdAndRiskLevel.html b/src/main/resources/templates/tr/dataStatisticsByApp/ledgerByCompanyIdAndRiskLevel.html
index a6c1415..ae51f8c 100644
--- a/src/main/resources/templates/tr/dataStatisticsByApp/ledgerByCompanyIdAndRiskLevel.html
+++ b/src/main/resources/templates/tr/dataStatisticsByApp/ledgerByCompanyIdAndRiskLevel.html
@@ -167,6 +167,41 @@
},
{
+ field: 'evaluationAfterFengxianzhi',
+ title: '固有风险评价风险值'
+ },
+ {
+ field: 'evaluationAfterJibie',
+ title: '固有风险评价级别'
+ },
+ {
+ field: 'evaluationAfterFengxianJibie',
+ title: '固有风险评价风险级别'
+ },
+ {
+ field: 'evaluationAfterFengxianse',
+ title: '固有风险评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationAfterFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationAfterFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationAfterFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationAfterFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationAfterGuankongCengji',
+ title: '固有风险评价管控层级'
+ },
+
+ {
field: 'evaluationNowFengxianzhi',
title: '现有措施评价风险值'
},
@@ -222,40 +257,6 @@
// title: '建议应急处置措施'
// },
- {
- field: 'evaluationAfterFengxianzhi',
- title: '剩余风险评价风险值'
- },
- {
- field: 'evaluationAfterJibie',
- title: '剩余风险评价级别'
- },
- {
- field: 'evaluationAfterFengxianJibie',
- title: '剩余风险评价风险级别'
- },
- {
- field: 'evaluationAfterFengxianse',
- title: '剩余风险评价风险色',
- formatter: function(value, row, index) {
- var actions = [];
- if (row.evaluationAfterFengxianse=='红色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
- }else if(row.evaluationAfterFengxianse=='橙色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
- }else if(row.evaluationAfterFengxianse=='黄色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
-
- }else if(row.evaluationAfterFengxianse=='蓝色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
- }
- return actions.join('');
- }
- },
- {
- field: 'evaluationAfterGuankongCengji',
- title: '剩余风险评价管控层级'
- },
{
field: 'reviewUser.userName',
title: '审核负责人'
diff --git a/src/main/resources/templates/tr/dataStatisticsTotalByApp/ledgerTotalAndRiskLevel.html b/src/main/resources/templates/tr/dataStatisticsTotalByApp/ledgerTotalAndRiskLevel.html
index 23aca12..59f1415 100644
--- a/src/main/resources/templates/tr/dataStatisticsTotalByApp/ledgerTotalAndRiskLevel.html
+++ b/src/main/resources/templates/tr/dataStatisticsTotalByApp/ledgerTotalAndRiskLevel.html
@@ -159,6 +159,40 @@
return $.table.selectDictLabel(evaluationStatusDatas, value);
}
},
+ {
+ field: 'evaluationAfterFengxianzhi',
+ title: '固有风险评价风险值'
+ },
+ {
+ field: 'evaluationAfterJibie',
+ title: '固有风险评价级别'
+ },
+ {
+ field: 'evaluationAfterFengxianJibie',
+ title: '固有风险评价风险级别'
+ },
+ {
+ field: 'evaluationAfterFengxianse',
+ title: '固有风险评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationAfterFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationAfterFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationAfterFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationAfterFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationAfterGuankongCengji',
+ title: '固有风险评价管控层级'
+ },
{
field: 'evaluationNowFengxianzhi',
@@ -216,40 +250,7 @@
// title: '建议应急处置措施'
// },
- {
- field: 'evaluationAfterFengxianzhi',
- title: '剩余风险评价风险值'
- },
- {
- field: 'evaluationAfterJibie',
- title: '剩余风险评价级别'
- },
- {
- field: 'evaluationAfterFengxianJibie',
- title: '剩余风险评价风险级别'
- },
- {
- field: 'evaluationAfterFengxianse',
- title: '剩余风险评价风险色',
- formatter: function(value, row, index) {
- var actions = [];
- if (row.evaluationAfterFengxianse=='红色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
- }else if(row.evaluationAfterFengxianse=='橙色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
- }else if(row.evaluationAfterFengxianse=='黄色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
- }else if(row.evaluationAfterFengxianse=='蓝色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
- }
- return actions.join('');
- }
- },
- {
- field: 'evaluationAfterGuankongCengji',
- title: '剩余风险评价管控层级'
- },
{
field: 'reviewUser.userName',
title: '审核负责人'
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerPlanFormulate/editDangerPlanFormulate.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerPlanFormulate/editDangerPlanFormulate.html
index 8323a6a..dc5bc43 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerPlanFormulate/editDangerPlanFormulate.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerPlanFormulate/editDangerPlanFormulate.html
@@ -77,6 +77,7 @@
<div class="col-sm-8">
<select name="riskType" id="riskType" th:field="*{riskType}" class="form-control m-b" required>
<option value="1">设备设施清单</option>
+<!-- <option value="1">风险分析单元</option>-->
<option value="2">作业活动清单</option>
<option value="3">工艺节点清单</option>
</select>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/add.html b/src/main/resources/templates/tr/riskCheckPoint/add.html
index 370d93c..3d74e74 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/add.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/add.html
@@ -298,31 +298,31 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label"固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" class="form-control" type="text">
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/detailByLEC.html b/src/main/resources/templates/tr/riskCheckPoint/detailByLEC.html
index b6a9cee..e968caf 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/detailByLEC.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/detailByLEC.html
@@ -373,31 +373,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/detailByLS.html b/src/main/resources/templates/tr/riskCheckPoint/detailByLS.html
index 679cd60..21eb777 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/detailByLS.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/detailByLS.html
@@ -355,31 +355,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/detailByMES.html b/src/main/resources/templates/tr/riskCheckPoint/detailByMES.html
index dd48d34..832fa01 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/detailByMES.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/detailByMES.html
@@ -374,31 +374,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/detailByRS.html b/src/main/resources/templates/tr/riskCheckPoint/detailByRS.html
index f373892..a36cf05 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/detailByRS.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/detailByRS.html
@@ -355,31 +355,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/edit.html b/src/main/resources/templates/tr/riskCheckPoint/edit.html
index edb9eac..7e12adc 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/edit.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/edit.html
@@ -299,31 +299,31 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text">
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLEC.html b/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLEC.html
index 0453fb0..bf06ea8 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLEC.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLEC.html
@@ -325,31 +325,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text">
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLS.html b/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLS.html
index f2256f4..5c060cb 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLS.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByLS.html
@@ -131,6 +131,74 @@
</div>
</div>
+<!-- <div class="anel panel-default">-->
+<!-- 固有风险-->
+<!-- </div>-->
+
+ <!--现有评分-->
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ 固有风险评分
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">LS_L的数值：</label>
+ <div class="col-sm-8">
+ <input id="detailScoreByLS_LNow" placeholder="选择分值" th:field="*{evaluationNowLsLScore}" class="form-control" type="text" onclick="selectLS_L('Now')" maxlength="30" readonly="true" required>
+ <input id="detailIdByLS_LNow" name="evaluationNowLsL" th:field="*{evaluationNowLsL}" type="hidden">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">LS_S的数值：</label>
+ <div class="col-sm-8">
+ <input id="detailScoreByLS_SNow" placeholder="选择分值" th:field="*{evaluationNowLsSScore}" class="form-control" type="text" onclick="selectLS_S('Now')" maxlength="30" readonly="true" required>
+ <input id="detailIdByLS_SNow" name="evaluationNowLsS" th:field="*{evaluationNowLsS}" type="hidden">
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+
+ <!--现有分值-->
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ 固有风险分值
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险值：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowFengxianzhi" name="evaluationNowFengxianzhi" th:field="*{evaluationNowFengxianzhi}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">级别：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowJibie" name="evaluationNowJibie" th:field="*{evaluationNowJibie}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险级别：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowFengxianJibie" name="evaluationNowFengxianJibie" th:field="*{evaluationNowFengxianJibie}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险色：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowFengxianse" name="evaluationNowFengxianse" th:field="*{evaluationNowFengxianse}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">管控层级：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowGuankongCengji" name="evaluationNowGuankongCengji" th:field="*{evaluationNowGuankongCengji}" class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+
+ </div>
<!--现有措施-->
<div class="panel panel-default">
@@ -169,71 +237,6 @@
</div>
</div>
</div>
- </div>
-
- <!--现有评分-->
- <div class="panel panel-default">
- <div class="panel-heading">
- 现有评分
- </div>
- <div class="panel-body">
- <div class="form-group">
- <label class="col-sm-3 control-label">LS_L的数值：</label>
- <div class="col-sm-8">
- <input id="detailScoreByLS_LNow" placeholder="选择分值" th:field="*{evaluationNowLsLScore}" class="form-control" type="text" onclick="selectLS_L('Now')" maxlength="30" readonly="true" required>
- <input id="detailIdByLS_LNow" name="evaluationNowLsL" th:field="*{evaluationNowLsL}" type="hidden">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">LS_S的数值：</label>
- <div class="col-sm-8">
- <input id="detailScoreByLS_SNow" placeholder="选择分值" th:field="*{evaluationNowLsSScore}" class="form-control" type="text" onclick="selectLS_S('Now')" maxlength="30" readonly="true" required>
- <input id="detailIdByLS_SNow" name="evaluationNowLsS" th:field="*{evaluationNowLsS}" type="hidden">
- </div>
- </div>
-
- </div>
-
- </div>
-
- <!--现有分值-->
- <div class="panel panel-default">
- <div class="panel-heading">
- 现有分值
- </div>
- <div class="panel-body">
- <div class="form-group">
- <label class="col-sm-3 control-label">风险值：</label>
- <div class="col-sm-8">
- <input id="evaluationNowFengxianzhi" name="evaluationNowFengxianzhi" th:field="*{evaluationNowFengxianzhi}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">级别：</label>
- <div class="col-sm-8">
- <input id="evaluationNowJibie" name="evaluationNowJibie" th:field="*{evaluationNowJibie}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">风险级别：</label>
- <div class="col-sm-8">
- <input id="evaluationNowFengxianJibie" name="evaluationNowFengxianJibie" th:field="*{evaluationNowFengxianJibie}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">风险色：</label>
- <div class="col-sm-8">
- <input id="evaluationNowFengxianse" name="evaluationNowFengxianse" th:field="*{evaluationNowFengxianse}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">管控层级：</label>
- <div class="col-sm-8">
- <input id="evaluationNowGuankongCengji" name="evaluationNowGuankongCengji" th:field="*{evaluationNowGuankongCengji}" class="form-control" type="text">
- </div>
- </div>
- </div>
-
</div>
@@ -310,31 +313,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text">
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByMES.html b/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByMES.html
index 79d17bf..73aa7f6 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByMES.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByMES.html
@@ -333,31 +333,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text">
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByRS.html b/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByRS.html
index a36b904..92db5bc 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByRS.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/editEvaluationByRS.html
@@ -317,31 +317,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text">
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/editReviewByLEC.html b/src/main/resources/templates/tr/riskCheckPoint/editReviewByLEC.html
index 08c94f2..6c71e3b 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/editReviewByLEC.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/editReviewByLEC.html
@@ -324,31 +324,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/editReviewByLS.html b/src/main/resources/templates/tr/riskCheckPoint/editReviewByLS.html
index cb7aeec..f510b0f 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/editReviewByLS.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/editReviewByLS.html
@@ -309,31 +309,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/editReviewByMES.html b/src/main/resources/templates/tr/riskCheckPoint/editReviewByMES.html
index 02e70d7..772d858 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/editReviewByMES.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/editReviewByMES.html
@@ -328,31 +328,31 @@
</div>
<div class="panel-body">
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
</div>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/ledger.html b/src/main/resources/templates/tr/riskCheckPoint/ledger.html
index 7874f94..a6d31ce 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/ledger.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/ledger.html
@@ -89,7 +89,7 @@
</select>
</li>
<li>
- <label>剩余风险评价风险级别：</label>
+ <label>固有风险评价风险级别：</label>
<select name="evaluationAfterFengxianJibie" >
<option value="">所有</option>
<option value="低">低</option>
@@ -198,6 +198,42 @@
}
},
+
+ {
+ field: 'evaluationAfterFengxianzhi',
+ title: '固有风险评价风险值'
+ },
+ {
+ field: 'evaluationAfterJibie',
+ title: '固有风险评价级别'
+ },
+ {
+ field: 'evaluationAfterFengxianJibie',
+ title: '固有风险评价风险级别'
+ },
+ {
+ field: 'evaluationAfterFengxianse',
+ title: '固有风险评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationAfterFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationAfterFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationAfterFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationAfterFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationAfterGuankongCengji',
+ title: '固有风险评价管控层级'
+ },
+
{
field: 'evaluationNowFengxianzhi',
title: '现有措施评价风险值'
@@ -254,40 +290,6 @@
// title: '建议应急处置措施'
// },
- {
- field: 'evaluationAfterFengxianzhi',
- title: '剩余风险评价风险值'
- },
- {
- field: 'evaluationAfterJibie',
- title: '剩余风险评价级别'
- },
- {
- field: 'evaluationAfterFengxianJibie',
- title: '剩余风险评价风险级别'
- },
- {
- field: 'evaluationAfterFengxianse',
- title: '剩余风险评价风险色',
- formatter: function(value, row, index) {
- var actions = [];
- if (row.evaluationAfterFengxianse=='红色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
- }else if(row.evaluationAfterFengxianse=='橙色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
- }else if(row.evaluationAfterFengxianse=='黄色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
-
- }else if(row.evaluationAfterFengxianse=='蓝色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
- }
- return actions.join('');
- }
- },
- {
- field: 'evaluationAfterGuankongCengji',
- title: '剩余风险评价管控层级'
- },
{
field: 'reviewUser.userName',
title: '审核负责人'
diff --git a/src/main/resources/templates/tr/riskCheckPoint/ledgerByCompanyIdAndRiskLevel.html b/src/main/resources/templates/tr/riskCheckPoint/ledgerByCompanyIdAndRiskLevel.html
index cbfe846..ea6274b 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/ledgerByCompanyIdAndRiskLevel.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/ledgerByCompanyIdAndRiskLevel.html
@@ -165,6 +165,41 @@
}
},
+ {
+ field: 'evaluationAfterFengxianzhi',
+ title: '固有风险评价风险值'
+ },
+ {
+ field: 'evaluationAfterJibie',
+ title: '固有风险评价级别'
+ },
+ {
+ field: 'evaluationAfterFengxianJibie',
+ title: '固有风险评价风险级别'
+ },
+ {
+ field: 'evaluationAfterFengxianse',
+ title: '固有风险评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationAfterFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationAfterFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationAfterFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationAfterFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationAfterGuankongCengji',
+ title: '固有风险评价管控层级'
+ },
+
{
field: 'evaluationNowFengxianzhi',
title: '现有措施评价风险值'
@@ -221,40 +256,7 @@
// title: '建议应急处置措施'
// },
- {
- field: 'evaluationAfterFengxianzhi',
- title: '剩余风险评价风险值'
- },
- {
- field: 'evaluationAfterJibie',
- title: '剩余风险评价级别'
- },
- {
- field: 'evaluationAfterFengxianJibie',
- title: '剩余风险评价风险级别'
- },
- {
- field: 'evaluationAfterFengxianse',
- title: '剩余风险评价风险色',
- formatter: function(value, row, index) {
- var actions = [];
- if (row.evaluationAfterFengxianse=='红色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
- }else if(row.evaluationAfterFengxianse=='橙色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
- }else if(row.evaluationAfterFengxianse=='黄色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
- }else if(row.evaluationAfterFengxianse=='蓝色'){
- actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
- }
- return actions.join('');
- }
- },
- {
- field: 'evaluationAfterGuankongCengji',
- title: '剩余风险评价管控层级'
- },
{
field: 'reviewUser.userName',
title: '审核负责人'
diff --git a/src/main/resources/templates/tr/riskCheckPoint/riskCheckPoint.html b/src/main/resources/templates/tr/riskCheckPoint/riskCheckPoint.html
index 08da4ab..c61f2e7 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/riskCheckPoint.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/riskCheckPoint.html
@@ -220,23 +220,23 @@
<input type="text" name="evaluationAfterMesS"/>
</li>
<li>
- <label>剩余风险评价风险值：</label>
+ <label>固有风险评价风险值：</label>
<input type="text" name="evaluationAfterFengxianzhi"/>
</li>
<li>
- <label>剩余风险评价级别：</label>
+ <label>固有风险评价级别：</label>
<input type="text" name="evaluationAfterJibie"/>
</li>
<li>
- <label>剩余风险评价风险级别：</label>
+ <label>固有风险评价风险级别：</label>
<input type="text" name="evaluationAfterFengxianJibie"/>
</li>
<li>
- <label>剩余风险评价风险色：</label>
+ <label>固有风险评价风险色：</label>
<input type="text" name="evaluationAfterFengxianse"/>
</li>
<li>
- <label>剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
+ <label>固有风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
<input type="text" name="evaluationAfterGuankongCengji"/>
</li>
<li>
@@ -529,23 +529,23 @@
},
{
field: 'evaluationAfterFengxianzhi',
- title: '剩余风险评价风险值'
+ title: '固有风险评价风险值'
},
{
field: 'evaluationAfterJibie',
- title: '剩余风险评价级别'
+ title: '固有风险评价级别'
},
{
field: 'evaluationAfterFengxianJibie',
- title: '剩余风险评价风险级别'
+ title: '固有风险评价风险级别'
},
{
field: 'evaluationAfterFengxianse',
- title: '剩余风险评价风险色'
+ title: '固有风险评价风险色'
},
{
field: 'evaluationAfterGuankongCengji',
- title: '剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级)'
+ title: '固有风险评价管控层级(1班组级,2车间级,3部门级,4公司级)'
},
{
field: 'reviewUserId',
diff --git a/src/main/resources/templates/tr/riskEvaluationList/add.html b/src/main/resources/templates/tr/riskEvaluationList/add.html
index 8b2cd91..13179c9 100644
--- a/src/main/resources/templates/tr/riskEvaluationList/add.html
+++ b/src/main/resources/templates/tr/riskEvaluationList/add.html
@@ -253,31 +253,31 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" class="form-control" type="text">
</div>
diff --git a/src/main/resources/templates/tr/riskEvaluationList/edit.html b/src/main/resources/templates/tr/riskEvaluationList/edit.html
index 157f209..a35c40f 100644
--- a/src/main/resources/templates/tr/riskEvaluationList/edit.html
+++ b/src/main/resources/templates/tr/riskEvaluationList/edit.html
@@ -254,31 +254,31 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险值：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险值：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险级别：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险级别：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价风险色：</label>
+ <label class="col-sm-3 control-label">固有风险评价风险色：</label>
<div class="col-sm-8">
<input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
+ <label class="col-sm-3 control-label">固有风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
<div class="col-sm-8">
<input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text">
</div>
diff --git a/src/main/resources/templates/tr/riskEvaluationList/riskEvaluationList.html b/src/main/resources/templates/tr/riskEvaluationList/riskEvaluationList.html
index 14533ee..c295d35 100644
--- a/src/main/resources/templates/tr/riskEvaluationList/riskEvaluationList.html
+++ b/src/main/resources/templates/tr/riskEvaluationList/riskEvaluationList.html
@@ -193,23 +193,23 @@
<input type="text" name="evaluationAfterMesS"/>
</li>
<li>
- <label>剩余风险评价风险值：</label>
+ <label>固有风险评价风险值：</label>
<input type="text" name="evaluationAfterFengxianzhi"/>
</li>
<li>
- <label>剩余风险评价级别：</label>
+ <label>固有风险评价级别：</label>
<input type="text" name="evaluationAfterJibie"/>
</li>
<li>
- <label>剩余风险评价风险级别：</label>
+ <label>固有风险评价风险级别：</label>
<input type="text" name="evaluationAfterFengxianJibie"/>
</li>
<li>
- <label>剩余风险评价风险色：</label>
+ <label>固有风险评价风险色：</label>
<input type="text" name="evaluationAfterFengxianse"/>
</li>
<li>
- <label>剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
+ <label>固有风险评价管控层级(1班组级,2车间级,3部门级,4公司级)：</label>
<input type="text" name="evaluationAfterGuankongCengji"/>
</li>
<li>
@@ -457,23 +457,23 @@
},
{
field: 'evaluationAfterFengxianzhi',
- title: '剩余风险评价风险值'
+ title: '固有风险评价风险值'
},
{
field: 'evaluationAfterJibie',
- title: '剩余风险评价级别'
+ title: '固有风险评价级别'
},
{
field: 'evaluationAfterFengxianJibie',
- title: '剩余风险评价风险级别'
+ title: '固有风险评价风险级别'
},
{
field: 'evaluationAfterFengxianse',
- title: '剩余风险评价风险色'
+ title: '固有风险评价风险色'
},
{
field: 'evaluationAfterGuankongCengji',
- title: '剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级)'
+ title: '固有风险评价管控层级(1班组级,2车间级,3部门级,4公司级)'
},
{
field: 'reviewUserId',
--
Gitblit v1.9.2