monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 1b5da4c103a49efc5b7f662efc453a9e5ffba01a 2 parents 170aa03a 59c6e50c

Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj 

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/vue3/src/views/portSense/index.js
Inline Side-by-side
Showing 23 changed files with 219 additions and 114 deletions
@@ -281,9 +281,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -281,9 +281,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
281 }).done(function (res) { 281 }).done(function (res) {
282 layer.close(loadIndex); 282 layer.close(loadIndex);
283 if (res && res.success) { 283 if (res && res.success) {
284 - let win = window.parent; 284 + let win = window.top;
285 if (win) { 285 if (win) {
286 - window.parent.postMessage({ 286 + window.top.postMessage({
287 type: "previewFile", 287 type: "previewFile",
288 message: { 288 message: {
289 params: { 289 params: {
@@ -83,9 +83,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -83,9 +83,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
83 }).done(function (res) { 83 }).done(function (res) {
84 layer.close(loadIndex); 84 layer.close(loadIndex);
85 if (res && res.success) { 85 if (res && res.success) {
86 - let win = window.parent; 86 + let win = window.top;
87 if (win) { 87 if (win) {
88 - window.parent.postMessage({ 88 + window.top.postMessage({
89 type: "previewFile", 89 type: "previewFile",
90 message: { 90 message: {
91 params: { 91 params: {
@@ -334,9 +334,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -334,9 +334,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
334 }).done(function (res) { 334 }).done(function (res) {
335 layer.close(loadIndex); 335 layer.close(loadIndex);
336 if (res && res.success) { 336 if (res && res.success) {
337 - let win = window.parent; 337 + let win = window.top;
338 if (win) { 338 if (win) {
339 - window.parent.postMessage({ 339 + window.top.postMessage({
340 type: "previewFile", 340 type: "previewFile",
341 message: { 341 message: {
342 params: { 342 params: {
@@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
84 }).done(function (res) { 84 }).done(function (res) {
85 layer.close(loadIndex); 85 layer.close(loadIndex);
86 if (res && res.success) { 86 if (res && res.success) {
87 - let win = window.parent; 87 + let win = window.top;
88 if (win) { 88 if (win) {
89 - window.parent.postMessage({ 89 + window.top.postMessage({
90 type: "previewFile", 90 type: "previewFile",
91 message: { 91 message: {
92 params: { 92 params: {
@@ -352,9 +352,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -352,9 +352,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
352 }).done(function (res) { 352 }).done(function (res) {
353 layer.close(loadIndex); 353 layer.close(loadIndex);
354 if (res && res.success) { 354 if (res && res.success) {
355 - let win = window.parent; 355 + let win = window.top;
356 if (win) { 356 if (win) {
357 - window.parent.postMessage({ 357 + window.top.postMessage({
358 type: "previewFile", 358 type: "previewFile",
359 message: { 359 message: {
360 params: { 360 params: {
@@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
84 }).done(function (res) { 84 }).done(function (res) {
85 layer.close(loadIndex); 85 layer.close(loadIndex);
86 if (res && res.success) { 86 if (res && res.success) {
87 - let win = window.parent; 87 + let win = window.top;
88 if (win) { 88 if (win) {
89 - window.parent.postMessage({ 89 + window.top.postMessage({
90 type: "previewFile", 90 type: "previewFile",
91 message: { 91 message: {
92 params: { 92 params: {
@@ -294,6 +294,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -294,6 +294,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
294 value: 1 294 value: 1
295 }); 295 });
296 }); 296 });
  297 + let zoomShow = false;
  298 + if (xData.length > 14) {
  299 + zoomShow = true;
  300 + } else {
  301 + zoomShow = false;
  302 + }
297 var series = [{ 303 var series = [{
298 name: '进入人数', 304 name: '进入人数',
299 data: countList, 305 data: countList,
@@ -401,7 +407,24 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -401,7 +407,24 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
401 } 407 }
402 } 408 }
403 }], 409 }],
404 - series: series 410 + series: series,
  411 + dataZoom: [//滚动条
  412 + {
  413 + show: zoomShow,
  414 + type: 'slider',
  415 + realtime: true,
  416 + startValue: 0,
  417 + endValue: 14,
  418 + xAxisIndex: [0],
  419 + bottom: '10',
  420 + left: '30',
  421 + height: 10,
  422 + borderColor: 'rgba(0,0,0,0)',
  423 + textStyle: {
  424 + color: '#05D5FF',
  425 + },
  426 + },
  427 + ]
405 }; 428 };
406 timeChart.setOption(option) 429 timeChart.setOption(option)
407 }); 430 });
@@ -287,9 +287,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -287,9 +287,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
287 }).done(function (res) { 287 }).done(function (res) {
288 layer.close(loadIndex); 288 layer.close(loadIndex);
289 if (res && res.success) { 289 if (res && res.success) {
290 - let win = window.parent; 290 + let win = window.top;
291 if (win) { 291 if (win) {
292 - window.parent.postMessage({ 292 + window.top.postMessage({
293 type: "previewFile", 293 type: "previewFile",
294 message: { 294 message: {
295 params: { 295 params: {
@@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
84 }).done(function (res) { 84 }).done(function (res) {
85 layer.close(loadIndex); 85 layer.close(loadIndex);
86 if (res && res.success) { 86 if (res && res.success) {
87 - let win = window.parent; 87 + let win = window.top;
88 if (win) { 88 if (win) {
89 - window.parent.postMessage({ 89 + window.top.postMessage({
90 type: "previewFile", 90 type: "previewFile",
91 message: { 91 message: {
92 params: { 92 params: {
@@ -267,7 +267,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -267,7 +267,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
267 var domId = $(this).attr("id"); 267 var domId = $(this).attr("id");
268 ids.push(domId); 268 ids.push(domId);
269 }); 269 });
270 - return !common.hasPermission(id, ids); 270 + return $.inArray(id, ids);
271 } 271 }
272 272
273 //绑定下拉搜索事件 273 //绑定下拉搜索事件
@@ -414,10 +414,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -414,10 +414,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
414 elem: '#favoriteListTable', 414 elem: '#favoriteListTable',
415 id: 'favoriteListTable' 415 id: 'favoriteListTable'
416 , 416 ,
417 - toolbar: '<div class="warn-btns"><button id="favorites_cols_save" class="layui-btn layui-btn-normal layui-btn-sm hide" style="float: right;">保存列顺序</button></div>' //开启头部工具栏，并为其绑定左侧模板  
418 - ,  
419 - defaultToolbar: ['filter']  
420 - , 417 + // toolbar: '<div class="warn-btns"><button id="favorites_cols_save" class="layui-btn layui-btn-normal layui-btn-sm hide" style="float: right;">保存列顺序</button></div>' //开启头部工具栏，并为其绑定左侧模板
  418 + // ,
  419 + // defaultToolbar: ['filter']
  420 + // ,
421 url: common.domainName + '/api-web/favorites/res/noList' 421 url: common.domainName + '/api-web/favorites/res/noList'
422 , 422 ,
423 where: { 423 where: {
@@ -452,13 +452,14 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -452,13 +452,14 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
452 var resType = $(this).data("restype"); 452 var resType = $(this).data("restype");
453 var resTypeName = $(this).data("restypename"); 453 var resTypeName = $(this).data("restypename");
454 var ip = $(this).data("ip") ? $(this).data("ip") : ""; 454 var ip = $(this).data("ip") ? $(this).data("ip") : "";
455 - var resName = $(this).data("name") ? $(this).data("name") + " | " : "";  
456 - var pingEnable = $(this).data("pingenable");  
457 - if (pingEnable == '2') {  
458 - commonDetail.openNewWin('template/detail/pingIndex', resName + resTypeName + ' | ' + ip, {'resId': resId}, false);  
459 - } else {  
460 - commonDetail.openDetail(resId, resType, resName + ip);  
461 - } 455 + var resName = $(this).data("name") ? $(this).data("name") : "";
  456 + // var pingEnable = $(this).data("pingenable");
  457 + // if (pingEnable == '2') {
  458 + // commonDetail.openNewWin('template/detail/pingIndex', resName + resTypeName + ' | ' + ip, {'resId': resId}, false);
  459 + // } else {
  460 + // commonDetail.openDetail(resId, resType, resName + ip);
  461 + // }
  462 + showResDetail(resId,resType,resName);
462 }); 463 });
463 464
464 //触发拖动列事件，参数为保存按钮的id 465 //触发拖动列事件，参数为保存按钮的id
@@ -479,6 +480,13 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -479,6 +480,13 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
479 }); 480 });
480 }); 481 });
481 } 482 }
  483 + //查看详情页
  484 + function showResDetail(resId,resType,resName){
  485 + window.parent.postMessage({
  486 + type: 'resDetail',
  487 + message: {'params':{'resId':resId,'resType':resType},'title':resName}
  488 + }, '*')
  489 + }
482 490
483 //刷新表格 491 //刷新表格
484 function reloadFariteResList(favId) { 492 function reloadFariteResList(favId) {
@@ -282,9 +282,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -282,9 +282,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
282 }).done(function (res) { 282 }).done(function (res) {
283 layer.close(loadIndex); 283 layer.close(loadIndex);
284 if (res && res.success) { 284 if (res && res.success) {
285 - let win = window.parent; 285 + let win = window.top;
286 if (win) { 286 if (win) {
287 - window.parent.postMessage({ 287 + window.top.postMessage({
288 type: "previewFile", 288 type: "previewFile",
289 message: { 289 message: {
290 params: { 290 params: {
@@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
84 }).done(function (res) { 84 }).done(function (res) {
85 layer.close(loadIndex); 85 layer.close(loadIndex);
86 if (res && res.success) { 86 if (res && res.success) {
87 - let win = window.parent; 87 + let win = window.top;
88 if (win) { 88 if (win) {
89 - window.parent.postMessage({ 89 + window.top.postMessage({
90 type: "previewFile", 90 type: "previewFile",
91 message: { 91 message: {
92 params: { 92 params: {
@@ -412,9 +412,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -412,9 +412,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
412 }).done(function (res) { 412 }).done(function (res) {
413 layer.close(loadIndex); 413 layer.close(loadIndex);
414 if (res && res.success) { 414 if (res && res.success) {
415 - let win = window.parent; 415 + let win = window.top;
416 if (win) { 416 if (win) {
417 - window.parent.postMessage({ 417 + window.top.postMessage({
418 type: "previewFile", 418 type: "previewFile",
419 message: { 419 message: {
420 params: { 420 params: {
@@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
84 }).done(function (res) { 84 }).done(function (res) {
85 layer.close(loadIndex); 85 layer.close(loadIndex);
86 if (res && res.success) { 86 if (res && res.success) {
87 - let win = window.parent; 87 + let win = window.top;
88 if (win) { 88 if (win) {
89 - window.parent.postMessage({ 89 + window.top.postMessage({
90 type: "previewFile", 90 type: "previewFile",
91 message: { 91 message: {
92 params: { 92 params: {
@@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -84,9 +84,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
84 }).done(function (res) { 84 }).done(function (res) {
85 layer.close(loadIndex); 85 layer.close(loadIndex);
86 if (res && res.success) { 86 if (res && res.success) {
87 - let win = window.parent; 87 + let win = window.top;
88 if (win) { 88 if (win) {
89 - window.parent.postMessage({ 89 + window.top.postMessage({
90 type: "previewFile", 90 type: "previewFile",
91 message: { 91 message: {
92 params: { 92 params: {
@@ -513,15 +513,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -513,15 +513,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
513 }, 513 },
514 { 514 {
515 title: '操作', align: "center", width: 120, 515 title: '操作', align: "center", width: 120,
516 - templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link preview-attachment-btn">预览</span></div>' 516 + templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" data-path = "{{d.path}}" class="layui-table-link preview-attachment-btn">预览</span></div>'
517 } 517 }
518 ]], 518 ]],
519 done: function () { 519 done: function () {
520 $('.preview-attachment-btn').on('click', function () { 520 $('.preview-attachment-btn').on('click', function () {
521 var id = $(this).data('id') 521 var id = $(this).data('id')
522 var suffix = $(this).data('suffix') 522 var suffix = $(this).data('suffix')
  523 + var filepath = $(this).data('path')
523 if (suffix == 'jpg' || suffix == 'png' || suffix == 'JPG' || suffix == 'PNG') { //图片类型 524 if (suffix == 'jpg' || suffix == 'png' || suffix == 'JPG' || suffix == 'PNG') { //图片类型
524 - var srcUrl = domainName + `/api-web/openoffice/readImage/${id}?${tokenKey}=${accessToken}`; 525 + var srcUrl = domainName + `/api-web/openoffice/readImage/${id}?accessToken=` + accessToken
525 layer.open({ 526 layer.open({
526 type: 1, 527 type: 1,
527 content: `<div><img src="${srcUrl}" width="100%" height="100%" /></div>`, 528 content: `<div><img src="${srcUrl}" width="100%" height="100%" /></div>`,
@@ -530,7 +531,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -530,7 +531,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
530 }) 531 })
531 } else { 532 } else {
532 //附件为文档类型 533 //附件为文档类型
533 - common.openReport(id) 534 + var loadIndex = layer.load(1, {shade: [0.3], content: ''});
  535 + let name = Base64.encode(filepath, true);
  536 + admin.req({
  537 + url: domainName + `/api-web/openoffice/convertPdfMJ?pathBase64=${name}`,
  538 + type: 'get'
  539 + }).done(function (res) {
  540 + layer.close(loadIndex);
  541 + if (res && res.success) {
  542 + let win = window.top;
  543 + if (win) {
  544 + window.top.postMessage({
  545 + type: "previewFile",
  546 + message: {
  547 + params: {
  548 + url: res.str
  549 + }
  550 + }
  551 + }, '*')
  552 + }
  553 + } else {
  554 + layer.confirm("文档不支持预览，是否下载！", function () {
  555 + const url = domainName + `/api-web/openoffice/download/${id}?accessToken=${accessToken}`;
  556 + window.open(url)
  557 + });
  558 + layer.close(loadIndex);
  559 + }
  560 + }).error(function (error) {
  561 + layer.close(loadIndex);
  562 + console.log(error)
  563 + })
534 } 564 }
535 }) 565 })
536 } 566 }
@@ -138,9 +138,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -138,9 +138,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
138 }).done(function (res) { 138 }).done(function (res) {
139 layer.close(loadIndex); 139 layer.close(loadIndex);
140 if (res && res.success) { 140 if (res && res.success) {
141 - let win = window.parent; 141 + let win = window.top;
142 if (win) { 142 if (win) {
143 - window.parent.postMessage({ 143 + window.top.postMessage({
144 type: "previewFile", 144 type: "previewFile",
145 message: { 145 message: {
146 params: { 146 params: {
@@ -589,6 +589,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -589,6 +589,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
589 value: 1 589 value: 1
590 }); 590 });
591 }); 591 });
  592 + let zoomShow = false;
  593 + if (xData.length > 10) {
  594 + zoomShow = true;
  595 + } else {
  596 + zoomShow = false;
  597 + }
592 var series = [{ 598 var series = [{
593 name: '应报', 599 name: '应报',
594 data: needReportList, 600 data: needReportList,
@@ -761,14 +767,22 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -761,14 +767,22 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
761 } 767 }
762 }], 768 }],
763 series: series, 769 series: series,
764 - dataZoom: [ 770 + dataZoom: [//滚动条
765 { 771 {
766 - type: "slider", 772 + show: zoomShow,
  773 + type: 'slider',
767 realtime: true, 774 realtime: true,
768 - height: 25,  
769 - start: 5,  
770 - end: 55  
771 - } 775 + startValue: 0,
  776 + endValue: 14,
  777 + xAxisIndex: [0],
  778 + bottom: '10',
  779 + left: '30',
  780 + height: 10,
  781 + borderColor: 'rgba(0,0,0,0)',
  782 + textStyle: {
  783 + color: '#05D5FF',
  784 + },
  785 + },
772 ] 786 ]
773 787
774 }; 788 };
@@ -20,14 +20,6 @@ @@ -20,14 +20,6 @@
20 placeholder="关键字，回车搜索" type="text"> 20 placeholder="关键字，回车搜索" type="text">
21 </div> 21 </div>
22 </div> 22 </div>
23 - <div class="layui-inline favorite-cards">  
24 - <div class="layui-input-inline layui-input-inline--long" >  
25 - <button type="button" id="fav_keyword"  
26 - class="layui-btn layui-btn-normal layui-btn-normal">  
27 - 搜索  
28 - </button>  
29 - </div>  
30 - </div>  
31 <div class="layui-inline favorite-reslist"> 23 <div class="layui-inline favorite-reslist">
32 <div class="layui-input-inline layui-input-inline--long"> 24 <div class="layui-input-inline layui-input-inline--long">
33 <input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id" 25 <input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id"
@@ -62,14 +54,6 @@ @@ -62,14 +54,6 @@
62 </select> 54 </select>
63 </div> 55 </div>
64 </div> 56 </div>
65 - <div class="layui-inline favorite-reslist">  
66 - <div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">  
67 - <button type="button" id="keyword"  
68 - class="layui-btn layui-btn-normal layui-btn-normal">  
69 - 搜索  
70 - </button>  
71 - </div>  
72 - </div>  
73 </div> 57 </div>
74 </form> 58 </form>
75 <div class="favorites-header-btngroup"> 59 <div class="favorites-header-btngroup">
  1 +<div>
  2 + <el-dialog v-model="dialogVisible" title="新增" width="50%" :before-close="beforeClose">
  3 + <div>
  4 + <div style="margin-right:6px;">
  5 + <!--<cm-res-type-tree-input @callback="getResType" clearable collapseTags multiple/>-->
  6 + </div>
  7 + <div class="flex-div-start" style="float: left;">
  8 + <el-button :size="$global.elementConfig.size.button" @click="onBtnSearch()" style="margin-left: 6px" type="primary">搜索</el-button>
  9 + </div>
  10 + </div>
  11 + <template #footer>
  12 + <span class="dialog-footer">
  13 + <el-button @click="beforeClose">取消</el-button>
  14 + <el-button type="primary" @click="submit">确定</el-button>
  15 + </span>
  16 + </template>
  17 + </el-dialog>
  18 +</div>
  1 +export default {
  2 + name: 'portSenseAdd',
  3 + template: '',
  4 + components: {
  5 + },
  6 + props:{
  7 + dialogVisible:{
  8 + type:Boolean,
  9 + }
  10 + },
  11 + setup(props, {attrs, slots, emit}){
  12 + const {proxy} = Vue.getCurrentInstance();
  13 +
  14 + let types = Vue.ref([]);
  15 + //获取资源类型
  16 + let getResType = (arr) => {
  17 + types.value = arr.map(function (v) {
  18 + return v.id;
  19 + });
  20 + }
  21 +
  22 + const onBtnSearch = ()=>{
  23 +
  24 + }
  25 +
  26 + const submit = ()=>{
  27 + if (types.value.length === 0) {
  28 + proxy.$global.layer.msg('请选择一项', {icon: 7, timeout: 3000});
  29 + return false;
  30 + }
  31 + beforeClose();
  32 + }
  33 +
  34 + const beforeClose = () => {
  35 + emit('beforeClose')
  36 + }
  37 +
  38 + return {
  39 + getResType,
  40 + onBtnSearch,
  41 + submit,
  42 + beforeClose
  43 + }
  44 + }
  45 +}
@@ -93,4 +93,6 @@ @@ -93,4 +93,6 @@
93 <port-sense-config v-if="stepActive == 1" :parameter="portSenseConfigData"></port-sense-config> 93 <port-sense-config v-if="stepActive == 1" :parameter="portSenseConfigData"></port-sense-config>
94 </template> 94 </template>
95 </cm-dialog> 95 </cm-dialog>
  96 +
  97 + <port-sense-add :dialogVisible="dialogVisible" @beforeClose="beforeClose"></port-sense-add>
96 </div> 98 </div>
@@ -61,7 +61,6 @@ export default { @@ -61,7 +61,6 @@ export default {
61 align: 'center', 61 align: 'center',
62 } 62 }
63 ]; 63 ];
64 - let stepActive = Vue.ref(0);  
65 //配置列表总数 64 //配置列表总数
66 let count = Vue.ref(0); 65 let count = Vue.ref(0);
67 //搜索关键字 66 //搜索关键字
@@ -194,42 +193,36 @@ export default { @@ -194,42 +193,36 @@ export default {
194 } 193 }
195 //添加 194 //添加
196 let save = () => { 195 let save = () => {
197 - stepActive.value = 1;  
198 -  
199 - showPortSense.value = true;  
200 -  
201 -  
202 -  
203 //获取所有的端口侦测信息 196 //获取所有的端口侦测信息
204 - // let dataList = [];  
205 - // let getParams = {  
206 - // keyWords: '',  
207 - // resTypes: '',  
208 - // resIds: '',  
209 - // busIds: '',  
210 - // page: '',  
211 - // limit: ''  
212 - // };  
213 - // proxy.$http.get("/api-web/bResourceExtendParam/page", getParams, function (res) {  
214 - // if (res && res.success) {  
215 - // dataList = res.data;  
216 - // }  
217 - // })  
218 - // dataList = dataList.map(item => item.resId);  
219 - // proxy.$global.openWin("template/res/reslist", "选择资源", {oldData: dataList}, ["选择"], function (index) {  
220 - // //获取选中数据  
221 - // let data = proxy.$global.layui.table.checkStatus('reslist_resListTable').data;  
222 - // if (data.length === 0) {  
223 - // //vue层级关系  
224 - // // proxy.$global.showMsg("请至少选择一条数据！", "warning");  
225 - // proxy.$global.layer.msg('请选择一项', {icon: 7, timeout: 3000});  
226 - // return false;  
227 - // }  
228 - // //打开端口侦测配置页面  
229 - // portSenseConfigData.value = data.map(item => item.resId);  
230 - // showPortSense.value = true;  
231 - // proxy.$global.layer.close(index);  
232 - // }, null, ['80%', '83%']); 197 + let dataList = [];
  198 + let getParams = {
  199 + keyWords: '',
  200 + resTypes: '',
  201 + resIds: '',
  202 + busIds: '',
  203 + page: '',
  204 + limit: ''
  205 + };
  206 + proxy.$http.get("/api-web/bResourceExtendParam/page", getParams, function (res) {
  207 + if (res && res.success) {
  208 + dataList = res.data;
  209 + }
  210 + })
  211 + dataList = dataList.map(item => item.resId);
  212 + proxy.$global.openWin("template/res/reslist", "选择资源", {oldData: dataList}, ["选择"], function (index) {
  213 + //获取选中数据
  214 + let data = proxy.$global.layui.table.checkStatus('reslist_resListTable').data;
  215 + if (data.length === 0) {
  216 + //vue层级关系
  217 + // proxy.$global.showMsg("请至少选择一条数据！", "warning");
  218 + proxy.$global.layer.msg('请选择一项', {icon: 7, timeout: 3000});
  219 + return false;
  220 + }
  221 + //打开端口侦测配置页面
  222 + portSenseConfigData.value = data.map(item => item.resId);
  223 + showPortSense.value = true;
  224 + proxy.$global.layer.close(index);
  225 + }, null, ['80%', '83%']);
233 226
234 } 227 }
235 //删除 228 //删除
@@ -254,20 +247,8 @@ export default { @@ -254,20 +247,8 @@ export default {
254 //打开端口侦测配置页面 247 //打开端口侦测配置页面
255 portSenseConfigData.value = [row.resId]; 248 portSenseConfigData.value = [row.resId];
256 showPortSense.value = true; 249 showPortSense.value = true;
257 - stepActive.value = 2;  
258 - }  
259 -  
260 -  
261 - const next = () => {  
262 - if (stepActive.value++ > 2) stepActive.value = 0  
263 } 250 }
264 -  
265 -  
266 return { 251 return {
267 - stepActive,  
268 - next,  
269 -  
270 -  
271 count, 252 count,
272 portSenseData, 253 portSenseData,
273 columns, 254 columns,