diff --git a/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java index 784bb69..cc98825 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java @@ -315,7 +315,7 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib } for (RolePO role : roles) { if(ROLE_CODE_2.equals(role.getRoleCode())){ - //list.add("1"); + list.add("1"); list.add("2"); } } diff --git a/src/main/resources/static/route/web/public.html b/src/main/resources/static/route/web/public.html index c2ec77e..448e98e 100644 --- a/src/main/resources/static/route/web/public.html +++ b/src/main/resources/static/route/web/public.html @@ -210,9 +210,9 @@
操作: - 上报 - 查看列表 - + 上报 + 查看列表 + @@ -425,7 +425,20 @@ if (!data.rows[i].indexLibRemark) { data.rows[i].indexLibRemark = '暂无' } + if (data.rows[i].initButton.length == 1) { + if (data.rows[i].initButton[0] == '1') { + data.rows[i]['showReport'] = true + data.rows[i]['showList'] = false + } else { + data.rows[i]['showReport'] = false + data.rows[i]['showList'] = true + } + } else { + data.rows[i]['showList'] = true + data.rows[i]['showReport'] = true + } } + console.log(data.rows) self.mainList = data.rows self.page.page = data.page self.page.totalPage = Math.ceil(data.total / self.page.rows) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 1915aa9..0e1c659 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -73,7 +73,7 @@
  • - + 后台 @@ -143,7 +143,7 @@
    四个清单 - 更多> + 更多>
      @@ -156,7 +156,7 @@
      五项流程 - 更多> + 更多>
        @@ -169,7 +169,7 @@
        六本台账 - 更多> + 更多>
          @@ -190,6 +190,7 @@ +
        @@ -213,7 +214,8 @@ streetList: [], fourList: [], fiveStep: [], - sixBook: [] + sixBook: [], + departmentId: '' }, methods: { // 获取顶部导航 @@ -395,6 +397,7 @@ this.getSixBook() $('.street-box').niceScroll() $('.news-list ul').niceScroll() + this.departmentId = $('.hide-input').val() } })