Merge branch 'master-V32-XuHaoJie' into 'master'
杭州-首页-置顶业务后,点击取消置顶业务,下方按资源类型维度展示小卡片消失 See merge request !165
Showing
1 changed file
with
4 additions
and
6 deletions
@@ -300,7 +300,6 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' | @@ -300,7 +300,6 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' | ||
300 | $(".index-line").show(); | 300 | $(".index-line").show(); |
301 | layui.use('laytpl', function () { | 301 | layui.use('laytpl', function () { |
302 | var laytpl = layui.laytpl; | 302 | var laytpl = layui.laytpl; |
303 | - | ||
304 | //加载资源类型导航 | 303 | //加载资源类型导航 |
305 | var getResTypeTpl = document.getElementById("indexResTypeTabTpl").innerHTML; | 304 | var getResTypeTpl = document.getElementById("indexResTypeTabTpl").innerHTML; |
306 | laytpl(getResTypeTpl).render(data, function (html) { | 305 | laytpl(getResTypeTpl).render(data, function (html) { |
@@ -530,15 +529,14 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' | @@ -530,15 +529,14 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' | ||
530 | , done: function (res) { | 529 | , done: function (res) { |
531 | if(res.success){ | 530 | if(res.success){ |
532 | layer.msg("取消置顶成功",{icon:1,time:2000}); | 531 | layer.msg("取消置顶成功",{icon:1,time:2000}); |
533 | - if(mark == "resType"){ | ||
534 | - loadResTypeInfo() | ||
535 | - }else { | ||
536 | - loadBizInfo(); | ||
537 | - } | 532 | + //同时刷新业务和资源类型 |
533 | + loadBizInfo(); | ||
534 | + loadResTypeInfo(); | ||
538 | } | 535 | } |
539 | } | 536 | } |
540 | }) | 537 | }) |
541 | 538 | ||
539 | + | ||
542 | } | 540 | } |
543 | //渲染拓扑 | 541 | //渲染拓扑 |
544 | function renderMxgraphView(topoId) { | 542 | function renderMxgraphView(topoId) { |
-
Please register or login to post a comment