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/patrol.html |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 21 deletions(-)

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>&nbsp;鎼滅储</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('');
                     }

--
Gitblit v1.9.3