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 @@ --> -
+

上传模型

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 @@
+ -
+

上传模型

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}"> -
  • +
  •  搜索 @@ -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 @@ and t1.MonitorUnit_Id like concat('%', #{monitorunitId}, '%') and t1.MonitorUnit_Name like concat('%', #{monitorunitName}, '%') and t1.Parent_Id = #{parentId} - and t1.MonitorUnit_Type = #{monitorunitType} + and t1.MonitorUnit_Type = #{monitorunitType} and t1.Substation_Id = #{substationId} - and t1.Enable_Flag = #{enableFlag} - and Monitorunit_Status = #{monitorunitStatus} + and t1.Enable_Flag = #{enableFlag} + and t1.Monitorunit_Status = #{monitorunitStatus} order by t1.objId