Showing
3 changed files
with
84 additions
and
19 deletions
@@ -26,6 +26,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | @@ -26,6 +26,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | ||
26 | var passPatternTips = ''; | 26 | var passPatternTips = ''; |
27 | var loginName = localStorage.getItem("lgn"); | 27 | var loginName = localStorage.getItem("lgn"); |
28 | var bizId = ''; | 28 | var bizId = ''; |
29 | + var tagIds = []; | ||
29 | 30 | ||
30 | form.render() | 31 | form.render() |
31 | 32 | ||
@@ -203,9 +204,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | @@ -203,9 +204,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | ||
203 | if (bean.reportFlag == '1') { | 204 | if (bean.reportFlag == '1') { |
204 | $form.find("input[name='reportFlag'][value='1']").attr("checked", "checked") | 205 | $form.find("input[name='reportFlag'][value='1']").attr("checked", "checked") |
205 | } | 206 | } |
206 | - if (bean.resLabel) { | ||
207 | - tagsContent = bean.resLabel.split("#"); | ||
208 | - } | 207 | + // if (bean.resLabel) { |
208 | + // tagsContent = bean.resLabel.split("#"); | ||
209 | + // } | ||
209 | createResExtendParamRow(res['extend']) | 210 | createResExtendParamRow(res['extend']) |
210 | createProtocolDom(res['proto'], true) | 211 | createProtocolDom(res['proto'], true) |
211 | // 资源类型下拉框 资产系统过来的没有资源类型,需要选择 | 212 | // 资源类型下拉框 资产系统过来的没有资源类型,需要选择 |
@@ -265,11 +266,12 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | @@ -265,11 +266,12 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | ||
265 | }) | 266 | }) |
266 | } | 267 | } |
267 | $("#resManageAddForm").find("input[name='resType']").val(resType); | 268 | $("#resManageAddForm").find("input[name='resType']").val(resType); |
268 | - inputTags.render({ | ||
269 | - elem: '#resLabelPluginsSelector', | ||
270 | - content: tagsContent, | ||
271 | - aldaBtn: false | ||
272 | - }) | 269 | + |
270 | + // inputTags.render({ | ||
271 | + // elem: '#resLabelPluginsSelector', | ||
272 | + // content: tagsContent, | ||
273 | + // aldaBtn: false | ||
274 | + // }) | ||
273 | 275 | ||
274 | //表单验证规则 | 276 | //表单验证规则 |
275 | form.verify({ | 277 | form.verify({ |
@@ -280,6 +282,43 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | @@ -280,6 +282,43 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | ||
280 | }); | 282 | }); |
281 | }) | 283 | }) |
282 | 284 | ||
285 | + getTags(id); | ||
286 | + function getTags(resId) { | ||
287 | + admin.req({ | ||
288 | + url: common.domainName + '/api-web/systag/list?type=RES&id='+resId, | ||
289 | + type: 'get', | ||
290 | + sync: false, | ||
291 | + success: function (res) { | ||
292 | + var html = ''; | ||
293 | + if(res.data && res.data.length > 0){ | ||
294 | + var activeTag = ""; | ||
295 | + res.data.forEach((v, i) => { | ||
296 | + if(v.selTag){ | ||
297 | + tagIds.push(v.id); | ||
298 | + activeTag = "activeTag"; | ||
299 | + }else{ | ||
300 | + activeTag = ""; | ||
301 | + } | ||
302 | + html += ` <span class="tag ${activeTag}" id="${v.id}">${v.name}</span>`; | ||
303 | + }); | ||
304 | + } | ||
305 | + $("#res-tags").html(html); | ||
306 | + //添加点击事件 | ||
307 | + $("#res-tags").find(".tag").on("click",function () { | ||
308 | + if($(this).hasClass("activeTag")){ | ||
309 | + $(this).removeClass("activeTag"); | ||
310 | + tagIds.splice($(this).attr('id'), 1); | ||
311 | + }else{ | ||
312 | + $(this).addClass("activeTag"); | ||
313 | + tagIds.push($(this).attr("id")) | ||
314 | + } | ||
315 | + $("#selectResTagIds").val(tagIds) | ||
316 | + }); | ||
317 | + } | ||
318 | + }); | ||
319 | + } | ||
320 | + | ||
321 | + | ||
283 | //动态渲染域的下拉列表数据 | 322 | //动态渲染域的下拉列表数据 |
284 | function initDoMainSelect(domainId) { | 323 | function initDoMainSelect(domainId) { |
285 | var newDimainlist = dimainlist.filter(function (v) { | 324 | var newDimainlist = dimainlist.filter(function (v) { |
@@ -1967,12 +1967,13 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -1967,12 +1967,13 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
1967 | if (currentHardwareFlag.endsWith("Y")) formData.resCategory = 'share' | 1967 | if (currentHardwareFlag.endsWith("Y")) formData.resCategory = 'share' |
1968 | if (currentHardwareFlag.endsWith("N")) formData.resCategory = 'resources' | 1968 | if (currentHardwareFlag.endsWith("N")) formData.resCategory = 'resources' |
1969 | } | 1969 | } |
1970 | - var tags = []; | ||
1971 | - var span = $("div#tags span"); | ||
1972 | - span.each(function () { | ||
1973 | - tags.push($(this).find("em").text()) | ||
1974 | - }) | ||
1975 | - formData['resLabel'] = tags.toString(); | 1970 | + // var tags = []; |
1971 | + // var span = $("div#tags span"); | ||
1972 | + // span.each(function () { | ||
1973 | + // tags.push($(this).find("em").text()) | ||
1974 | + // }) | ||
1975 | + | ||
1976 | + // formData['resLabel'] = tags.toString(); | ||
1976 | /*formData['proto'] = proto; | 1977 | /*formData['proto'] = proto; |
1977 | formData['extend'] = extend;*/ | 1978 | formData['extend'] = extend;*/ |
1978 | if (formData.auxiliaryAdmin) { | 1979 | if (formData.auxiliaryAdmin) { |
@@ -1997,6 +1998,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -1997,6 +1998,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
1997 | layer.msg('保存成功!', {icon: 1, time: 1500}, function () { | 1998 | layer.msg('保存成功!', {icon: 1, time: 1500}, function () { |
1998 | layer.closeAll(); | 1999 | layer.closeAll(); |
1999 | reloadTable(); | 2000 | reloadTable(); |
2001 | + saveTagRel(formData.resId);//保存标签 | ||
2000 | if (next == '1') { | 2002 | if (next == '1') { |
2001 | //openCollTaskAndAlarm(res.object) | 2003 | //openCollTaskAndAlarm(res.object) |
2002 | openResourceRelationConfigHtml(res.object.resId, res.object.resType) | 2004 | openResourceRelationConfigHtml(res.object.resId, res.object.resType) |
@@ -2009,6 +2011,26 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -2009,6 +2011,26 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
2009 | }) | 2011 | }) |
2010 | } | 2012 | } |
2011 | 2013 | ||
2014 | + function saveTagRel(reId){ | ||
2015 | + | ||
2016 | + var selectResTagIds = $("#selectResTagIds").val(); | ||
2017 | + | ||
2018 | + var parmas = { | ||
2019 | + id:reId, | ||
2020 | + tags:selectResTagIds, | ||
2021 | + type:"RES" | ||
2022 | + } | ||
2023 | + admin.req({ | ||
2024 | + url: common.domainName + '/api-web/systag/save', | ||
2025 | + method: 'get', | ||
2026 | + data : parmas, | ||
2027 | + sync: false, | ||
2028 | + success: function (res) { | ||
2029 | + console.log("标签保存成功!") | ||
2030 | + } | ||
2031 | + }); | ||
2032 | + } | ||
2033 | + | ||
2012 | //资源协议验证 | 2034 | //资源协议验证 |
2013 | function validatedProtoParam() { | 2035 | function validatedProtoParam() { |
2014 | var flag = true, msg = ''; | 2036 | var flag = true, msg = ''; |
@@ -189,13 +189,17 @@ | @@ -189,13 +189,17 @@ | ||
189 | </div> | 189 | </div> |
190 | <div class="layui-form-item"> | 190 | <div class="layui-form-item"> |
191 | <label class="layui-form-label">标签</label> | 191 | <label class="layui-form-label">标签</label> |
192 | + <!--<div class="layui-input-block">--> | ||
193 | + <!-- <div class="tags" id="tags">--> | ||
194 | + <!-- <input autocomplete="off" class="layui-input" id="resLabelPluginsSelector" name="resLabel"--> | ||
195 | + <!-- placeholder="标签,回车输入"--> | ||
196 | + <!-- type="text">--> | ||
197 | + <!-- </div>--> | ||
198 | + <!--</div>--> | ||
192 | <div class="layui-input-block"> | 199 | <div class="layui-input-block"> |
193 | - <div class="tags" id="tags"> | ||
194 | - <input autocomplete="off" class="layui-input" id="resLabelPluginsSelector" name="resLabel" | ||
195 | - placeholder="标签,回车输入" | ||
196 | - type="text"> | ||
197 | - </div> | 200 | + <div id="res-tags" style="line-height: 40px;margin-left: 10px;"></div> |
198 | </div> | 201 | </div> |
202 | + <input type="hidden" id="selectResTagIds"> | ||
199 | </div> | 203 | </div> |
200 | <div class="layui-form-item"> | 204 | <div class="layui-form-item"> |
201 | <label class="layui-form-label" style="height: 100px">备注</label> | 205 | <label class="layui-form-label" style="height: 100px">备注</label> |
-
Please register or login to post a comment