monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 364f3dbea2c5a4b46fd22071ac0c369ceef69960 2 parents 2d2f2c3f b4635ded

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 27 changed files with 542 additions and 94 deletions
@@ -1729,7 +1729,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -1729,7 +1729,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
1729 templet: '#powerStateTpl', 1729 templet: '#powerStateTpl',
1730 sort: true 1730 sort: true
1731 }, 1731 },
1732 - {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true}, 1732 + {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true,
  1733 + // lsq 运行状态显示为中文 2022-06-28
  1734 + templet: function (d) {
  1735 + switch (d.runState) {
  1736 + case 'notRunning':
  1737 + return '未运行';
  1738 + case 'running':
  1739 + return '运行';
  1740 + default:
  1741 + return '';
  1742 + }
  1743 + }},
1733 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true}, 1744 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
1734 {field: 'resourcePool', title: '所属资源池', minWidth: x_140, align: 'center', sort: true}, 1745 {field: 'resourcePool', title: '所属资源池', minWidth: x_140, align: 'center', sort: true},
1735 {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}, 1746 {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
@@ -1863,7 +1874,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -1863,7 +1874,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
1863 templet: '#powerStateTpl', 1874 templet: '#powerStateTpl',
1864 sort: true 1875 sort: true
1865 }, 1876 },
1866 - {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true}, 1877 + {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true,
  1878 + // lsq 运行状态显示为中文 2022-06-28
  1879 + templet: function (d) {
  1880 + switch (d.runState) {
  1881 + case 'notRunning':
  1882 + return '未运行';
  1883 + case 'running':
  1884 + return '运行';
  1885 + default:
  1886 + return '';
  1887 + }
  1888 + }},
1867 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true}, 1889 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
1868 {field: 'resourcePool', title: '所属资源池', minWidth: x_140, align: 'center', sort: true}, 1890 {field: 'resourcePool', title: '所属资源池', minWidth: x_140, align: 'center', sort: true},
1869 {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}, 1891 {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
@@ -4091,7 +4113,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -4091,7 +4113,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
4091 templet: '#powerStateTpl', 4113 templet: '#powerStateTpl',
4092 sort: true 4114 sort: true
4093 }, 4115 },
4094 - {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true}, 4116 + {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true,
  4117 + // lsq 运行状态显示为中文 2022-06-28
  4118 + templet: function (d) {
  4119 + switch (d.runState) {
  4120 + case 'notRunning':
  4121 + return '未运行';
  4122 + case 'running':
  4123 + return '运行';
  4124 + default:
  4125 + return '';
  4126 + }
  4127 + }},
4095 {field: 'ptName', title: '所属平台', minWidth: x_120, align: 'center', sort: true}, 4128 {field: 'ptName', title: '所属平台', minWidth: x_120, align: 'center', sort: true},
4096 {field: 'resourcePool', title: '所属资源池', minWidth: x_150, align: 'center', sort: true}, 4129 {field: 'resourcePool', title: '所属资源池', minWidth: x_150, align: 'center', sort: true},
4097 {field: 'resRemark', title: '备注', minWidth: x_200, align: 'center'} 4130 {field: 'resRemark', title: '备注', minWidth: x_200, align: 'center'}
@@ -59,7 +59,10 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' @@ -59,7 +59,10 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
59 reloadTable(); 59 reloadTable();
60 } 60 }
61 }); 61 });
62 - 62 + //lsq 域视图页增加搜索按钮 2022-06-27
  63 + $('#searchDomainIndex').unbind('click').on('click', function () {
  64 + reloadTable();
  65 + })
63 var loading = layer.load(2); 66 var loading = layer.load(2);
64 67
65 //this 68 //this
@@ -228,6 +231,46 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' @@ -228,6 +231,46 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
228 if ($.isFunction(fun)) { 231 if ($.isFunction(fun)) {
229 fun.call(this, data, node.data, options); 232 fun.call(this, data, node.data, options);
230 } 233 }
  234 + //start lsq 域视图搜索条件太多，增加展开/收起的功能 2022-06-27
  235 + let formWidth =$('.form-item-open-stow').width();
  236 + let elem=$('.form-item-open-stow');
  237 + if(elem){
  238 + for(let i=0;i<elem.length;i++){
  239 + if($(elem[i]).width()){
  240 + formWidth=$(elem[i]).width();
  241 + }
  242 + }
  243 + }
  244 + if(!formWidth){
  245 + formWidth= sessionStorage.getItem('formWidth');
  246 + }else{
  247 + sessionStorage.setItem('formWidth',formWidth)
  248 + }
  249 + let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
  250 + let elemW=$('.form-item-open-stow').parents('.layui-status');
  251 + if(elemW){
  252 + for(let i=0;i<elemW.length;i++){
  253 + if($(elemW[i]).width()){
  254 + winWidth=$(elemW[i]).width();
  255 + }
  256 + }
  257 + }
  258 + if (formWidth + 130 > winWidth) {
  259 + $('.openStow').css('display', 'inline-block')
  260 + $('.form-item-open-stow').css('height', '50px');
  261 + } else {
  262 + $('.openStow').css('display', 'none')
  263 + }
  264 + $(".openStow").unbind('click').on('click', function () {
  265 + if ($(this).text() == '展开') {
  266 + $(this).text('收起')
  267 + $('.form-item-open-stow').css('height', 'auto');
  268 + } else {
  269 + $(this).text('展开')
  270 + $('.form-item-open-stow').css('height', '50px');
  271 + }
  272 + })
  273 + //end lsq 2022-06-27
231 } 274 }
232 }); 275 });
233 loadParamSelect(); 276 loadParamSelect();
@@ -1320,6 +1363,10 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' @@ -1320,6 +1363,10 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
1320 renderTreeTable(domainId, curTreeNode.data.id) 1363 renderTreeTable(domainId, curTreeNode.data.id)
1321 } 1364 }
1322 }); 1365 });
  1366 + //lsq 域视图页增加搜索按钮 2022-06-27
  1367 + $('#searchDomainTreeTable').unbind('click').on('click', function () {
  1368 + renderTreeTable(domainId, curTreeNode.data.id);
  1369 + })
1323 //选择资源状态 1370 //选择资源状态
1324 form.on('select(domain_treetable_resStatus)', function (data) { 1371 form.on('select(domain_treetable_resStatus)', function (data) {
1325 renderTreeTable(domainId, curTreeNode.data.id); 1372 renderTreeTable(domainId, curTreeNode.data.id);
@@ -19,7 +19,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -19,7 +19,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
19 return false; 19 return false;
20 } 20 }
21 }); 21 });
22 - 22 + //lsq 关系视图页增加搜索按钮 2022-06-27
  23 + $('#searchRelationIndex').unbind('click').on('click', function () {
  24 + reloadTable();
  25 + return false;
  26 + })
23 // 资源类型下拉框 27 // 资源类型下拉框
24 common.resTypeXmSelect({ 28 common.resTypeXmSelect({
25 el: '#slt-relation-resType', 29 el: '#slt-relation-resType',
@@ -241,5 +245,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -241,5 +245,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
241 window.open(common.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + accessToken + '&id=' + jtopoId + "&layout=organic"); 245 window.open(common.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + accessToken + '&id=' + jtopoId + "&layout=organic");
242 } 246 }
243 247
  248 + //start lsq 关系视图搜索条件太多，增加展开/收起的功能 2022-06-27
  249 + let formWidth =$('.form-item-open-stow').width();
  250 + let elem=$('.form-item-open-stow');
  251 + if(elem){
  252 + for(let i=0;i<elem.length;i++){
  253 + if($(elem[i]).width()){
  254 + formWidth=$(elem[i]).width();
  255 + }
  256 + }
  257 + }
  258 + if(!formWidth){
  259 + formWidth= sessionStorage.getItem('formWidth');
  260 + }else{
  261 + sessionStorage.setItem('formWidth',formWidth)
  262 + }
  263 + let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
  264 + let elemW=$('.form-item-open-stow').parents('.layui-status');
  265 + if(elemW){
  266 + for(let i=0;i<elemW.length;i++){
  267 + if($(elemW[i]).width()){
  268 + winWidth=$(elemW[i]).width();
  269 + }
  270 + }
  271 + }
  272 + if (formWidth + 130 > winWidth) {
  273 + $('.openStow').css('display', 'inline-block')
  274 + $('.form-item-open-stow').css('height', '50px');
  275 + } else {
  276 + $('.openStow').css('display', 'none')
  277 + }
  278 + $(".openStow").unbind('click').on('click', function () {
  279 + if ($(this).text() == '展开') {
  280 + $(this).text('收起')
  281 + $('.form-item-open-stow').css('height', 'auto');
  282 + } else {
  283 + $(this).text('展开')
  284 + $('.form-item-open-stow').css('height', '50px');
  285 + }
  286 + })
  287 + //end lsq 2022-06-27
  288 +
244 }); 289 });
245 }); 290 });
@@ -137,8 +137,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -137,8 +137,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
137 } 137 }
138 }); 138 });
139 } 139 }
140 -  
141 -  
142 //回选树节点 140 //回选树节点
143 function selectedTreeNode(target) { 141 function selectedTreeNode(target) {
144 var el = $(target).find('.layui-tree-txt'); 142 var el = $(target).find('.layui-tree-txt');
@@ -173,7 +171,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -173,7 +171,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
173 reloadTable(); 171 reloadTable();
174 } 172 }
175 }); 173 });
176 - 174 + //lsq 资源管理页增加搜索按钮 2022-06-27
  175 + $('#searchResmanageIndex').unbind('click').on('click', function () {
  176 + reloadTable();
  177 + })
177 //按钮搜索 178 //按钮搜索
178 $('#resmanageQueryBtn').unbind().on('click', function (e) { 179 $('#resmanageQueryBtn').unbind().on('click', function (e) {
179 reloadTable(); 180 reloadTable();
@@ -2037,6 +2038,49 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -2037,6 +2038,49 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
2037 common.openWin(url, name, params, null, null, null, ['80%', '80%']); 2038 common.openWin(url, name, params, null, null, null, ['80%', '80%']);
2038 }); 2039 });
2039 } 2040 }
2040 - 2041 + //lsq 展开/收起功能
  2042 + function openStow(){
  2043 + //start lsq 资源管理搜索条件太多，增加展开/收起的功能 2022-06-27
  2044 + let formWidth =$('.form-item-open-stow').width();
  2045 + let elem=$('.form-item-open-stow');
  2046 + if(elem){
  2047 + for(let i=0;i<elem.length;i++){
  2048 + if($(elem[i]).width()){
  2049 + formWidth=$(elem[i]).width();
  2050 + }
  2051 + }
  2052 + }
  2053 + if(!formWidth){
  2054 + formWidth= sessionStorage.getItem('formWidth');
  2055 + }else{
  2056 + sessionStorage.setItem('formWidth',formWidth)
  2057 + }
  2058 + let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
  2059 + let elemW=$('.form-item-open-stow').parents('.layui-status');
  2060 + if(elemW){
  2061 + for(let i=0;i<elemW.length;i++){
  2062 + if($(elemW[i]).width()){
  2063 + winWidth=$(elemW[i]).width();
  2064 + }
  2065 + }
  2066 + }
  2067 + if (formWidth + 130 > winWidth) {
  2068 + $('.openStow').css('display', 'inline-block')
  2069 + $('.form-item-open-stow').css('height', '50px');
  2070 + } else {
  2071 + $('.openStow').css('display', 'none')
  2072 + }
  2073 + $(".openStow").unbind('click').on('click', function () {
  2074 + if ($(this).text() == '展开') {
  2075 + $(this).text('收起')
  2076 + $('.form-item-open-stow').css('height', 'auto');
  2077 + } else {
  2078 + $(this).text('展开')
  2079 + $('.form-item-open-stow').css('height', '50px');
  2080 + }
  2081 + })
  2082 + //end lsq 2022-06-27
  2083 + }
  2084 + openStow();
2041 }); 2085 });
2042 }); 2086 });
@@ -3839,6 +3839,8 @@ grayColor { @@ -3839,6 +3839,8 @@ grayColor {
3839 background-color: #f1f1f1; 3839 background-color: #f1f1f1;
3840 /*lsq 活动告警列表卡片样式调整 2022-06-21*/ 3840 /*lsq 活动告警列表卡片样式调整 2022-06-21*/
3841 min-height: 74px; 3841 min-height: 74px;
  3842 + z-index: 99;
  3843 + position: relative;
3842 } 3844 }
3843 3845
3844 .warn-count-item { 3846 .warn-count-item {
@@ -5486,6 +5488,13 @@ grayColor { @@ -5486,6 +5488,13 @@ grayColor {
5486 .favorites-container .breadcrumb a:hover, .favorites-container .breadcrumb a.active { 5488 .favorites-container .breadcrumb a:hover, .favorites-container .breadcrumb a.active {
5487 color: #09ABEA !important; 5489 color: #09ABEA !important;
5488 } 5490 }
  5491 +.favorites-container .layui-card-header .layui-status .layui-form-item{
  5492 + display:flex!important;
  5493 + align-items: center;
  5494 +}
  5495 +.favorites-container .layui-form-item .layui-inline{
  5496 + margin-bottom: 0;
  5497 +}
5489 5498
5490 .layout-nav-hide .layui-header, .layout-nav-hide .layui-side-menu, .layout-nav-hide .layadmin-pagetabs { 5499 .layout-nav-hide .layui-header, .layout-nav-hide .layui-side-menu, .layout-nav-hide .layadmin-pagetabs {
5491 display: none; 5500 display: none;
@@ -6046,7 +6055,10 @@ form.form-edit .layui-form-item .layui-input-inline { @@ -6046,7 +6055,10 @@ form.form-edit .layui-form-item .layui-input-inline {
6046 width: 18%; 6055 width: 18%;
6047 display: inline-block; 6056 display: inline-block;
6048 } 6057 }
6049 - 6058 +/*lsq 健康状态样式 2022-06-27*/
  6059 +.info-box-count-res{
  6060 + width:260px;
  6061 +}
6050 .info-box-count > label { 6062 .info-box-count > label {
6051 color: #999; 6063 color: #999;
6052 font-size: 14px; 6064 font-size: 14px;
@@ -8297,26 +8309,40 @@ form[lay-filter="notice_search_form"] .layui-inline, form[lay-filter="noticemerg @@ -8297,26 +8309,40 @@ form[lay-filter="notice_search_form"] .layui-inline, form[lay-filter="noticemerg
8297 margin-top: 5px; 8309 margin-top: 5px;
8298 } 8310 }
8299 8311
8300 -form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] { 8312 +form.layui-card-header.layuiadmin-card-header-auto {
8301 display: flex; 8313 display: flex;
8302 justify-content: flex-start; 8314 justify-content: flex-start;
8303 } 8315 }
8304 8316
8305 -#seachActiveWarning, #seachHistoryWarning { 8317 +.searchButton {
8306 margin-top: 6px; 8318 margin-top: 6px;
8307 margin-right: 6px; 8319 margin-right: 6px;
8308 } 8320 }
8309 8321
8310 -#openStow, #openStowHis { 8322 +.openStow {
8311 color: #1E9FFF; 8323 color: #1E9FFF;
8312 cursor: pointer; 8324 cursor: pointer;
8313 line-height: 50px; 8325 line-height: 50px;
  8326 + width:45px;
  8327 +}
  8328 +.form-item-open-stow{
  8329 + flex:1;
8314 } 8330 }
8315 -  
8316 #noticeSearchQueryBtn, #seachNoticemerge { 8331 #noticeSearchQueryBtn, #seachNoticemerge {
8317 margin-top: -3px; 8332 margin-top: -3px;
8318 } 8333 }
  8334 +.noticeCount-lay-row-title{
  8335 + display: flex;
  8336 + align-items: center;
  8337 + justify-content: space-between;
  8338 +}
  8339 +.noticeCount-lay-row-title .layui-btn-group{
  8340 + margin-right: 0;
  8341 +}
8319 8342
  8343 +.layui-card .noticeCount-table .layui-table-view{
  8344 + margin:0 3px;
  8345 +}
8320 #queryMore { 8346 #queryMore {
8321 cursor: pointer; 8347 cursor: pointer;
8322 } 8348 }
@@ -8506,3 +8532,20 @@ form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] { @@ -8506,3 +8532,20 @@ form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] {
8506 } 8532 }
8507 8533
8508 /* //End XuHaoJie 2022/2/17 9:51 TODO 即时消息结束*/ 8534 /* //End XuHaoJie 2022/2/17 9:51 TODO 即时消息结束*/
  8535 +/*lsq 资源视图页面搜索栏样式调整 2022-06-27*/
  8536 +.resIndexMain .layui-form-item .layui-inline,
  8537 +.bizIndexMain .layui-form-item .layui-inline,
  8538 +.relation .layui-form-item .layui-inline,
  8539 +.res .layui-form-item .layui-inline{
  8540 + margin-top:6px;
  8541 +}
  8542 +/*lsq 关系视图搜索栏样式调整 2022-06-27*/
  8543 +.relation .layui-form-item .layui-inline{
  8544 + margin-bottom: 6px;
  8545 +}
  8546 +.layui-status .resIndex-input{
  8547 + width: auto;
  8548 +}
  8549 +.res .layui-card-body{
  8550 + background: #ffffff;
  8551 +}
@@ -103,11 +103,11 @@ @@ -103,11 +103,11 @@
103 </div> 103 </div>
104 </div> 104 </div>
105 <!--lsq 活动告警增加搜索按钮 2022-06-21--> 105 <!--lsq 活动告警增加搜索按钮 2022-06-21-->
106 - <button class="layui-btn layui-btn-normal layui-btn-normal" id="seachActiveWarning" 106 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="seachActiveWarning"
107 type="button"> 107 type="button">
108 查询 108 查询
109 </button> 109 </button>
110 - <span id="openStow">展开</span> 110 + <span class="openStow">展开</span>
111 </form> 111 </form>
112 </div> 112 </div>
113 </div> 113 </div>
@@ -95,11 +95,11 @@ @@ -95,11 +95,11 @@
95 </div> 95 </div>
96 </div> 96 </div>
97 <!--lsq 历史告警增加搜索按钮 2022-06-21--> 97 <!--lsq 历史告警增加搜索按钮 2022-06-21-->
98 - <button class="layui-btn layui-btn-normal layui-btn-normal" id="seachHistoryWarning" 98 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="seachHistoryWarning"
99 type="button"> 99 type="button">
100 查询 100 查询
101 </button> 101 </button>
102 - <span id="openStowHis">展开</span> 102 + <span class="openStow">展开</span>
103 </form> 103 </form>
104 </div> 104 </div>
105 </div> 105 </div>
@@ -58,8 +58,8 @@ @@ -58,8 +58,8 @@
58 </div> 58 </div>
59 <div class="layui-inline"> 59 <div class="layui-inline">
60 <button class="layui-btn layui-btn-normal" id="noticeSearchQueryBtn" type="button"> 60 <button class="layui-btn layui-btn-normal" id="noticeSearchQueryBtn" type="button">
61 - <i  
62 - class="layui-icon layui-icon-search"></i>查询 61 + <!-- lsq 注释掉查询按钮的图标 2022-06-27 <i class="layui-icon layui-icon-search"></i>-->
  62 + 查询
63 </button> 63 </button>
64 </div> 64 </div>
65 </div> 65 </div>
@@ -17,7 +17,8 @@ @@ -17,7 +17,8 @@
17 <div class="layui-status"> 17 <div class="layui-status">
18 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 18 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
19 id="resManageIndexForm"> 19 id="resManageIndexForm">
20 - <div class="layui-form-item"> 20 + <div class="form-item-open-stow">
  21 + <div class="layui-form-item">
21 <div class="layui-inline"> 22 <div class="layui-inline">
22 <div class="layui-input-inline"> 23 <div class="layui-input-inline">
23 <input autocomplete="off" class="layui-input" lay-tips="关键字检索包含 </br>资源名称</br>ip地址</br>管理ip地址</br>备注" 24 <input autocomplete="off" class="layui-input" lay-tips="关键字检索包含 </br>资源名称</br>ip地址</br>管理ip地址</br>备注"
@@ -77,12 +78,20 @@ @@ -77,12 +78,20 @@
77 </select> 78 </select>
78 </div> 79 </div>
79 </div> 80 </div>
80 - <div class="layui-inline">  
81 - <button class="layui-btn layui-btn-normal" id="resmanageQueryBtn" type="button"><i  
82 - class="layui-icon layui-icon-search"></i>查询 81 + <!--<div class="layui-inline">
  82 + <button class="layui-btn layui-btn-normal" id="resmanageQueryBtn" type="button">
  83 + &lt;!&ndash;lsq 取消掉查询按钮的图标 2022-06-27&ndash;&gt;
  84 + 查询
83 </button> 85 </button>
84 - </div> 86 + </div>-->
85 </div> 87 </div>
  88 + </div>
  89 + <!--lsq 资源管理增加展开/收起按钮 2022-06-27-->
  90 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchResmanageIndex"
  91 + type="button">
  92 + 查询
  93 + </button>
  94 + <span class="openStow">展开</span>
86 </form> 95 </form>
87 </div> 96 </div>
88 </div> 97 </div>
@@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
20 <!--</div>--> 20 <!--</div>-->
21 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 21 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
22 lay-filter="biz-list-form"> 22 lay-filter="biz-list-form">
23 - <div class="layui-form-item"> 23 + <div class="form-item-open-stow">
  24 + <div class="layui-form-item">
24 <div class="layui-inline"> 25 <div class="layui-inline">
25 <div class="layui-input-inline"> 26 <div class="layui-input-inline">
26 <input autocomplete="off" class="layui-input" id="bizindex_keyword" 27 <input autocomplete="off" class="layui-input" id="bizindex_keyword"
@@ -90,6 +91,13 @@ @@ -90,6 +91,13 @@
90 </div> 91 </div>
91 </div> 92 </div>
92 </div> 93 </div>
  94 + </div>
  95 + <!--lsq 业务列表增加搜索按钮 2022-06-27-->
  96 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchBizIndex"
  97 + type="button">
  98 + 查询
  99 + </button>
  100 + <span class="openStow">展开</span>
93 </form> 101 </form>
94 </div> 102 </div>
95 </div> 103 </div>
@@ -105,7 +113,8 @@ @@ -105,7 +113,8 @@
105 <div class="layui-status"> 113 <div class="layui-status">
106 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 114 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
107 lay-filter="res-list-form"> 115 lay-filter="res-list-form">
108 - <div class="layui-form-item"> 116 + <div class="form-item-open-stow">
  117 + <div class="layui-form-item">
109 <div class="layui-inline"> 118 <div class="layui-inline">
110 <div class="layui-input-inline"> 119 <div class="layui-input-inline">
111 <input autocomplete="off" class="layui-input" id="biz_treetable_keyword" 120 <input autocomplete="off" class="layui-input" id="biz_treetable_keyword"
@@ -155,6 +164,13 @@ @@ -155,6 +164,13 @@
155 </div> 164 </div>
156 </div> 165 </div>
157 </div> 166 </div>
  167 + </div>
  168 + <!--lsq 业务列表增加搜索按钮 2022-06-27-->
  169 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchBizTreeTable"
  170 + type="button">
  171 + 查询
  172 + </button>
  173 + <span class="openStow">展开</span>
158 </form> 174 </form>
159 </div> 175 </div>
160 </div> 176 </div>
@@ -38,7 +38,8 @@ @@ -38,7 +38,8 @@
38 <!--</div>--> 38 <!--</div>-->
39 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 39 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
40 lay-filter="domain-list-form"> 40 lay-filter="domain-list-form">
41 - <div class="layui-form-item"> 41 + <div class="form-item-open-stow">
  42 + <div class="layui-form-item">
42 <div class="layui-inline"> 43 <div class="layui-inline">
43 <div class="layui-input-inline"> 44 <div class="layui-input-inline">
44 <input autocomplete="off" class="layui-input" id="domainindex_keyword" 45 <input autocomplete="off" class="layui-input" id="domainindex_keyword"
@@ -108,6 +109,13 @@ @@ -108,6 +109,13 @@
108 <!-- </div>--> 109 <!-- </div>-->
109 <!-- </div>--> 110 <!-- </div>-->
110 </div> 111 </div>
  112 + </div>
  113 + <!--lsq 域视图增加搜索按钮 2022-06-27-->
  114 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchDomainIndex"
  115 + type="button">
  116 + 查询
  117 + </button>
  118 + <span class="openStow">展开</span>
111 </form> 119 </form>
112 </div> 120 </div>
113 </div> 121 </div>
@@ -123,7 +131,8 @@ @@ -123,7 +131,8 @@
123 <div class="layui-status"> 131 <div class="layui-status">
124 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 132 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
125 lay-filter="res-list-form"> 133 lay-filter="res-list-form">
126 - <div class="layui-form-item"> 134 + <div class="form-item-open-stow">
  135 + <div class="layui-form-item">
127 <div class="layui-inline"> 136 <div class="layui-inline">
128 <div class="layui-input-inline"> 137 <div class="layui-input-inline">
129 <input autocomplete="off" class="layui-input" id="domain_treetable_keyword" 138 <input autocomplete="off" class="layui-input" id="domain_treetable_keyword"
@@ -161,6 +170,13 @@ @@ -161,6 +170,13 @@
161 </div> 170 </div>
162 </div> 171 </div>
163 </div> 172 </div>
  173 + </div>
  174 + <!--lsq 域视图增加搜索按钮 2022-06-27-->
  175 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchDomainTreeTable"
  176 + type="button">
  177 + 查询
  178 + </button>
  179 + <span class="openStow">展开</span>
164 </form> 180 </form>
165 </div> 181 </div>
166 </div> 182 </div>
@@ -469,14 +485,14 @@ @@ -469,14 +485,14 @@
469 </script> 485 </script>
470 <script id="domainList-top-head-info-tpl" type="text/html"> 486 <script id="domainList-top-head-info-tpl" type="text/html">
471 <div class="layui-card-header top-head-info"> 487 <div class="layui-card-header top-head-info">
472 - <div class="info-box-count"> 488 + <div class="info-box-count info-box-count-res">
473 <i></i> 489 <i></i>
474 <label>资源总量</label> 490 <label>资源总量</label>
475 <div class="num"> 491 <div class="num">
476 <span lay-tips="资源总量" id="total_domain"></span> 492 <span lay-tips="资源总量" id="total_domain"></span>
477 </div> 493 </div>
478 </div> 494 </div>
479 - <div class="info-box-count"> 495 + <div class="info-box-count info-box-count-res">
480 <i></i> 496 <i></i>
481 <label>健康状态</label> 497 <label>健康状态</label>
482 <div class="num"> 498 <div class="num">
@@ -490,7 +506,7 @@ @@ -490,7 +506,7 @@
490 id="healthNone_domain">0</span> 506 id="healthNone_domain">0</span>
491 </div> 507 </div>
492 </div> 508 </div>
493 - <div class="info-box-count"> 509 + <div class="info-box-count info-box-count-res">
494 <i></i> 510 <i></i>
495 <label>资源状态</label> 511 <label>资源状态</label>
496 <div class="num"> 512 <div class="num">
@@ -503,7 +519,7 @@ @@ -503,7 +519,7 @@
503 519
504 </div> 520 </div>
505 </div> 521 </div>
506 - <div class="info-box-count"> 522 + <div class="info-box-count info-box-count-res">
507 <i></i> 523 <i></i>
508 <label>连接状态</label> 524 <label>连接状态</label>
509 <div class="num"> 525 <div class="num">
@@ -21,10 +21,10 @@ @@ -21,10 +21,10 @@
21 </div> 21 </div>
22 </div> 22 </div>
23 <div class="layui-inline favorite-cards"> 23 <div class="layui-inline favorite-cards">
24 - <div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;"> 24 + <div class="layui-input-inline layui-input-inline--long" >
25 <button type="button" id="fav_keyword" 25 <button type="button" id="fav_keyword"
26 class="layui-btn layui-btn-normal layui-btn-normal"> 26 class="layui-btn layui-btn-normal layui-btn-normal">
27 - 搜索 27 + 查询
28 </button> 28 </button>
29 </div> 29 </div>
30 </div> 30 </div>
@@ -44,25 +44,28 @@ @@ -44,25 +44,28 @@
44 </div> 44 </div>
45 </div> 45 </div>
46 </div> 46 </div>
47 - <div class="layui-card-body" style="margin-top: 5px;height: 40px">  
48 - <div class="layui-btn-group time-group" id="noticeCount_time_table_id"  
49 - style="float: right;margin-right: 20px;">  
50 - <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastYear"  
51 - type="button">去年  
52 - </button>  
53 - <button class="layui-btn layui-btn-primary layui-btn-sm active" data-period="year"  
54 - type="button">今年  
55 - </button>  
56 - <div class="layui-btn layui-btn-primary layui-btn-sm" id="exportNoticeCountBtn"  
57 - lay-tips="导出"><i class="layui-icon">&#xe60a;</i>导出 47 +
  48 + <div class="layui-card-body noticeCount-table" id="table_notice_send_year" style="margin-top: 5px;background: #fff;">
  49 + <h5 class="lay-row-title noticeCount-lay-row-title">
  50 + 业务子系统年统计
  51 + <!--lsq 调整样式 2022-06-27-->
  52 + <div class="layui-card-body" style="margin-top: 5px;height: 40px">
  53 + <div class="layui-btn-group time-group" id="noticeCount_time_table_id">
  54 + <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastYear"
  55 + type="button">去年
  56 + </button>
  57 + <button class="layui-btn layui-btn-primary layui-btn-sm active" data-period="year"
  58 + type="button">今年
  59 + </button>
  60 + <div class="layui-btn layui-btn-primary layui-btn-sm" id="exportNoticeCountBtn"
  61 + lay-tips="导出"><i class="layui-icon">&#xe60a;</i>导出
  62 + </div>
  63 + </div>
58 </div> 64 </div>
59 - </div>  
60 - </div>  
61 - <div class="layui-card-body noticeCount-table" id="table_notice_send_year" style="margin-top: 5px">  
62 - <h5 class="lay-row-title">业务子系统年统计</h5>  
63 - <table id="table_notice_send_business" lay-filter="table_notice_send_business"></table>  
64 - <h5 class="lay-row-title">人员年统计</h5>  
65 - <table id="table_notice_send_user" lay-filter="table_notice_send_user"></table> 65 + </h5>
  66 + <table style="margin:0 3px;" id="table_notice_send_business" lay-filter="table_notice_send_business" ></table>
  67 + <h5 class="lay-row-title" style="margin-top:6px;">人员年统计</h5>
  68 + <table style="margin:0 3px;" id="table_notice_send_user" lay-filter="table_notice_send_user"></table>
66 69
67 </div> 70 </div>
68 </div> 71 </div>
@@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
20 <div class="layui-input-inline layui-input-inline-sm"> 20 <div class="layui-input-inline layui-input-inline-sm">
21 <button class="layui-btn layui-btn-normal layui-btn-normal" id="seachNoticemerge" 21 <button class="layui-btn layui-btn-normal layui-btn-normal" id="seachNoticemerge"
22 type="button"> 22 type="button">
23 - 搜索 23 + <!-- lsq 搜索更改为查询 2022-06-27-->
  24 + 查询
24 </button> 25 </button>
25 </div> 26 </div>
26 </div> 27 </div>
@@ -71,7 +71,8 @@ @@ -71,7 +71,8 @@
71 <div class="layui-status"> 71 <div class="layui-status">
72 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 72 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
73 lay-filter="res-list-form"> 73 lay-filter="res-list-form">
74 - <div class="layui-form-item"> 74 + <div class="form-item-open-stow">
  75 + <div class="layui-form-item">
75 <div class="layui-inline"> 76 <div class="layui-inline">
76 <div class="layui-input-inline"> 77 <div class="layui-input-inline">
77 <input autocomplete="off" class="layui-input" id="resindex_keyword" 78 <input autocomplete="off" class="layui-input" id="resindex_keyword"
@@ -133,13 +134,13 @@ @@ -133,13 +134,13 @@
133 </select> 134 </select>
134 </div> 135 </div>
135 </div> 136 </div>
136 - <div class="layui-inline layui-input-inline--long"> 137 + <div class="layui-inline layui-input-inline--long resIndex-input">
137 <!-- <div class="layui-input-inline">--> 138 <!-- <div class="layui-input-inline">-->
138 <!-- <select name="label" id="resListBizTypes" lay-filter="resListBizTypes">--> 139 <!-- <select name="label" id="resListBizTypes" lay-filter="resListBizTypes">-->
139 <!-- <option value="">=所属业务=</option>--> 140 <!-- <option value="">=所属业务=</option>-->
140 <!-- </select>--> 141 <!-- </select>-->
141 <!-- </div>--> 142 <!-- </div>-->
142 - <div class="layui-input-inline layui-input-inline--long"> 143 + <div class="layui-input-inline layui-input-inline--long resIndex-input">
143 <div class="xm-select-demo" id="resListBizTypes"></div> 144 <div class="xm-select-demo" id="resListBizTypes"></div>
144 </div> 145 </div>
145 </div> 146 </div>
@@ -201,6 +202,13 @@ @@ -201,6 +202,13 @@
201 </div> 202 </div>
202 </div> 203 </div>
203 </div> 204 </div>
  205 + </div>
  206 + <!--lsq 资源列表增加搜索按钮 2022-06-27-->
  207 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchResIndex"
  208 + type="button">
  209 + 查询
  210 + </button>
  211 + <span class="openStow">展开</span>
204 </form> 212 </form>
205 </div> 213 </div>
206 </div> 214 </div>
@@ -216,7 +224,8 @@ @@ -216,7 +224,8 @@
216 <div class="layui-status"> 224 <div class="layui-status">
217 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 225 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
218 lay-filter="res-list-form"> 226 lay-filter="res-list-form">
219 - <div class="layui-form-item"> 227 + <div class="form-item-open-stow">
  228 + <div class="layui-form-item">
220 <div class="layui-inline"> 229 <div class="layui-inline">
221 <div class="layui-input-inline"> 230 <div class="layui-input-inline">
222 <input autocomplete="off" class="layui-input" id="treetable_keyword" name="title" 231 <input autocomplete="off" class="layui-input" id="treetable_keyword" name="title"
@@ -269,6 +278,13 @@ @@ -269,6 +278,13 @@
269 </div> 278 </div>
270 </div> 279 </div>
271 </div> 280 </div>
  281 + </div>
  282 + <!--lsq 资源列表增加搜索按钮 2022-06-27-->
  283 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchResTreeTable"
  284 + type="button">
  285 + 查询
  286 + </button>
  287 + <span class="openStow">展开</span>
272 </form> 288 </form>
273 </div> 289 </div>
274 </div> 290 </div>
@@ -380,14 +396,14 @@ @@ -380,14 +396,14 @@
380 </script> 396 </script>
381 <script id="resList-top-head-info-tpl" type="text/html"> 397 <script id="resList-top-head-info-tpl" type="text/html">
382 <div class="layui-card-header top-head-info"> 398 <div class="layui-card-header top-head-info">
383 - <div class="info-box-count"> 399 + <div class="info-box-count info-box-count-res">
384 <i></i> 400 <i></i>
385 <label>资源总量</label> 401 <label>资源总量</label>
386 <div class="num"> 402 <div class="num">
387 <span lay-tips="资源总量" id="total_res">0</span> 403 <span lay-tips="资源总量" id="total_res">0</span>
388 </div> 404 </div>
389 </div> 405 </div>
390 - <div class="info-box-count"> 406 + <div class="info-box-count info-box-count-res">
391 <i></i> 407 <i></i>
392 <label>健康状态</label> 408 <label>健康状态</label>
393 <div class="num"> 409 <div class="num">
@@ -398,7 +414,7 @@ @@ -398,7 +414,7 @@
398 id="healthNone_res">0</span> 414 id="healthNone_res">0</span>
399 </div> 415 </div>
400 </div> 416 </div>
401 - <div class="info-box-count"> 417 + <div class="info-box-count info-box-count-res">
402 <i></i> 418 <i></i>
403 <label>资源状态</label> 419 <label>资源状态</label>
404 <div class="num"> 420 <div class="num">
@@ -436,14 +452,14 @@ @@ -436,14 +452,14 @@
436 </script> 452 </script>
437 <script id="resTreeList-top-head-info-tpl" type="text/html"> 453 <script id="resTreeList-top-head-info-tpl" type="text/html">
438 <div class="layui-card-header top-head-info"> 454 <div class="layui-card-header top-head-info">
439 - <div class="info-box-count"> 455 + <div class="info-box-count info-box-count-res">
440 <i></i> 456 <i></i>
441 <label>资源总量</label> 457 <label>资源总量</label>
442 <div class="num"> 458 <div class="num">
443 <span lay-tips="资源总量" id="tree_total_res">0</span> 459 <span lay-tips="资源总量" id="tree_total_res">0</span>
444 </div> 460 </div>
445 </div> 461 </div>
446 - <div class="info-box-count"> 462 + <div class="info-box-count info-box-count-res">
447 <i></i> 463 <i></i>
448 <label>健康状态</label> 464 <label>健康状态</label>
449 <div class="num"> 465 <div class="num">
@@ -457,7 +473,7 @@ @@ -457,7 +473,7 @@
457 id="tree_healthNone_res">0</span> 473 id="tree_healthNone_res">0</span>
458 </div> 474 </div>
459 </div> 475 </div>
460 - <div class="info-box-count"> 476 + <div class="info-box-count info-box-count-res">
461 <i></i> 477 <i></i>
462 <label>资源状态</label> 478 <label>资源状态</label>
463 <div class="num"> 479 <div class="num">
1 <title>关系视图</title> 1 <title>关系视图</title>
2 <article class="page-container"> 2 <article class="page-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 - <div class="main"> 4 + <div class="main relation">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status"> 7 <div class="layui-status">
8 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 8 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
9 lay-filter="form-relation-condition"> 9 lay-filter="form-relation-condition">
10 - <div class="layui-form-item"> 10 + <div class="form-item-open-stow">
  11 + <div class="layui-form-item">
11 <div class="layui-inline"> 12 <div class="layui-inline">
12 <div class="layui-input-inline"> 13 <div class="layui-input-inline">
13 <input autocomplete="off" class="layui-input" lay-tips="关键字检索包含： </br>资源名称" 14 <input autocomplete="off" class="layui-input" lay-tips="关键字检索包含： </br>资源名称"
@@ -25,6 +26,13 @@ @@ -25,6 +26,13 @@
25 </div> 26 </div>
26 </div> 27 </div>
27 </div> 28 </div>
  29 + </div>
  30 + <!--lsq 域视图增加搜索按钮 2022-06-27-->
  31 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchRelationIndex"
  32 + type="button">
  33 + 查询
  34 + </button>
  35 + <span class="openStow">展开</span>
28 </form> 36 </form>
29 </div> 37 </div>
30 </div> 38 </div>
@@ -61,7 +61,13 @@ @@ -61,7 +61,13 @@
61 margin-bottom: 3px !important; 61 margin-bottom: 3px !important;
62 /*width: 250px !important;*/ 62 /*width: 250px !important;*/
63 } 63 }
64 - 64 +/*lsq esData下的搜索条件栏样式调整 2022-06-27*/
  65 +.container .cm-card .search .condition.esData-conditon div {
  66 + margin-bottom: 0px !important;
  67 +}
  68 +.container .cm-card .search .condition.esData-conditon{
  69 + margin-bottom: 3px;
  70 +}
65 .container .cm-card .search .btns { 71 .container .cm-card .search .btns {
66 width: 200px; 72 width: 200px;
67 display: flex; 73 display: flex;
@@ -153,3 +159,8 @@ custom-class="config-dialog" @@ -153,3 +159,8 @@ custom-class="config-dialog"
153 .tree-table .el-table .el-table__cell.is-center div { 159 .tree-table .el-table .el-table__cell.is-center div {
154 justify-content: center; 160 justify-content: center;
155 } 161 }
  162 +/*lsq 资产视图下搜索栏样式调整 2022-06-27*/
  163 +.resList-form.el-form--inline .el-form-item{
  164 + align-items: center;
  165 + margin-right:6px;
  166 +}
1 <div> 1 <div>
2 - <el-select :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter" 2 + <el-select :size="$global.elementConfig.size.input" :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
3 :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="所属系统" 3 :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="所属系统"
4 style="min-width: 120px;" v-model="modelValueLabel"> 4 style="min-width: 120px;" v-model="modelValueLabel">
5 <el-option :value="modelValue" style="height: auto;padding: 0;"> 5 <el-option :value="modelValue" style="height: auto;padding: 0;">
1 <div> 1 <div>
2 - <el-select :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter" 2 + <el-select :size="$global.elementConfig.size.input" :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
3 :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="资源类型" 3 :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="资源类型"
4 style="min-width: 120px;" v-model="modelValueLabel"> 4 style="min-width: 120px;" v-model="modelValueLabel">
5 <el-option :value="modelValue" style="height: auto;padding: 0;"> 5 <el-option :value="modelValue" style="height: auto;padding: 0;">
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 v-else v-model="search.keyword"></el-input> 24 v-else v-model="search.keyword"></el-input>
25 </el-form-item> 25 </el-form-item>
26 <el-form-item> 26 <el-form-item>
27 - <el-button :size="$global.elementConfig.size.button" @click="getDataList(statusVal)">查询</el-button> 27 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList(statusVal)">查询</el-button>
28 </el-form-item> 28 </el-form-item>
29 </div> 29 </div>
30 </div> 30 </div>
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="请输入关键字" style="margin-top:5px;"></el-input> 6 <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="请输入关键字" style="margin-top:5px;"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item > 8 <el-form-item >
9 - <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button> 9 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button>
10 </el-form-item> 10 </el-form-item>
11 </div> 11 </div>
12 </div> 12 </div>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px'}" 2 <div :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px'}"
3 class="cm-card"> 3 class="cm-card">
4 <div class="search"> 4 <div class="search">
5 - <div class="condition"> 5 + <div class="condition esData-conditon">
6 <el-form-item> 6 <el-form-item>
7 <el-input :size="$global.elementConfig.size.input" placeholder="=资源名称、日志内容=" 7 <el-input :size="$global.elementConfig.size.input" placeholder="=资源名称、日志内容="
8 v-model="search.keyword"></el-input> 8 v-model="search.keyword"></el-input>
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
26 26
27 <el-form-item> 27 <el-form-item>
28 <el-date-picker 28 <el-date-picker
  29 + :size="$global.elementConfig.size.input"
29 end-placeholder="结束时间" 30 end-placeholder="结束时间"
30 format="YYYY-MM-DD HH:mm:ss" 31 format="YYYY-MM-DD HH:mm:ss"
31 range-separator="-" 32 range-separator="-"
@@ -36,7 +37,7 @@ @@ -36,7 +37,7 @@
36 /> 37 />
37 </el-form-item> 38 </el-form-item>
38 <el-form-item> 39 <el-form-item>
39 - <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button> 40 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button>
40 </el-form-item> 41 </el-form-item>
41 </div> 42 </div>
42 </div> 43 </div>
@@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
12 <div :style="{'min-height':height+'px','height':'100%'}" class="cm-card"> 12 <div :style="{'min-height':height+'px','height':'100%'}" class="cm-card">
13 <div style="height: 50px;text-align: left;margin-left: 10px;margin-top: 10px;display: flex"> 13 <div style="height: 50px;text-align: left;margin-left: 10px;margin-top: 10px;display: flex">
14 <div style="width: calc(100% - 100px)"> 14 <div style="width: calc(100% - 100px)">
15 - <el-form :inline="true" :model="searchForm" class="demo-form-inline"> 15 + <el-form :inline="true" :model="searchForm" class="demo-form-inline resList-form">
16 <el-form-item :label="searchInfo.name" v-for="searchInfo in obj.searchList"> 16 <el-form-item :label="searchInfo.name" v-for="searchInfo in obj.searchList">
17 17
18 - <el-select :placeholder="'请选择' + searchInfo.name" clearable 18 + <el-select :size="$global.elementConfig.size.input" :placeholder="'请选择' + searchInfo.name" clearable
19 filterable 19 filterable
20 v-else v-if="searchInfo.type == 'TABLE_REL'" v-model="searchForm[searchInfo.key + '_' + searchInfo.type]"> 20 v-else v-if="searchInfo.type == 'TABLE_REL'" v-model="searchForm[searchInfo.key + '_' + searchInfo.type]">
21 <el-option 21 <el-option
@@ -26,18 +26,18 @@ @@ -26,18 +26,18 @@
26 </el-option> 26 </el-option>
27 </el-select> 27 </el-select>
28 28
29 - <el-input :placeholder="'请输入' + searchInfo.name" v-else 29 + <el-input :size="$global.elementConfig.size.input" :placeholder="'请输入' + searchInfo.name" v-else
30 v-model="searchForm[searchInfo.key + '_' + searchInfo.type]"></el-input> 30 v-model="searchForm[searchInfo.key + '_' + searchInfo.type]"></el-input>
31 31
32 </el-form-item> 32 </el-form-item>
33 33
34 <el-form-item> 34 <el-form-item>
35 - <el-button @click="loadResList" v-if="obj.searchList.length > 0">查询</el-button> 35 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="loadResList" v-if="obj.searchList.length > 0">查询</el-button>
36 </el-form-item> 36 </el-form-item>
37 </el-form> 37 </el-form>
38 </div> 38 </div>
39 <div style="width: 100px" v-if="$global.common.isAdminManager()"> 39 <div style="width: 100px" v-if="$global.common.isAdminManager()">
40 - <el-button @click="showConfigDialog(true)" type="primary">配置</el-button> 40 + <el-button :size="$global.elementConfig.size.button" @click="showConfigDialog(true)" type="primary">配置</el-button>
41 </div> 41 </div>
42 </div> 42 </div>
43 43
@@ -1286,24 +1286,42 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -1286,24 +1286,42 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
1286 } 1286 }
1287 1287
1288 //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21 1288 //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
1289 - let formWidth = $('form[lay-filter="activewarning-form"] .layui-form-item').width();  
1290 - let winWidth = $('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();  
1291 - if (formWidth + 100 > winWidth) {  
1292 - $('#openStow').css('display', 'inline-block')  
1293 - $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width', (formWidth - 50) + 'px');  
1294 - $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height', '50px'); 1289 + let formWidth =$('.form-item-open-stow').width();
  1290 + let elem=$('.form-item-open-stow');
  1291 + if(elem){
  1292 + for(let i=0;i<elem.length;i++){
  1293 + if($(elem[i]).width()){
  1294 + formWidth=$(elem[i]).width();
  1295 + }
  1296 + }
  1297 + }
  1298 + if(!formWidth){
  1299 + formWidth= sessionStorage.getItem('formWidth');
  1300 + }else{
  1301 + sessionStorage.setItem('formWidth',formWidth)
  1302 + }
  1303 + let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
  1304 + let elemW=$('.form-item-open-stow').parents('.layui-status');
  1305 + if(elemW){
  1306 + for(let i=0;i<elemW.length;i++){
  1307 + if($(elemW[i]).width()){
  1308 + winWidth=$(elemW[i]).width();
  1309 + }
  1310 + }
  1311 + }
  1312 + if (formWidth + 130 > winWidth) {
  1313 + $('.openStow').css('display', 'inline-block')
  1314 + $('.form-item-open-stow').css('height', '50px');
1295 } else { 1315 } else {
1296 - $('#openStow').css('display', 'none') 1316 + $('.openStow').css('display', 'none')
1297 } 1317 }
1298 - $("#openStow").unbind('click').on('click', function () { 1318 + $(".openStow").unbind('click').on('click', function () {
1299 if ($(this).text() == '展开') { 1319 if ($(this).text() == '展开') {
1300 $(this).text('收起') 1320 $(this).text('收起')
1301 - $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width', (formWidth - 50) + 'px');  
1302 - $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height', 'auto'); 1321 + $('.form-item-open-stow').css('height', 'auto');
1303 } else { 1322 } else {
1304 $(this).text('展开') 1323 $(this).text('展开')
1305 - $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width', (formWidth - 50) + 'px');  
1306 - $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height', '50px'); 1324 + $('.form-item-open-stow').css('height', '50px');
1307 } 1325 }
1308 }) 1326 })
1309 //end lsq 2022-06-21 1327 //end lsq 2022-06-21
@@ -67,7 +67,11 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols @@ -67,7 +67,11 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
67 return false; 67 return false;
68 } 68 }
69 }); 69 });
70 - 70 + //lsq 资源视图页增加搜索按钮 2022-06-27
  71 + $('#searchBizIndex').unbind('click').on('click', function () {
  72 + reloadTable();
  73 + return false;
  74 + })
71 var loading = layer.load(2); 75 var loading = layer.load(2);
72 76
73 // 树收缩事件 77 // 树收缩事件
@@ -237,6 +241,47 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols @@ -237,6 +241,47 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
237 } 241 }
238 242
239 } 243 }
  244 +
  245 + //start lsq 业务视图搜索条件太多，增加展开/收起的功能 2022-06-27
  246 + let formWidth =$('.form-item-open-stow').width();
  247 + let elem=$('.form-item-open-stow');
  248 + if(elem){
  249 + for(let i=0;i<elem.length;i++){
  250 + if($(elem[i]).width()){
  251 + formWidth=$(elem[i]).width();
  252 + }
  253 + }
  254 + }
  255 + if(!formWidth){
  256 + formWidth= sessionStorage.getItem('formWidth');
  257 + }else{
  258 + sessionStorage.setItem('formWidth',formWidth)
  259 + }
  260 + let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
  261 + let elemW=$('.form-item-open-stow').parents('.layui-status');
  262 + if(elemW){
  263 + for(let i=0;i<elemW.length;i++){
  264 + if($(elemW[i]).width()){
  265 + winWidth=$(elemW[i]).width();
  266 + }
  267 + }
  268 + }
  269 + if (formWidth + 130 > winWidth) {
  270 + $('.openStow').css('display', 'inline-block')
  271 + $('.form-item-open-stow').css('height', '50px');
  272 + } else {
  273 + $('.openStow').css('display', 'none')
  274 + }
  275 + $(".openStow").unbind('click').on('click', function () {
  276 + if ($(this).text() == '展开') {
  277 + $(this).text('收起')
  278 + $('.form-item-open-stow').css('height', 'auto');
  279 + } else {
  280 + $(this).text('展开')
  281 + $('.form-item-open-stow').css('height', '50px');
  282 + }
  283 + })
  284 + //end lsq 2022-06-27
240 } 285 }
241 }); 286 });
242 $("#bizTotal").html(res.count); 287 $("#bizTotal").html(res.count);
@@ -795,6 +840,11 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols @@ -795,6 +840,11 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
795 return false; 840 return false;
796 } 841 }
797 }); 842 });
  843 + //lsq 业务视图页增加搜索按钮 2022-06-27
  844 + $('#searchBizTreeTable').unbind('click').on('click', function () {
  845 + renderTreeTable(busId, curTreeNode.data.id);
  846 + return false;
  847 + })
798 //选择资源状态 848 //选择资源状态
799 form.on('select(biz_treetable_resStatus)', function (data) { 849 form.on('select(biz_treetable_resStatus)', function (data) {
800 renderTreeTable(busId, curTreeNode.data.id); 850 renderTreeTable(busId, curTreeNode.data.id);
@@ -792,7 +792,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -792,7 +792,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
792 })(); 792 })();
793 793
794 //start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21 794 //start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21
795 - let formWidth = $('form[lay-filter="historywarning-form"] .layui-form-item').width(); 795 + /*let formWidth = $('form[lay-filter="historywarning-form"] .layui-form-item').width();
796 let winWidth = $('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width(); 796 let winWidth = $('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
797 if (formWidth + 100 > winWidth) { 797 if (formWidth + 100 > winWidth) {
798 $('#openStowHis').css('display', 'inline-block') 798 $('#openStowHis').css('display', 'inline-block')
@@ -812,6 +812,44 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -812,6 +812,44 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
812 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width', (formWidth - 50) + 'px'); 812 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width', (formWidth - 50) + 'px');
813 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height', '50px'); 813 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height', '50px');
814 } 814 }
  815 + })*/
  816 + let formWidth =$('.form-item-open-stow').width();
  817 + let elem=$('.form-item-open-stow');
  818 + if(elem){
  819 + for(let i=0;i<elem.length;i++){
  820 + if($(elem[i]).width()){
  821 + formWidth=$(elem[i]).width();
  822 + }
  823 + }
  824 + }
  825 + if(!formWidth){
  826 + formWidth= sessionStorage.getItem('formWidth');
  827 + }else{
  828 + sessionStorage.setItem('formWidth',formWidth)
  829 + }
  830 + let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
  831 + let elemW=$('.form-item-open-stow').parents('.layui-status');
  832 + if(elemW){
  833 + for(let i=0;i<elemW.length;i++){
  834 + if($(elemW[i]).width()){
  835 + winWidth=$(elemW[i]).width();
  836 + }
  837 + }
  838 + }
  839 + if (formWidth + 130 > winWidth) {
  840 + $('.openStow').css('display', 'inline-block')
  841 + $('.form-item-open-stow').css('height', '50px');
  842 + } else {
  843 + $('.openStow').css('display', 'none')
  844 + }
  845 + $(".openStow").unbind('click').on('click', function () {
  846 + if ($(this).text() == '展开') {
  847 + $(this).text('收起')
  848 + $('.form-item-open-stow').css('height', 'auto');
  849 + } else {
  850 + $(this).text('展开')
  851 + $('.form-item-open-stow').css('height', '50px');
  852 + }
815 }) 853 })
816 //end lsq 2022-06-21 854 //end lsq 2022-06-21
817 }); 855 });
@@ -307,6 +307,47 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -307,6 +307,47 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
307 } 307 }
308 308
309 } 309 }
  310 + //start lsq 资源视图搜索条件太多，增加展开/收起的功能 2022-06-27
  311 + let formWidth =$('.form-item-open-stow').width();
  312 + let elem=$('.form-item-open-stow');
  313 + if(elem){
  314 + for(let i=0;i<elem.length;i++){
  315 + if($(elem[i]).width()){
  316 + formWidth=$(elem[i]).width();
  317 + }
  318 + }
  319 + }
  320 + if(!formWidth){
  321 + formWidth= sessionStorage.getItem('formWidth');
  322 + }else{
  323 + sessionStorage.setItem('formWidth',formWidth)
  324 + }
  325 + let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
  326 + let elemW=$('.form-item-open-stow').parents('.layui-status');
  327 + if(elemW){
  328 + for(let i=0;i<elemW.length;i++){
  329 + if($(elemW[i]).width()){
  330 + winWidth=$(elemW[i]).width();
  331 + }
  332 + }
  333 + }
  334 + debugger
  335 + if (formWidth + 130 > winWidth) {
  336 + $('.openStow').css('display', 'inline-block')
  337 + $('.form-item-open-stow').css('height', '50px');
  338 + } else {
  339 + $('.openStow').css('display', 'none')
  340 + }
  341 + $(".openStow").unbind('click').on('click', function () {
  342 + if ($(this).text() == '展开') {
  343 + $(this).text('收起')
  344 + $('.form-item-open-stow').css('height', 'auto');
  345 + } else {
  346 + $(this).text('展开')
  347 + $('.form-item-open-stow').css('height', '50px');
  348 + }
  349 + })
  350 + //end lsq 2022-06-27
310 } 351 }
311 }); 352 });
312 if (data.length > 0) { 353 if (data.length > 0) {
@@ -708,7 +749,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -708,7 +749,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
708 return false; 749 return false;
709 } 750 }
710 }); 751 });
711 - 752 + //lsq 资源视图页增加搜索按钮 2022-06-27
  753 + $('#searchResIndex').unbind('click').on('click', function () {
  754 + reloadTable();
  755 + return false;
  756 + })
712 //资源详细信息 757 //资源详细信息
713 function renderDetail(resId, resType) { 758 function renderDetail(resId, resType) {
714 $('#resIndexContent').hide(); 759 $('#resIndexContent').hide();
@@ -820,6 +865,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -820,6 +865,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
820 return false; 865 return false;
821 } 866 }
822 }); 867 });
  868 + //lsq 资源视图页增加搜索按钮 2022-06-27
  869 + $('#searchResTreeTable').unbind('click').on('click', function () {
  870 + renderTreeTable(curTreeNode.data.id);
  871 + return false;
  872 + })
823 //选择资源状态 873 //选择资源状态
824 form.on('select(treetable_resStatus)', function (data) { 874 form.on('select(treetable_resStatus)', function (data) {
825 renderTreeTable(curTreeNode.data.id); 875 renderTreeTable(curTreeNode.data.id);
@@ -1722,7 +1772,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1722,7 +1772,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1722 }); 1772 });
1723 } 1773 }
1724 1774
1725 -  
1726 return {getData: getCheckData}; 1775 return {getData: getCheckData};
1727 }); 1776 });
1728 }); 1777 });