From 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 17 七月 2024 16:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html b/src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html
index bf13770..6a133a6 100644
--- a/src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html
+++ b/src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.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">
<div class="container-div">
@@ -34,8 +34,14 @@
<ul>
<input type="hidden" id="riskId" name="id" th:value="${id}"/>
-
- <li style="display: none">
+ <li>
+ 状态：<select name="reportStatus">
+ <option value="">所有</option>
+ <option value="1">没有评分</option>
+ <option value="2">已评分</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>
@@ -43,11 +49,11 @@
</div>
</form>
</div>
- <div class="btn-group-sm" id="toolbar" role="group">
- <a class="btn btn-success" onclick="$.operate.add()">
- <i class="fa fa-plus"></i> 新增
- </a>
- </div>
+<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
+<!-- <a class="btn btn-success" onclick="$.operate.add()">-->
+<!-- <i class="fa fa-plus"></i> 新增-->
+<!-- </a>-->
+<!-- </div>-->
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
@@ -60,32 +66,32 @@
$(function () {
var options = {
url: prefix + "/list",
+ title: '检查项上报',
queryParams: queryParams,
cleanUrl: prefix + "/clean",
createUrl: prefix + "/add",
- detailUrl: prefix + "/detail/{id}",
+ detailUrl: "/tr/tbBaseCheckScore/{id}",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
sortName: "createTime",
sortOrder: "desc",
- modalName: "任务上报",
+ modalName: "检查项上报",
columns: [
{
field: 'indexId',
- title: '检查序号',
- visible: false
+ title: '检查序号'
},
{
- field: 'hazardSource',
+ field: 'checkContent',
title: '检查内容'
},
{
- field: 'hazardSource',
+ field: 'checkBasis',
title: '检查依据'
},
{
- field: 'hazardSource',
+ field: 'applicablePlace',
title: '适用场所'
},
{
@@ -101,8 +107,7 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs" href="#" onclick="$.operate.edit(\'' + row.indexId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.detail(" + row.indexId + ")'><i class='fa fa-search'></i>查看</a> ");
+ actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\',1600)"><i class="fa fa-edit"></i>评分细则</a> ');
return actions.join('');
}
}
--
Gitblit v1.9.2