|
@@ -13,7 +13,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="24" class="main">
|
|
|
<div class="w_1200">
|
|
|
- <el-col :span="6" class="notice">
|
|
|
+ <el-col :span="6" class="notice" >
|
|
|
<notice :noticelist="noticelist"></notice>
|
|
|
</el-col>
|
|
|
<el-col :span="17" class="news">
|
|
@@ -24,13 +24,25 @@
|
|
|
<el-col :span="24" class="mains">
|
|
|
<div class="w_1200">
|
|
|
<el-col :span="6" class="mingshi">
|
|
|
- <mingshi :mingshilist="mingshilist"></mingshi>
|
|
|
+ <mingshi></mingshi>
|
|
|
</el-col>
|
|
|
<el-col :span="17" class="chengguo">
|
|
|
<chengguo :chengguolist="chengguolist"></chengguo>
|
|
|
</el-col>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
+ <el-col :span="24" class="mains">
|
|
|
+ <div class="w_1200">
|
|
|
+ <el-row >
|
|
|
+ <el-col :span="12" class="jishu">
|
|
|
+ <tabsList :title="`技术问答`" :list="tabsList"></tabsList>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="11" :push="1" class="jishu">
|
|
|
+ <infoList :title="`党建信息`" :list="partyList"></infoList>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
<el-col :span="24" class="down">
|
|
|
<footinfo :topInfo="topInfo"></footinfo>
|
|
|
</el-col>
|
|
@@ -46,15 +58,18 @@ import notice from '../../layout/index/notice.vue';
|
|
|
import mingshi from '../../layout/index/mingshi.vue';
|
|
|
import chengguo from '../../layout/index/chengguo.vue';
|
|
|
import footinfo from '../../layout/index/foot.vue';
|
|
|
+import infoList from '../../layout/index/infoList.vue';
|
|
|
+import tabsList from '../../layout/index/tabsList.vue';
|
|
|
export default {
|
|
|
name: 'index',
|
|
|
props: {
|
|
|
topInfos:null,
|
|
|
topInfo:null,
|
|
|
- noticelist:null,
|
|
|
- newslist:null,
|
|
|
- mingshilist:null,
|
|
|
- chengguolist:null,
|
|
|
+ noticelist:null, //公告列表
|
|
|
+ newslist:null, //新闻列表
|
|
|
+ chengguolist:null, //成果展示
|
|
|
+ partyList: null, //党建信息
|
|
|
+ tabsList:null, //标签页列表
|
|
|
footlist:null,
|
|
|
},
|
|
|
components: {
|
|
@@ -65,6 +80,8 @@ export default {
|
|
|
mingshi,
|
|
|
chengguo,
|
|
|
footinfo,
|
|
|
+ infoList,
|
|
|
+ tabsList,
|
|
|
},
|
|
|
data: () => ({}),
|
|
|
created() { },
|
|
@@ -93,6 +110,7 @@ export default {
|
|
|
height: 400px;
|
|
|
border: 1px solid #ccc;
|
|
|
overflow: hidden;
|
|
|
+ background:#fff;
|
|
|
}
|
|
|
.main .news {
|
|
|
float: right;
|
|
@@ -100,6 +118,7 @@ export default {
|
|
|
height: 400px;
|
|
|
border: 1px solid #ccc;
|
|
|
overflow: hidden;
|
|
|
+ background:#fff;
|
|
|
}
|
|
|
.mains {
|
|
|
margin-bottom: 20px;
|
|
@@ -120,4 +139,10 @@ export default {
|
|
|
min-height: 100px;
|
|
|
border: 1px solid #ccc;
|
|
|
}
|
|
|
+.jishu{
|
|
|
+ height: 400px;
|
|
|
+ border: 1px solid #ccc;
|
|
|
+ overflow: hidden;
|
|
|
+ background:#fff;
|
|
|
+}
|
|
|
</style>
|