monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit eed1aee07d8414d200d029b5c4adf7596072754a 2 parents ba74de33 5706b771

Merge branch 'wangfeng-mj' into 'master-mj' 

资源类型打标签



See merge request !1142
Inline Side-by-side
Showing 3 changed files with 72 additions and 1 deletions
@@ -169,7 +169,6 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele @@ -169,7 +169,6 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
169 tagIds.push($(this).attr("id")) 169 tagIds.push($(this).attr("id"))
170 } 170 }
171 $("#selectTagIds").val(tagIds) 171 $("#selectTagIds").val(tagIds)
172 - console.log(tagIds);  
173 }); 172 });
174 173
175 } 174 }
@@ -20,6 +20,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions', @@ -20,6 +20,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
20 var resource_view = ''; 20 var resource_view = '';
21 var biz_view = ''; 21 var biz_view = '';
22 var collTypeSelect = ''; 22 var collTypeSelect = '';
  23 + var tagIds = [];
23 //传递参数 24 //传递参数
24 let resTypes = data && data.resTypes ? data.resTypes : []; 25 let resTypes = data && data.resTypes ? data.resTypes : [];
25 let showType = data && data.showType == 0 ? data.showType : 1; 26 let showType = data && data.showType == 0 ? data.showType : 1;
@@ -433,6 +434,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions', @@ -433,6 +434,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
433 434
434 // 如果是编辑，回显数据 435 // 如果是编辑，回显数据
435 if (actionType === 'edit') { 436 if (actionType === 'edit') {
  437 + var oldResTypeCode = resType.resTypeCode;
436 // 获取关联表信息 438 // 获取关联表信息
437 admin.req({ 439 admin.req({
438 url: domainName + '/api-web/manage/restypeProtocol/restype/' + resType.resTypeCode 440 url: domainName + '/api-web/manage/restypeProtocol/restype/' + resType.resTypeCode
@@ -509,6 +511,11 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions', @@ -509,6 +511,11 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
509 }) 511 })
510 } 512 }
511 refreshProtocolItems(); 513 refreshProtocolItems();
  514 + // 获取标签
  515 + getTags(oldResTypeCode);
  516 + }else{
  517 + // 获取标签
  518 + getTags()
512 } 519 }
513 520
514 }); 521 });
@@ -737,6 +744,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions', @@ -737,6 +744,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
737 layer.closeAll(); 744 layer.closeAll();
738 layer.msg(response.msg, {icon: 1, time: 3000}); 745 layer.msg(response.msg, {icon: 1, time: 3000});
739 loadResTypeTable(); 746 loadResTypeTable();
  747 + saveResTypeTagRel(resType.resTypeCode);
740 } else { 748 } else {
741 layer.msg(actionName + '失败!', {icon: 2, time: 3000}); 749 layer.msg(actionName + '失败!', {icon: 2, time: 3000});
742 } 750 }
@@ -749,6 +757,62 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions', @@ -749,6 +757,62 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
749 } 757 }
750 }; 758 };
751 759
  760 + //保存标签关系
  761 + function saveResTypeTagRel(resTypeCode){
  762 +
  763 + var selectTagIds = $("#selectResTypeTagIds").val();
  764 +
  765 + var parmas = {
  766 + id:resTypeCode,
  767 + tags:selectTagIds,
  768 + type:"RESTYPE"
  769 + }
  770 + admin.req({
  771 + url: common.domainName + '/api-web/systag/save',
  772 + method: 'get',
  773 + data : parmas,
  774 + sync: false,
  775 + success: function (res) {
  776 + console.log("标签保存成功！")
  777 + }
  778 + });
  779 + }
  780 + function getTags(resType) {
  781 + tagIds = [];
  782 + admin.req({
  783 + url: common.domainName + '/api-web/systag/list?type=RESTYPE&id='+resType,
  784 + type: 'get',
  785 + sync: false,
  786 + success: function (res) {
  787 + var html = '';
  788 + if(res.data && res.data.length > 0){
  789 + var activeTag = "";
  790 + res.data.forEach((v, i) => {
  791 + if(v.selTag){
  792 + tagIds.push(v.id);
  793 + activeTag = "activeTag";
  794 + }else{
  795 + activeTag = "";
  796 + }
  797 + html += ` <span class="tag ${activeTag}" id="${v.id}">${v.name}</span>`;
  798 + });
  799 + }
  800 + $("#restype-tags").html(html);
  801 + //添加点击事件
  802 + $("#restype-tags").find(".tag").on("click",function () {
  803 + if($(this).hasClass("activeTag")){
  804 + $(this).removeClass("activeTag");
  805 + tagIds.splice($(this).attr('id'), 1);
  806 + }else{
  807 + $(this).addClass("activeTag");
  808 + tagIds.push($(this).attr("id"))
  809 + }
  810 + $("#selectResTypeTagIds").val(tagIds)
  811 + });
  812 +
  813 + }
  814 + });
  815 + }
752 //查找子节点 816 //查找子节点
753 function getChilds(resTypeCode) { 817 function getChilds(resTypeCode) {
754 $.each($('.ew-tree-table').find('table tbody tr'), function () { 818 $.each($('.ew-tree-table').find('table tbody tr'), function () {
@@ -122,6 +122,14 @@ @@ -122,6 +122,14 @@
122 <input type="hidden" id='input-restype-options' name="options" required lay-verify="required" 122 <input type="hidden" id='input-restype-options' name="options" required lay-verify="required"
123 placeholder="请输入配置信息" class="layui-input"> 123 placeholder="请输入配置信息" class="layui-input">
124 </div> 124 </div>
  125 + <div class="layui-form-item">
  126 + <label class="layui-form-label">标签:</label>
  127 + <div class="layui-input-block input-with-prefix">
  128 + <div id="restype-tags" style="line-height: 40px"></div>
  129 + </div>
  130 + <input type="hidden" id="selectResTypeTagIds">
  131 + </div>
  132 +
125 <button id="btn-restype-submit" class="hide" lay-submit lay-filter="res-type-submit">提交</button> 133 <button id="btn-restype-submit" class="hide" lay-submit lay-filter="res-type-submit">提交</button>
126 </form> 134 </form>
127 <form class="layui-form form-edit layui-form-pane" onsubmit="return false;"> 135 <form class="layui-form form-edit layui-form-pane" onsubmit="return false;">