Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

告警中心-通知统计的人员统计上边距6px #2



See merge request !696

@@ -1729,7 +1729,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                                 templet: '#powerStateTpl',
                                 sort: true
                             },
-                            {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true},
+                            {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true,
+                               // lsq 运行状态显示为中文 2022-06-28
+                                templet: function (d) {
+                                    switch (d.runState) {
+                                        case 'notRunning':
+                                            return '未运行';
+                                        case 'running':
+                                            return '运行';
+                                        default:
+                                            return '';
+                                    }
+                                }},
                             {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
                             {field: 'resourcePool', title: '所属资源池', minWidth: x_140, align: 'center', sort: true},
                             {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
@@ -1863,7 +1874,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                     templet: '#powerStateTpl',
                     sort: true
                 },
-                {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true},
+                {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true,
+                    // lsq 运行状态显示为中文 2022-06-28
+                    templet: function (d) {
+                        switch (d.runState) {
+                            case 'notRunning':
+                                return '未运行';
+                            case 'running':
+                                return '运行';
+                            default:
+                                return '';
+                        }
+                    }},
                 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
                 {field: 'resourcePool', title: '所属资源池', minWidth: x_140, align: 'center', sort: true},
                 {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
@@ -4091,7 +4113,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                     templet: '#powerStateTpl',
                     sort: true
                 },
-                {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true},
+                {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true,
+                    // lsq 运行状态显示为中文 2022-06-28
+                    templet: function (d) {
+                        switch (d.runState) {
+                            case 'notRunning':
+                                return '未运行';
+                            case 'running':
+                                return '运行';
+                            default:
+                                return '';
+                        }
+                    }},
                 {field: 'ptName', title: '所属平台', minWidth: x_120, align: 'center', sort: true},
                 {field: 'resourcePool', title: '所属资源池', minWidth: x_150, align: 'center', sort: true},
                 {field: 'resRemark', title: '备注', minWidth: x_200, align: 'center'}

@@ -6057,7 +6057,7 @@ form.form-edit .layui-form-item .layui-input-inline {
 }
 /*lsq 健康状态样式 2022-06-27*/
 .info-box-count-res{
-    width:20%;
+    width:260px;
 }
 .info-box-count > label {
     color: #999;

@@ -24,7 +24,7 @@
                                     <div class="layui-input-inline layui-input-inline--long" >
                                         <button type="button" id="fav_keyword"
                                                 class="layui-btn layui-btn-normal layui-btn-normal">
-                                            搜索
+                                            查询
                                         </button>
                                     </div>
                                 </div>

@@ -64,7 +64,7 @@
                             </div>
                         </h5>
                         <table style="margin:0 3px;" id="table_notice_send_business" lay-filter="table_notice_send_business" ></table>
-                        <h5 class="lay-row-title">人员年统计</h5>
+                        <h5 class="lay-row-title" style="margin-top:6px;">人员年统计</h5>
                         <table style="margin:0 3px;"  id="table_notice_send_user" lay-filter="table_notice_send_user"></table>
 
                     </div>

@@ -331,6 +331,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                             }
                         }
                     }
+                    debugger
                     if (formWidth + 130 > winWidth) {
                         $('.openStow').css('display', 'inline-block')
                         $('.form-item-open-stow').css('height', '50px');