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

src/views/homePage/index.vue

@@ -8,7 +8,7 @@
         <el-row :gutter="20" class="mt-15 first-zone-style">
         <el-row :gutter="20" class="mt-15 first-zone-style">
           <el-col :span="10" style="padding-left:0;padding-right:0;">
           <el-col :span="10" style="padding-left:0;padding-right:0;">
             <div >
             <div >
-              <el-carousel style="border-radius:8px;"  height="400px"  :interval="4000">
+              <el-carousel style="border-radius:8px;"  height="500px" indicator-position="outside" :interval="4000">
                 <el-carousel-item   style="border-radius:8px;" v-for="(item,index) in headlineRotation" :key="index">
                 <el-carousel-item   style="border-radius:8px;" v-for="(item,index) in headlineRotation" :key="index">
                   <div v-if="item.attInfoList.length>0" class="carousel-div" style="border-radius:8px;" @click="setParams(item)">
                   <div v-if="item.attInfoList.length>0" class="carousel-div" style="border-radius:8px;" @click="setParams(item)">
                     <el-image  :src="item.attInfoList[0].downloadPath" fit="contain" style="width:100%;height:100%;"></el-image>
                     <el-image  :src="item.attInfoList[0].downloadPath" fit="contain" style="width:100%;height:100%;"></el-image>
@@ -54,7 +54,7 @@
               <!--工作信息开始-->
               <!--工作信息开始-->
               <div v-if="activeItem==1" class="mt-15">
               <div v-if="activeItem==1" class="mt-15">
                 <el-row :gutter="20">
                 <el-row :gutter="20">
-                  <el-col :span="8" style="">
+                  <el-col :span="10" style="">
                     <div  class="work-tab-list" v-for="(item,index) in WorkButton" :key="index" >
                     <div  class="work-tab-list" v-for="(item,index) in WorkButton" :key="index" >
                       <div class="tab-item" @click="informationSelection(item)">
                       <div class="tab-item" @click="informationSelection(item)">
                         {{item.boardName}}
                         {{item.boardName}}
@@ -62,7 +62,7 @@
                      
                      
                     </div>
                     </div>
                   </el-col >
                   </el-col >
-                  <el-col :span="16" style="">
+                  <el-col :span="14" style="">
                     <div v-for="(item,index) in topList" :key="index" class="k-flex k-space-between work-top-list" @click="setParams(item)">
                     <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="">
                       <div  class="article-name" style="">
                         <span class="right-line">{{item.boardName}}</span>
                         <span class="right-line">{{item.boardName}}</span>
@@ -456,7 +456,7 @@
           </el-col>
           </el-col>
           <el-col :span="11">
           <el-col :span="11">
               <el-carousel style="border-radius:8px;"  height="280px" indicator-position="outside" :interval="4000">
               <el-carousel style="border-radius:8px;"  height="280px" indicator-position="outside" :interval="4000">
-                <el-carousel-item style="border-radius:8px;"  v-for="item in tableData" :key="item.id">
+                <el-carousel-item style="border-radius:8px;"  v-for="item in tableDataImg" :key="item.id">
                   <div  v-if="item.attInfoList.length>0" class="carousel-div" style="border-radius:8px;" @click="setParams(item)">
                   <div  v-if="item.attInfoList.length>0" class="carousel-div" style="border-radius:8px;" @click="setParams(item)">
                     <el-image :src="item.attInfoList[0].downloadPath" fit="contain" style="width:100%;height:100%;"></el-image>
                     <el-image :src="item.attInfoList[0].downloadPath" fit="contain" style="width:100%;height:100%;"></el-image>
                     <div class="carousel-intro" style="">
                     <div class="carousel-intro" style="">
@@ -922,23 +922,8 @@ export default {
           date:'09-23'
           date:'09-23'
         },
         },
       ],
       ],
-      tableData: [{
-          date: '2016-05-02 12:00:00',
-          name: '24',
-          address: '【广西高院队就】广西高院队伍整顿简报官方首发的广东话合规合法的韩国和跟黑社会呵呵呵回复的环境'
-        }, {
-          date: '2016-05-04 12:00:00',
-          name: '45',
-          address: '上海市普陀区金沙江路 1517 弄还是个哈哈哈韩国发动机简洁大方'
-        }, {
-          date: '2016-05-01 12:00:00',
-          name: '67',
-          address: '上海市普陀区金沙江路 1519 弄好好说话'
-        }, {
-          date: '2016-05-03 12:00:00',
-          name: '89',
-          address: '上海市普陀区金沙江路 1516 弄合适的哈哈和'
-        }],
+      tableData: [],
+      tableDataImg:[],
       // leftList:[
       // leftList:[
       //   { 
       //   { 
       //     id:1,
       //     id:1,
@@ -1154,7 +1139,7 @@ export default {
     },
     },
     initializationList(){
     initializationList(){
        newsFromBoard({boardId:'1930',page:1,size:5}).then(res=>{
        newsFromBoard({boardId:'1930',page:1,size:5}).then(res=>{
-       this.tableData = res.data.newsList.records   
+       this.tableDataImg = res.data.newsList.records   
        })
        })
 
 
        newsFromBoard({boardId:'135',page:1,size:5}).then(res=>{
        newsFromBoard({boardId:'135',page:1,size:5}).then(res=>{