monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit d8b22dbc8221af2a81acfb978d8d54324b75157d 2 parents b622067e 68396315

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

视图中心-资源视图搜索栏样式调整，增加展开/收起，展开/收起功能调整 #1



See merge request !695
Inline Side-by-side
Showing 15 changed files with 391 additions and 38 deletions
@@ -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 });
@@ -6055,7 +6055,10 @@ form.form-edit .layui-form-item .layui-input-inline { @@ -6055,7 +6055,10 @@ form.form-edit .layui-form-item .layui-input-inline {
6055 width: 18%; 6055 width: 18%;
6056 display: inline-block; 6056 display: inline-block;
6057 } 6057 }
6058 - 6058 +/*lsq 健康状态样式 2022-06-27*/
  6059 +.info-box-count-res{
  6060 + width:20%;
  6061 +}
6059 .info-box-count > label { 6062 .info-box-count > label {
6060 color: #999; 6063 color: #999;
6061 font-size: 14px; 6064 font-size: 14px;
@@ -8306,12 +8309,12 @@ form[lay-filter="notice_search_form"] .layui-inline, form[lay-filter="noticemerg @@ -8306,12 +8309,12 @@ form[lay-filter="notice_search_form"] .layui-inline, form[lay-filter="noticemerg
8306 margin-top: 5px; 8309 margin-top: 5px;
8307 } 8310 }
8308 8311
8309 -form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] { 8312 +form.layui-card-header.layuiadmin-card-header-auto {
8310 display: flex; 8313 display: flex;
8311 justify-content: flex-start; 8314 justify-content: flex-start;
8312 } 8315 }
8313 8316
8314 -#seachActiveWarning, #seachHistoryWarning { 8317 +.searchButton {
8315 margin-top: 6px; 8318 margin-top: 6px;
8316 margin-right: 6px; 8319 margin-right: 6px;
8317 } 8320 }
@@ -8529,3 +8532,20 @@ form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] { @@ -8529,3 +8532,20 @@ form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] {
8529 } 8532 }
8530 8533
8531 /* //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,7 +103,7 @@ @@ -103,7 +103,7 @@
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>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
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>
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
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="form-item-open-stow">
20 <div class="layui-form-item"> 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">
@@ -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>
  86 + </div>-->
84 </div> 87 </div>
85 </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,6 +20,7 @@ @@ -20,6 +20,7 @@
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="form-item-open-stow">
23 <div class="layui-form-item"> 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">
@@ -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,6 +113,7 @@ @@ -105,6 +113,7 @@
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">
  116 + <div class="form-item-open-stow">
108 <div class="layui-form-item"> 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">
@@ -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,6 +38,7 @@ @@ -38,6 +38,7 @@
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="form-item-open-stow">
41 <div class="layui-form-item"> 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">
@@ -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,6 +131,7 @@ @@ -123,6 +131,7 @@
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">
  134 + <div class="form-item-open-stow">
126 <div class="layui-form-item"> 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">
@@ -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">
@@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@
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="form-item-open-stow">
74 <div class="layui-form-item"> 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">
@@ -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,6 +224,7 @@ @@ -216,6 +224,7 @@
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">
  227 + <div class="form-item-open-stow">
219 <div class="layui-form-item"> 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">
@@ -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="form-item-open-stow">
10 <div class="layui-form-item"> 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">
@@ -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>
@@ -1286,13 +1286,30 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -1286,13 +1286,30 @@ 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 =sessionStorage.getItem('formWidth'); 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 + }
1290 if(!formWidth){ 1298 if(!formWidth){
1291 - formWidth= $('.form-item-open-stow').width(); 1299 + formWidth= sessionStorage.getItem('formWidth');
  1300 + }else{
1292 sessionStorage.setItem('formWidth',formWidth) 1301 sessionStorage.setItem('formWidth',formWidth)
1293 } 1302 }
1294 - let winWidth = $('.form-item-open-stow').parents('.layui-card-header').width();  
1295 - if (formWidth + 120 > winWidth) { 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) {
1296 $('.openStow').css('display', 'inline-block') 1313 $('.openStow').css('display', 'inline-block')
1297 $('.form-item-open-stow').css('height', '50px'); 1314 $('.form-item-open-stow').css('height', '50px');
1298 } else { 1315 } else {
@@ -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);
@@ -813,13 +813,30 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -813,13 +813,30 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
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 })*/ 815 })*/
816 - let formWidth =sessionStorage.getItem('formWidth'); 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 + }
817 if(!formWidth){ 825 if(!formWidth){
818 - formWidth= $('.form-item-open-stow').width(); 826 + formWidth= sessionStorage.getItem('formWidth');
  827 + }else{
819 sessionStorage.setItem('formWidth',formWidth) 828 sessionStorage.setItem('formWidth',formWidth)
820 } 829 }
821 - let winWidth = $('.form-item-open-stow').parents('.layui-card-header').width();  
822 - if (formWidth + 120 > winWidth) { 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) {
823 $('.openStow').css('display', 'inline-block') 840 $('.openStow').css('display', 'inline-block')
824 $('.form-item-open-stow').css('height', '50px'); 841 $('.form-item-open-stow').css('height', '50px');
825 } else { 842 } else {
@@ -307,6 +307,46 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -307,6 +307,46 @@ 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 + if (formWidth + 130 > winWidth) {
  335 + $('.openStow').css('display', 'inline-block')
  336 + $('.form-item-open-stow').css('height', '50px');
  337 + } else {
  338 + $('.openStow').css('display', 'none')
  339 + }
  340 + $(".openStow").unbind('click').on('click', function () {
  341 + if ($(this).text() == '展开') {
  342 + $(this).text('收起')
  343 + $('.form-item-open-stow').css('height', 'auto');
  344 + } else {
  345 + $(this).text('展开')
  346 + $('.form-item-open-stow').css('height', '50px');
  347 + }
  348 + })
  349 + //end lsq 2022-06-27
310 } 350 }
311 }); 351 });
312 if (data.length > 0) { 352 if (data.length > 0) {
@@ -708,7 +748,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -708,7 +748,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
708 return false; 748 return false;
709 } 749 }
710 }); 750 });
711 - 751 + //lsq 资源视图页增加搜索按钮 2022-06-27
  752 + $('#searchResIndex').unbind('click').on('click', function () {
  753 + reloadTable();
  754 + return false;
  755 + })
712 //资源详细信息 756 //资源详细信息
713 function renderDetail(resId, resType) { 757 function renderDetail(resId, resType) {
714 $('#resIndexContent').hide(); 758 $('#resIndexContent').hide();
@@ -820,6 +864,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -820,6 +864,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
820 return false; 864 return false;
821 } 865 }
822 }); 866 });
  867 + //lsq 资源视图页增加搜索按钮 2022-06-27
  868 + $('#searchResTreeTable').unbind('click').on('click', function () {
  869 + renderTreeTable(curTreeNode.data.id);
  870 + return false;
  871 + })
823 //选择资源状态 872 //选择资源状态
824 form.on('select(treetable_resStatus)', function (data) { 873 form.on('select(treetable_resStatus)', function (data) {
825 renderTreeTable(curTreeNode.data.id); 874 renderTreeTable(curTreeNode.data.id);
@@ -1722,7 +1771,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1722,7 +1771,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1722 }); 1771 });
1723 } 1772 }
1724 1773
1725 -  
1726 return {getData: getCheckData}; 1774 return {getData: getCheckData};
1727 }); 1775 });
1728 }); 1776 });