Merge branch 'master' of http://139.159.239.83:9093/mxl/court-inner

src/api/homePage.js

@@ -36,3 +36,13 @@ export function newsFromBoard(data) {
       method: 'post'
     })
 }
+
+
+// 文章详情
+export function newsDetail(data) {
+    return request({
+        url: `websiteCluster/website/newsDetail`,
+        data,
+      method: 'post'
+    })
+}
\ No newline at end of file

src/views/homePage/index.vue

@@ -42,12 +42,12 @@
                     <span>鹿心社与自治区级政法机关领导班子成立交付给来访登记过了多久</span>
                   </div>
                 </div>
-                <div v-for="(item,index) in topList" :key="index" class="k-flex k-space-between top-list">
+                <div v-for="(item,index) in topList" :key="index" class="k-flex k-space-between top-list" @click="setParams(item)">
                   <div class="article-name">
-                    <span class="right-line">我为群众办实事</span>
+                    <span class="right-line">{{item.boardName}}</span>
                    <span >{{item.subject}}</span>
                       </div>
-                      <div>{{item.newsTime}}</div>
+                      <div>{{item.newsTime.substring(5,10)}}</div>
                 </div>
               </div>
               <!--今日头条结束-->
@@ -55,33 +55,19 @@
               <div v-if="activeItem==1" class="mt-15">
                 <el-row :gutter="20">
                   <el-col :span="8" style="">
-                    <div  class="work-tab-list">
-                      <div class="tab-item">
-                        全&ensp;&ensp;&ensp;&ensp;部
-                      </div> 
-                      <div class="tab-item">
-                        桂高法通报
-                      </div> 
-                      <div class="tab-item">
-                        最高人民法院简报
-                      </div> 
-                      <div class="tab-item">
-                        广西高院简报<br/>信息专报
-                      </div> 
-                      <div class="tab-item">
-                        广西高院队伍<br/>教育整顿简报和动态
-                      </div> 
-                      <div class="tab-item">
-                        最高人民法院队伍<br/>教育整顿工作简报
+                    <div  class="work-tab-list" v-for="(item,index) in WorkButton" :key="index" >
+                      <div class="tab-item" @click="informationSelection(item)">
+                        {{item.boardName}}
                       </div> 
+                     
                     </div>
                   </el-col >
                   <el-col :span="16" style="">
-                    <div v-for="(item,index) in topList" :key="index" class="k-flex k-space-between work-top-list">
+                    <div v-for="(item,index) in topList" :key="index" class="k-flex k-space-between work-top-list" @click="setParams(item)">
                       <div  class="article-name" style="">
                         <span >{{item.subject}}</span>
                       </div>
-                      <div>{{item.newsTime}}</div>
+                      <div>{{item.newsTime.substring(5,10)}}</div>
                     </div>
                   </el-col >
                 </el-row>
@@ -364,7 +350,7 @@
             </div>
             <el-row class="mt-10" :gutter="20">
               
-              <el-col :span="7" style="background: #fafafa;padding:15px;">
+              <el-col :span="10" style="background: #fafafa;padding:15px;">
                 <div style="height:250px;overflow-y:auto;">
                   <div class="tree-search mb-15">
                       <el-input   
@@ -452,14 +438,16 @@
                 <!--结束-->
                 </div>
               </el-col>
-              <el-col :span="17">
+              <el-col :span="14">
                 <ul class="business-ul">
-                  <li v-for="(item,index) in tableData" :key="index">
+                  <li v-for="(item,index) in tableData" :key="index" class="k-flex k-space-between " @click="setParams(item)" >
+                    <div class="article-name">
                     <span>【</span>
-                    <span>过分过分的话</span>
+                    <span>{{item.boardName}}</span>
                     <span>】</span>
-                    <span>{{item.subject}}</span>
-                    
+                    <span>{{item.subject}}</span></div>
+                    <div>
+                    <span class="">{{item.newsTime.substring(5,10)}}</span></div>
                   </li>
                 </ul>
               </el-col>
@@ -1161,7 +1149,11 @@ export default {
           {name:'新疆'},
           {name:'新疆兵团'},
 
-        ]
+        ],
+        WorkButton:[{
+          boardName:'全部',
+          boardId:'',
+        }],
   
 
     }
@@ -1169,10 +1161,34 @@ export default {
   created(){
     this.getBoardTreeFun()
     this.topListFun()
+    this.initializationList()
   },
   methods: {
+    setParams(val){
+       this.$router.push({
+                    path:'/detail',//跳转路由
+                    query:{//参数对象
+                        newsId:val.newsId
+                    }
+                });
+
+    },
+    initializationList(){
+       newsFromBoard({boardId:'129',page:1,size:5}).then(res=>{
+       this.tableData = res.data.top.records   
+       })
+    },
+    newsFromBoard(val){
+      newsFromBoard({boardId:val.boardId,page:1,size:5}).then(res=>{
+        this.topList = res.data.records
+      })
+    },
+    informationSelection(val){
+      console.log(val);
+     this.newsFromBoard(val)
+    },
     topListFun(){
-      topList({fyId:32}).then(res=>{
+      topList({fyId:32,page:1,size:5}).then(res=>{
          this.topList = res.data.records
       })
     },
@@ -1193,13 +1209,17 @@ export default {
       console.log('111===', i)
       this.activeItem=i;
       if (i==0) {
-        topList({fyId:32}).then(res=>{
-        this.topList = res.data.records
-      })
-      }else{
-        getSubLevelBoard({boardId:32}).then(res=>{
+       this.topListFun()
       
+      }else{
+        getSubLevelBoard({boardId:1929,}).then(res=>{ 
+        this.WorkButton = [{ boardName:'全部'}]
+          res.data.forEach(item => {
+            this.WorkButton.push(item)
+          });
         })
+        let val = {boardId:''}
+        this.newsFromBoard(val)
       }
     },
     switchBtnPolice(i){
@@ -1209,7 +1229,9 @@ export default {
     searchEvent(){},
     handleNodeClick(data,node,obj){
       console.log(data,node,obj);
-     
+     newsFromBoard({boardId:data.boardId}).then(res=>{
+       this.tableData = res.data.top.records   
+       })
     },
     
   },
@@ -1217,6 +1239,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 .el-col {
     border-radius: 4px;
   }
@@ -1418,6 +1441,7 @@ color:#fff;
 .tab-item{
 // height:45px;
 // line-height:45px;
+margin: 10px 0;
 padding:10px 0;
 text-align:center;
 background:#ccc;
@@ -1456,7 +1480,7 @@ cursor: pointer;
 .business-ul{
   margin:0;
   margin-top:10px;
-  width:80%;
+  width:100%;
 //   white-space:nowrap;
 //  overflow:hidden;
 //  text-overflow:ellipsis;
@@ -1537,6 +1561,7 @@ padding:0;
     display: flex;
     flex-direction: column;
     border-left: 1px dashed #6e6e6e;
+
   }
   &-title {
     width: 90%;