From 4604ea357977b68a7acf5f18f38ca6bf21517382 Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Fri, 3 Sep 2021 10:09:59 +0800
Subject: [PATCH] 0903

---
 .../resources/static/assets/web/css/index.css | 178 +++---------------
 .../static/route/web/news-list-column.html    |   7 +
 .../resources/static/route/web/news-list.html |   7 +
 3 files changed, 40 insertions(+), 152 deletions(-)

diff --git a/src/main/resources/static/assets/web/css/index.css b/src/main/resources/static/assets/web/css/index.css
index 1980d7a..79004d0 100644
--- a/src/main/resources/static/assets/web/css/index.css
+++ b/src/main/resources/static/assets/web/css/index.css
@@ -93,155 +93,29 @@
 
 
 /*-------二级页面--------*/
-.child-header{
-    background: url("../images/child-header.jpg") no-repeat center;
-    background-size: 100% 100%;
-}
-.child-header .date{
-    color: #fff;
-}
-.page-container{
-    width: 1200px;
-    margin: 30px auto;
-    box-shadow: 0 0 10px #ddd;
-    padding: 15px;
-    box-sizing: border-box;
-}
-.page-container:after{
-    content: '';
-    display: block;
-    clear: both;
-}
-.page-left{
-    width: 220px;
-    padding-right: 25px;
-    box-sizing: border-box;
-    float:left;
-}
-.page-left-title{
-    padding-bottom: 10px;
-    border-bottom: 1px solid #ddd;
-    font-size: 18px;
-    color: #585858;
-}
-.page-left-tab{
-    padding: 0 15px;
-    margin-top: 10px;
-}
-.page-left-tab li{
-    line-height: 30px;
-    padding-left: 20px;
-    position: relative;
-    font-size: 18px;
-    color: #000;
-    cursor: pointer;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.page-left-tab li.active{
-    color: #bb1511;
-}
-.page-left-tab li:after{
-    content: '';
-    display: block;
-    width: 6px;
-    height: 6px;
-    border-radius: 50%;
-    background: #000;
-    position: absolute;
-    top: 50%;
-    left: 0;
-    margin-top: -3px;
-}
-.page-left-tab li.active:after{
-    background: #bb1511;
-}
-.page-right{
-    float:right;
-    width: 950px;
-    padding-left: 20px;
-    border-left: 1px solid #ddd;
-    box-sizing: border-box;
-}
-.page-right-title{
-    padding-bottom: 10px;
-    border-bottom: 1px solid #ddd;
-    font-size: 18px;
-    color: #bb1511;
-}
-.page-list>ul{
-    min-height: 500px;
-}
-.page-list>ul>li{
-    height: 45px;
-    line-height: 45px;
-    font-size: 18px;
-}
-.page-list>ul>li a{
-    display: inline-block;
-    max-width: 75%;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    color: #000;
-}
-.page-list>ul>li a:hover{
-    color: #bb1511;
-}
-.page-list>ul>li span{
-    float:right;
-    color: #666;
-}
-.pager{
-    width: 100%;
-    margin: 20px auto;
-    text-align: center;
-    font-size: 0;
-}
-.pager span{
-    display: inline-block;
-    padding: 0 15px;
-    line-height: 25px;
-    color: #676767;
-    border: 1px solid #d2d2d2;
-    font-size: 18px;
-    margin: 0 5px;
-    vertical-align: middle;
-    cursor: pointer;
-}
-.pager ul{
-    display: inline-block;
-    overflow: hidden;
-    vertical-align: middle;
-}
-.pager>ul>li{
-    width: 45px;
-    line-height: 25px;
-    float: left;
-    margin-right: 10px;
-    border: 1px solid #d2d2d2;
-    cursor: pointer;
-    text-align: center;
-    font-size: 18px;
-    color: #676767;
-}
-.pager>ul>li.active{
-    background: #bb1511;
-    color: #fff;
-    border: 1px solid #bb1511;
-}
-.loading{
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    background: rgba(255,255,255,0.6);
-    padding: 30px;
-    border-radius: 10px;
-    box-shadow: 0 0 17px #DEDEDE;
-}
-.page-right-full{
-    width: 100%;
-    border: none;
-}
\ No newline at end of file
+.child-header{background:url(../images/child-header.jpg) no-repeat center;background-size:100% 100%}
+.child-header .date{color:#fff}
+.page-container{width:1200px;margin:20px auto;box-shadow:0 0 10px #ddd;padding:15px;box-sizing:border-box}
+.page-container:after{content:'';display:block;clear:both}
+.page-left{width:220px;padding-right:25px;box-sizing:border-box;float:left}
+.page-left-title{padding-bottom:10px;border-bottom:1px solid #ddd;font-size:18px;color:#585858}
+.page-left-tab{padding:0 15px;margin-top:10px}
+.page-left-tab li{line-height:30px;padding-left:20px;position:relative;font-size:18px;color:#000;cursor:pointer;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.page-left-tab li.active{color:#bb1511}
+.page-left-tab li:after{content:'';display:block;width:6px;height:6px;border-radius:50%;background:#000;position:absolute;top:50%;left:0;margin-top:-3px}
+.page-left-tab li.active:after{background:#bb1511}
+.page-right{float:right;width:950px;padding-left:20px;border-left:1px solid #ddd;box-sizing:border-box}
+.page-right-title{padding-bottom:10px;border-bottom:1px solid #ddd;font-size:18px;color:#bb1511}
+.page-list>ul{min-height:500px}
+.page-list>ul>li{height:45px;line-height:45px;font-size:18px}
+.page-list>ul>li a{display:inline-block;max-width:75%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#000}
+.page-list>ul>li a:hover{color:#bb1511}
+.page-list>ul>li span{float:right;color:#666}
+.pager{width:100%;margin:20px auto;text-align:center;font-size:0}
+.pager span{display:inline-block;padding:0 15px;line-height:25px;color:#676767;border:1px solid #d2d2d2;font-size:18px;margin:0 5px;vertical-align:middle;cursor:pointer}
+.pager ul{display:inline-block;overflow:hidden;vertical-align:middle}
+.pager>ul>li{width:45px;line-height:25px;float:left;margin-right:10px;border:1px solid #d2d2d2;cursor:pointer;text-align:center;font-size:18px;color:#676767}
+.pager>ul>li.active{background:#bb1511;color:#fff;border:1px solid #bb1511}
+.loading{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);background:rgba(255,255,255,.6);padding:30px;border-radius:10px;box-shadow:0 0 17px #dedede}
+.page-right-full{width:100%;border:none}
+.location{width:1200px;margin:20px auto 0}
diff --git a/src/main/resources/static/route/web/news-list-column.html b/src/main/resources/static/route/web/news-list-column.html
index 778a054..0fa69d7 100644
--- a/src/main/resources/static/route/web/news-list-column.html
+++ b/src/main/resources/static/route/web/news-list-column.html
@@ -63,6 +63,13 @@
             </div>
         </div>
 
+        <div class="location">
+            <a href="indexweb">首页</a> >
+            <span v-if="page.articleTypeId == '04988903-8948-4645-9024-6c97f770c8d7'">党纪法规</span>
+            <span v-if="page.articleTypeId == '68167be6-3dbd-49d3-a956-d07e3e4384e5'">警示教育</span>
+            <span v-if="page.articleTypeId == '79da7965-1bff-4471-babe-7874474cb418'">学习园地</span>
+        </div>
+
         <div class="page-container">
             <div class="page-left">
                 <div class="page-left-title" v-if="page.articleTypeId == '04988903-8948-4645-9024-6c97f770c8d7'">党纪法规</div>
diff --git a/src/main/resources/static/route/web/news-list.html b/src/main/resources/static/route/web/news-list.html
index 88712b8..052994c 100644
--- a/src/main/resources/static/route/web/news-list.html
+++ b/src/main/resources/static/route/web/news-list.html
@@ -63,6 +63,13 @@
         </div>
     </div>
 
+    <div class="location">
+        <a href="indexweb">首页</a> >
+        <span v-if="page.articleTypeId == '3c0d1478-f75a-42a6-9bb5-7fa30d854b9b'">通知公告</span>
+        <span v-if="page.articleTypeId == '256caf34-c00e-4524-8de6-3803c0a4dff7'">新闻资讯</span>
+        <span v-if="page.articleTypeId == 'ccb93228-d911-4384-ad7d-26fda5182105'">基层风采</span>
+    </div>
+    
     <div class="page-container">
         <div class="page-right page-right-full" v-cloak>
             <div class="page-right-title" v-if="page.articleTypeId == '3c0d1478-f75a-42a6-9bb5-7fa30d854b9b'">通知公告</div>