From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html | 39 +++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java | 10 +
fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html | 50 ++++---
fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html | 57 ++++++---
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java | 36 ++++++
fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html | 4
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java | 20 ++-
fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html | 45 ++++++-
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java | 13 ++
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java | 21 ++-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java | 10 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 8 +
13 files changed, 237 insertions(+), 78 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
index 36be5ee..b9a4aa3 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
@@ -32,9 +32,13 @@
private String userId;
@Id
- @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
- @TableField("batch_id")
- private String batchId;
+ @Column(name = "conf_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
+ @TableField("conf_id")
+ private String confId;
+
+ @Column(name = "conf_name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
+ @TableField("conf_name")
+ private String confName;
@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
@TableField("dept_id")
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
index d4edf4c..2cab1b3 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
@@ -27,20 +27,24 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
- @TableId(value = "batch_id", type = IdType.NONE)
- @TableField("batch_id")
- private String batchId;
+ @Column(name = "id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
+ @TableId(value = "id", type = IdType.NONE)
+ @TableField("id")
+ private String id;
@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
@TableField("dept_id")
private String deptId;
- @Column(name = "batch_name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
- @TableField("batch_name")
- private String batchName;
+ @Column(name = "name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
+ @TableField("name")
+ private String name;
- @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
+ @Column(name = "user_id", columnDefinition = "varchar(200) COMMENT '宸￠�讳汉璐﹀彿'")
+ @TableField("user_id")
+ private String userId;
+
+ @Column(name = "user_name", columnDefinition = "varchar(200) COMMENT '宸￠�讳汉'")
@TableField("user_name")
private String userName;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
index b144087..0b55833 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
@@ -18,7 +18,7 @@
private String userId;
- private String batchId;
+ private String confId;
public PatrolKey(){
super();
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java
index 643000f..663365c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java
@@ -38,11 +38,17 @@
*/
public QueryWrapper<PatrolConf> getQueryWrapper(PatrolConf param) {
QueryWrapper<PatrolConf> queryWrapper = new QueryWrapper<>();
+ if (param == null) {
+ param = new PatrolConf();
+ }
// 璁剧疆鍏徃ID骞朵綔涓烘煡璇㈡潯浠�
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
+ if (StringUtils.isNotEmpty(param.getDeptId())) {
+ queryWrapper.eq("dept_id", param.getDeptId());
+ }
// 鎸夊垱寤烘椂闂村�掑簭鎺掑簭
@@ -68,8 +74,8 @@
* @return 褰卞搷琛屾暟
*/
public int insertData(PatrolConf param) {
- if (StringUtils.isEmpty(param.getBatchId())) {
- param.setBatchId(ContextUtil.generateId());
+ if (StringUtils.isEmpty(param.getId())) {
+ param.setId(ContextUtil.generateId());
}
return patrolConfMapper.insert(param);
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
index b4463ec..26c57c1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
@@ -38,6 +38,14 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
}
+
+ if (StringUtils.isNotBlank(param.getUserName())) {
+ queryWrapper.like("user_name", param.getUserName());
+ }
+ if (StringUtils.isNotBlank(param.getConfName())) {
+ queryWrapper.like("conf_name", param.getConfName());
+ }
+
queryWrapper.orderByDesc("create_time");
return queryWrapper;
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java
index 8444397..f010a48 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java
@@ -2,10 +2,12 @@
import com.fzzy.igds.domain.PatrolConf;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.security.PatrolConfManager;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ShiroUtils;
@@ -29,11 +31,14 @@
@Resource
private PatrolConfManager patrolConfManager;
+ @Resource
+ private CommonManager commonManager;
+
/**
* 宸℃洿閰嶇疆椤甸潰
*/
@GetMapping()
- public String patrolConf() {
+ public String patrolConf(ModelMap mmap) {
return prefix + "/patrolConf";
}
@@ -71,6 +76,8 @@
*/
@GetMapping("/add")
public String add(ModelMap mmap) {
+ //宸￠�讳汉鍒楄〃
+ mmap.put("userList", commonManager.listUserData());
return prefix + "/add";
}
@@ -86,8 +93,8 @@
}
param.setCreateBy(getLoginName());
param.setCreateTime(new Date());
- if (StringUtils.isEmpty(param.getBatchId())) {
- param.setBatchId(ContextUtil.generateId());
+ if (StringUtils.isEmpty(param.getId())) {
+ param.setId(ContextUtil.generateId());
}
return toAjax(patrolConfManager.insertData(param));
}
@@ -99,6 +106,8 @@
public String edit(@PathVariable("id") String id, ModelMap mmap) {
PatrolConf record = patrolConfManager.selectById(id);
mmap.put("patrolConf", record);
+ //宸￠�讳汉鍒楄〃
+ mmap.put("userList", commonManager.listUserData());
return prefix + "/edit";
}
@@ -114,9 +123,9 @@
}
param.setUpdateBy(getLoginName());
param.setUpdateTime(new Date());
- PatrolConf patrolConf = patrolConfManager.selectById(param.getBatchId());
+ PatrolConf patrolConf = patrolConfManager.selectById(param.getId());
if (patrolConf == null) {
- param.setBatchId(ContextUtil.generateId());
+ param.setId(ContextUtil.generateId());
return toAjax(patrolConfManager.insertData(param));
}
@@ -130,7 +139,7 @@
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids) {
- patrolConfManager.deleteDataById( ids);
+ patrolConfManager.deleteDataById(ids);
return success();
}
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java
index b794068..52e6795 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java
@@ -1,7 +1,10 @@
package com.fzzy.sys.controller.security;
import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolConf;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.sys.manager.common.CommonManager;
+import com.fzzy.sys.manager.security.PatrolConfManager;
import com.fzzy.sys.manager.security.PatrolManager;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@@ -29,6 +32,12 @@
@Resource
private PatrolManager patrolManager;
+ @Resource
+ private PatrolConfManager patrolConfManager;
+
+
+ @Resource
+ private CommonManager commonManager;
/**
* 鐢靛瓙宸℃洿椤甸潰
*
@@ -36,7 +45,9 @@
* @date 2025/12/06
*/
@GetMapping()
- public String patrol() {
+ public String patrol(ModelMap mmap) {
+ //鑾峰彇搴撳尯鍥炴樉鍒楄〃
+ mmap.put("deptList", commonManager.listDeptData());
return prefix + "/patrol";
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
index da79a92..680627d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
@@ -2,13 +2,19 @@
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.domain.Depot;
+import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.DicService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
import java.util.List;
@@ -20,13 +26,20 @@
@Slf4j
@Component
public class CommonManager {
+
@Resource
private DepotService depotService;
@Resource
private DicService dicService;
+ @Resource
+ private CoreDeptService coreDeptService;
+
+ @Autowired
+ private ISysUserService userService;
/**
* 鏍规嵁瀛楀吀绫诲瀷鑾峰彇瀛楀吀鍒楄〃
+ *
* @param parentCode
* @param companyId
* @return
@@ -58,9 +71,19 @@
}
+ /**
+ * 鑾峰彇鍒嗗簱鍒楄〃
+ *
+ * @author sgj
+ * @date 2025/12/12
+ */
+ public List<Dept> listDeptData() {
+ return coreDeptService.getDeptData();
+ }
/**
* 鏍规嵁浠撳簱缂栫爜鑾峰彇浠撳簱绫诲瀷
+ *
* @param depotId
* @return
*/
@@ -74,4 +97,17 @@
return depotType;
}
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃
+ *
+ * @author sgj
+ * @date 2025/12/12
+ */
+ public List<SysUser> listUserData() {
+ SysUser user = new SysUser() ;
+ user.setCompanyId(ContextUtil.getCompanyId());
+ user.setDeptId(Long.valueOf(ContextUtil.subDeptId(null)));
+ return userService.selectUserList(user);
+ }
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html
index 2fc1e4e..fb0e75d 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html
@@ -23,7 +23,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">鐝缂栧彿锛�</label>
<div class="col-sm-8">
- <input name="batchId" id="batchId" placeholder="璇疯緭鍏�" class="form-control " type="text"
+ <input name="confId" id="confId" placeholder="璇疯緭鍏�" class="form-control " type="text"
maxlength="30">
</div>
</div>
@@ -34,7 +34,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">宸￠�讳汉锛�</label>
<div class="col-sm-8">
- <input name="userName" id="userName" placeholder="璇疯緭鍏�" class="form-control " type="text"
+ <input name="userId" id="userId" placeholder="璇疯緭鍏�" class="form-control " type="text"
maxlength="30" required>
</div>
</div>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html
index 99cf153..b82cf56 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html
@@ -12,7 +12,10 @@
<div class="select-list">
<ul>
<li>
- 鍚嶇О锛�<input type="text" name="name"/>
+ 宸￠�讳汉锛�<input type="text" name="userName"/>
+ </li>
+ <li>
+ 鐝鍚嶇О锛�<input type="text" name="confName"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 鎼滅储</a>
@@ -24,18 +27,18 @@
</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>
- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" >
- <i class="fa fa-edit"></i> 淇敼
- </a>
- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" >
- <i class="fa fa-remove"></i> 鍒犻櫎
- </a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" >
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-success" onclick="$.operate.add()" >-->
+<!-- <i class="fa fa-plus"></i> 鏂板-->
+<!-- </a>-->
+<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" >-->
+<!-- <i class="fa fa-edit"></i> 淇敼-->
+<!-- </a>-->
+<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" >-->
+<!-- <i class="fa fa-remove"></i> 鍒犻櫎-->
+<!-- </a>-->
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" >-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
<a class="btn btn-success" onclick="openPatrolConf()" >
<i class="fa fa-plus"></i> 宸℃洿閰嶇疆
</a>
@@ -49,7 +52,7 @@
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
var prefix = ctx + "security/patrol";
-
+ var deptList = [[${deptList}]];
$(function() {
var options = {
@@ -61,6 +64,10 @@
sortName: "id",
sortOrder: "asc",
modalName: "鍙傛暟",
+ showSearch:false,
+ showRefresh:false,
+ showColumns:false,
+ showToggle:false,
columns: [{
checkbox: true
},
@@ -73,13 +80,21 @@
field: 'deptId',
title: '鎵�灞炲簱鍖�',
align: 'left',
- // formatter: function(value, row, index) {
- // return $.table.tooltip(value);
- // }
+ //鏍规嵁deptList鍥炴樉璇楀彞
+ formatter: function(value, row, index) {
+ var deptName = '';
+ deptList.forEach(function (item) {
+ if (item.id == value) {
+ deptName = item.kqmc;
+ }
+ })
+ return $.table.tooltip(deptName);
+ }
+
},
{
- field: 'batchId',
- title: '鐝缂栧彿',
+ field: 'confName',
+ title: '鐝鍚嶇О',
align: 'left',
// formatter: function(value, row, index) {
// return $.table.tooltip(value);
@@ -97,8 +112,8 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>缂栬緫</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a>');
+ // actions.push('<a class="btn btn-success btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>缂栬緫</a> ');
+ // actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a>');
actions.push('<a class="btn btn-info btn-xs ' + '" href="javascript:void(0)" onclick="patrolDetail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>璇︽儏</a> ');
return actions.join('');
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html
index d52ebd8..1571d3a 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html
@@ -7,14 +7,14 @@
<body>
<div class="main-content">
<form id="form-patrol-add" class="form-horizontal">
- <input name="deptId" type="hidden" id="treeId"/>
+ <input name="userId" type="hidden" id="userId"/>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">鐝鍚嶇О锛�</label>
<div class="col-sm-8">
- <input name="batchName" id="batchName" placeholder="璇疯緭鍏�" class="form-control " type="text"
+ <input name="name" id="name" placeholder="璇疯緭鍏�" class="form-control " type="text"
maxlength="30" required>
</div>
</div>
@@ -23,8 +23,30 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">宸￠�讳汉锛�</label>
<div class="col-sm-8">
- <input name="userName" id="userName" placeholder="璇疯緭鍏�" class="form-control " type="text"
- maxlength="30" required>
+ <select name="userName" id="userName" class="form-control select2" multiple required onchange="changeUser(this)">
+ <option value="">璇烽�夋嫨宸￠�讳汉</option>
+ <option th:each="user : ${userList}" th:value="${user.userName}" th:data-userid="${user.userId}" th:text="${user.userName}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">寮�濮嬫椂闂达細</label>
+ <div class="col-sm-8">
+ <input name="start" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" data-type="datetime" class="form-control time-input" type="text"
+ required>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">缁撴潫鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <input name="end" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" data-type="datetime" class="form-control time-input" type="text"
+ required>
</div>
</div>
</div>
@@ -33,7 +55,7 @@
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: select2-js"/>
-<script>
+<script type="text/javascript">
var prefix = ctx + "security/patrol/patrolConf";
$("#form-cabinet-add").validate({
@@ -50,6 +72,13 @@
}
}
+ function changeUser(selectElement) {
+ var selectedOptions = Array.from(selectElement.selectedOptions);
+ var userIds = selectedOptions.map(option => option.getAttribute('data-userid')).filter(id => id);
+ var userIdStr = userIds.join(',');
+ $("#userId").val(userIdStr);
+ }
+
</script>
</body>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html
index 0bee380..f85f2ad 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html
@@ -7,13 +7,14 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-patrol-edit" th:object="${patrolConf}">
- <input id="id" name="id" th:field="*{batchId}" type="hidden">
+ <input id="id" name="id" th:field="*{id}" type="hidden">
+ <input name="userId" type="hidden" th:field="*{userId}" id="userId"/>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">鐝鍚嶇О锛�</label>
<div class="col-sm-8">
- <input name="batchName" id="batchName" th:field="*{batchName}" placeholder="璇疯緭鍏�" class="form-control "
+ <input name="name" id="name" th:field="*{name}" placeholder="璇疯緭鍏�" class="form-control "
type="text"
maxlength="30" required>
</div>
@@ -23,9 +24,34 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">宸￠�讳汉锛�</label>
<div class="col-sm-8">
- <input name="userName" id="userName" th:field="*{userName}" placeholder="璇疯緭鍏�" class="form-control "
- type="text"
- maxlength="30" required>
+ <select name="userName" id="userName" class="form-control select2" multiple required onchange="changeUser(this)">
+ <option value="">璇烽�夋嫨宸￠�讳汉</option>
+ <option th:each="user : ${userList}"
+ th:value="${user.userName}"
+ th:text="${user.userName}"
+ th:data-userid="${user.userId}"
+ th:selected="${#strings.contains(patrolConf.userId, user.userId)}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">寮�濮嬫椂闂达細</label>
+ <div class="col-sm-8">
+ <input id="start" name="startTime" th:value="*{#dates.format(start, 'yyyy-MM-dd HH:mm:ss')}" data-type="datetime" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" class="form-control time-input" type="text" required>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">缁撴潫鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <input id="end" name="endTime" th:value="*{#dates.format(end, 'yyyy-MM-dd HH:mm:ss')}" data-type="datetime" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" class="form-control time-input" type="text" required>
</div>
</div>
</div>
@@ -36,7 +62,6 @@
<th:block th:include="include :: footer"/>
<th:block th:include="include :: select2-js"/>
<script type="text/javascript">
-
var prefix = ctx + "security/patrol/patrolConf";
@@ -52,6 +77,14 @@
$.operate.save(prefix + "/edit", $('#form-patrol-edit').serialize());
}
}
+
+ function changeUser(selectElement) {
+ var selectedOptions = Array.from(selectElement.selectedOptions);
+ var userIds = selectedOptions.map(option => option.getAttribute('data-userid')).filter(id => id);
+ var userIdStr = userIds.join(',');
+ $("#userId").val(userIdStr);
+ }
+
</script>
</body>
</html>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html
index 5fdea66..b384424 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html
@@ -7,21 +7,21 @@
<body class="gray-bg">
<div class="container-div">
<div class="row">
- <div class="col-sm-12 search-collapse">
- <form id="property-form">
- <div class="select-list">
- <ul>
- <li>
- 鍚嶇О锛�<input type="text" name="name"/>
- </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="col-sm-12 search-collapse">-->
+<!-- <form id="property-form">-->
+<!-- <div class="select-list">-->
+<!-- <ul>-->
+<!-- <li>-->
+<!-- 鍚嶇О锛�<input type="text" name="name"/>-->
+<!-- </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-success" onclick="$.operate.add()" >
@@ -33,9 +33,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" >
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" >
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <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>
@@ -55,19 +55,23 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
- sortName: "batchId",
+ sortName: "id",
sortOrder: "asc",
modalName: "鍙傛暟",
+ showSearch:false,
+ showRefresh:false,
+ showColumns:false,
+ showToggle:false,
columns: [{
checkbox: true
},
{
- field: 'batchId',
+ field: 'id',
title: '涓婚敭',
visible: false,
},
{
- field: 'batchName',
+ field: 'name',
title: '鐝鍚嶇О',
align: 'left',
// formatter: function(value, row, index) {
@@ -86,8 +90,8 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.batchId + '\')"><i class="fa fa-edit"></i>缂栬緫</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.batchId + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a>');
+ actions.push('<a class="btn btn-success btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>缂栬緫</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a>');
return actions.join('');
}
}]
--
Gitblit v1.9.3