From c33f2f573772eeb8a433bf0bd3621095a68f5b0b Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Thu, 17 Jun 2021 17:57:27 +0800
Subject: [PATCH] 0617

---
 .../indexlib/impl/IndexLibServiceImpl.java    |  2 +-
 .../resources/static/route/web/public.html    | 19 ++++++++++++++++---
 src/main/resources/templates/index.html       | 13 ++++++++-----
 3 files changed, 25 insertions(+), 9 deletions(-)

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 @@
 <!--                        </div>-->
                         <div class="line">
                             <span>操作：</span>
-                            <a href="javascript: void(0);" class="operation-btn operation-examine" @click="doReport(list.indexTemplateSavePath, list.indexLibId)">上报</a>
-                            <a href="javascript: void(0);" class="operation-btn operation-examine" @click="doReport(list.indexTemplateListPath, list.indexLibId)">查看列表</a>
-                            <!--<a href="javascript: void(0);" class="operation-btn operation-pass">审核通过(0)</a>-->
+                            <a href="javascript: void(0);" class="operation-btn operation-examine" @click="doReport(list.indexTemplateSavePath, list.indexLibId)" v-if="list.initButton && list.initButton.length > 0 && list.showReport">上报</a>
+                            <a href="javascript: void(0);" class="operation-btn operation-examine" @click="doReport(list.indexTemplateListPath, list.indexLibId)" v-if="list.initButton && list.initButton.length > 0 && list.showList">查看列表</a>
+                                <!--<a href="javascript: void(0);" class="operation-btn operation-pass">审核通过(0)</a>-->
                             <!--<a href="javascript: void(0);" class="operation-btn operation-not-pass">待审核(0)</a>-->
                             <!--<a href="javascript: void(0);" class="operation-btn operation-score">归档</a>-->
                             <!--<a href="javascript: void(0);" class="operation-btn operation-score">不通过</a>-->
@@ -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 @@
                 <li class="log-out">
                     <div class="left fl">
 <!--                        <span th:text="${userName}" th:if="${userUserName eq 'admin'}"></span>-->
-                        <span th:text="${userName}"></span>
+                        <span th:text="${userParams.userName}"></span>
 <!--                        <span th:text="${userName}" th:if="${userUserName ne 'admin'}" class="not-admin"></span>-->
 <!--                        <a href="default-main" th:if="${userUserName eq 'admin'}">后台</a>-->
                         <a href="default-main">后台</a>
@@ -143,7 +143,7 @@
         <div class="news-box">
             <div class="box-title">
                 <span>四个清单</span>
-                <a href="route/web/public.html?id=6f0ec363-49a9-4174-a48f-290b69495dfc">更多></a>
+                <a :href="'route/web/public.html?id=6f0ec363-49a9-4174-a48f-290b69495dfc&departmentId=' + departmentId">更多></a>
             </div>
             <div class="news-list">
                 <ul v-cloak>
@@ -156,7 +156,7 @@
         <div class="news-box">
             <div class="box-title">
                 <span>五项流程</span>
-                <a href="route/web/public.html?id=cdd5ffd5-ebd7-4901-afce-f2e98d506c97">更多></a>
+                <a :href="'route/web/public.html?id=cdd5ffd5-ebd7-4901-afce-f2e98d506c97&departmentId=' + departmentId">更多></a>
             </div>
             <div class="news-list">
                 <ul v-cloak>
@@ -169,7 +169,7 @@
         <div class="news-box">
             <div class="box-title">
                 <span>六本台账</span>
-                <a href="route/web/public.html?id=c912f0ff-d1e6-4346-a0cd-c955ea559a0b">更多></a>
+                <a :href="'route/web/public.html?id=c912f0ff-d1e6-4346-a0cd-c955ea559a0b&departmentId=' + departmentId">更多></a>
             </div>
             <div class="news-list">
                 <ul v-cloak>
@@ -190,6 +190,7 @@
     <div class="footer">
 <!--        版权所有：杭锦旗纪委监察局   备案号：蒙ICP备 14000612   技术支持：内蒙古成迈信息科技有限公司（0471-5316868）-->
     </div>
+    <input type="hidden" th:value="${userParams.departmentId}" class="hide-input">
 </div>
 <script src="assets/web/js/jquery-2.1.4.min.js"></script>
 <script src="assets/web/js/jquery.SuperSlide.2.1.1.js"></script>
@@ -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()
         }
     })
 </script>