From a421152bc0d20796d582e8daef82c0ac2c24c427 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Tue, 26 Apr 2022 21:58:42 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=9B=91=E6=8E=A7=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E4=BF=A1=E6=81=AF=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/base/monitorUnitInfo/add.html         |  4 ++--
 .../templates/base/monitorUnitInfo/edit.html        |  5 +++--
 .../base/monitorUnitInfo/monitorUnitInfo.html       | 13 ++++++++-----
 .../mapper/system/BaseMonitorunitInfoMapper.xml     |  6 +++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/add.html b/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/add.html
index 1a86ec4..a8a084e 100644
--- a/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/add.html
+++ b/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/add.html
@@ -57,14 +57,14 @@
                     </select>
                 </div>
             </div>-->
-            <div class="form-group">    
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">是否启用：</label>
                 <div class="col-sm-8">
                     <select name="enableFlag" class="form-control m-b" th:with="type=${@dict.getType('enable_flag')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
-            </div>
+            </div>-->
 
             <h4 class="form-header h4">上传模型</h4>
             <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/edit.html b/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/edit.html
index dfac15a..0e0c7a5 100644
--- a/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/edit.html
@@ -8,6 +8,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-monitorUnitInfo-edit" th:object="${baseMonitorunitInfo}">
             <input name="ObjId" th:field="*{objId}" type="hidden">
+            <input name="enableFlag" th:field="*{enableFlag}" type="hidden">
             <input id="monitorunitImage" name="monitorunitImage" th:field="*{monitorunitImage}" type="hidden">
             <input id="monitorunitId" name="monitorunitId" th:field="*{monitorunitId}" type="hidden">
             <!--<div class="form-group">
@@ -59,14 +60,14 @@
                     </select>
                 </div>
             </div>-->
-            <div class="form-group">    
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">是否启用：</label>
                 <div class="col-sm-8">
                     <select name="enableFlag" class="form-control m-b" th:with="type=${@dict.getType('enable_flag')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{enableFlag}"></option>
                     </select>
                 </div>
-            </div>
+            </div>-->
             <h4 class="form-header h4">上传模型</h4>
             <div class="form-group">
                 <div class="file-loading">
diff --git a/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/monitorUnitInfo.html b/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/monitorUnitInfo.html
index 119ed8b..53c50aa 100644
--- a/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/monitorUnitInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/monitorUnitInfo.html
@@ -44,14 +44,14 @@
                                         th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
-                        <li>
+                        <!--<li>
                             <label>是否启用：</label>
                             <select name="enableFlag" th:with="type=${@dict.getType('enable_flag')}">
                                 <option value="">所有</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                         th:value="${dict.dictValue}"></option>
                             </select>
-                        </li>
+                        </li>-->
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.treeTable.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
@@ -119,12 +119,13 @@
                     field: 'monitorunitName',
                     title: '监控单元',
                     align: 'left',
-                    width:'160'
+                    width:'160',
                 },
                 {
                     field: 'parentName',
                     title: '父级监控单元',
-                    align: 'left'
+                    align: 'left',
+                    width: '140',
                 },
                 {
                     field: 'monitorunitTypeName',
@@ -163,12 +164,14 @@
                     align: 'left',
                     formatter: function (value, row, index) {
                         return $.table.selectDictLabel(enableFlagDatas, value);
-                    }
+                    },
+                    visible: false
                 },
                 {
                     field: 'monitorunitId',
                     title: '监控单元编号',
                     align: 'left',
+                    width: '280',
                     visible: true
                 },
                 {
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseMonitorunitInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseMonitorunitInfoMapper.xml
index 061a5b9..8c738cd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseMonitorunitInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseMonitorunitInfoMapper.xml
@@ -69,10 +69,10 @@
             <if test="monitorunitId != null  and monitorunitId != ''"> and t1.MonitorUnit_Id like concat('%', #{monitorunitId}, '%')</if>
             <if test="monitorunitName != null  and monitorunitName != ''"> and t1.MonitorUnit_Name like concat('%', #{monitorunitName}, '%')</if>
             <if test="parentId != null  and parentId != ''"> and t1.Parent_Id = #{parentId}</if>
-            <if test="monitorunitType != null "> and t1.MonitorUnit_Type = #{monitorunitType}</if>
+            <if test="monitorunitType != null and monitorunitType != ''"> and t1.MonitorUnit_Type = #{monitorunitType}</if>
             <if test="substationId != null  and substationId != ''"> and t1.Substation_Id = #{substationId}</if>
-            <if test="enableFlag != null "> and t1.Enable_Flag = #{enableFlag}</if>
-            <if test="monitorunitStatus != null "> and Monitorunit_Status = #{monitorunitStatus}</if>
+            <if test="enableFlag != null and enableFlag != ''"> and t1.Enable_Flag = #{enableFlag}</if>
+            <if test="monitorunitStatus != null and monitorunitStatus != '' "> and t1.Monitorunit_Status = #{monitorunitStatus}</if>
         </where>
         order by t1.objId
     </select>