更新

src/layout/altai/info/dongtai.vue

@@ -92,7 +92,7 @@ ul {
   margin: 0 10px 6px 0;
 }
 .content ul {
-  height: 250px;
+  height: 280px;
   display: -webkit-box;
   text-overflow: ellipsis;
   overflow : hidden;

src/layout/altai/train/dynamic.vue

@@ -1,8 +1,28 @@
 <template>
   <div id="dynamic">
-    <el-row>
+     <el-row>
       <el-col :span="24">
-
+        <el-tabs type="border-card" style="height:400px">
+          <el-tab-pane v-for="(item,index) in dynamicList" :key="index">
+            <span slot="label" class="title">{{item.title}}
+              <!-- <span></span> -->
+            </span>
+            <el-col :span="24" class="content">
+              <ul>
+                <li v-for="(tag,index) in item.content" :key="index">
+                  <a href="#">
+                    <span class="dot"></span>
+                    <span>{{tag.title}}</span>
+                    <span class="tt">{{tag.time}}</span>
+                  </a>
+                </li>
+              </ul>
+              <div class="entermore">
+                <a href="#">查看更多</a>
+              </div>
+            </el-col>
+          </el-tab-pane>
+        </el-tabs>
       </el-col>
     </el-row>
   </div>
@@ -11,7 +31,9 @@
 <script>
 export default {
   name: 'dynamic',
-  props: {},
+  props: {
+    dynamicList:null,
+  },
   components: {},
   data: () => ({}),
   created() {},
@@ -20,4 +42,87 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped>
+a {
+  text-decoration: none;
+}
+ul {
+  padding: 0px;
+  list-style: none;
+}
+/deep/.el-tabs__nav {
+  padding: 10px 10px 0 10px;
+  background-color: #ffffff;
+  width: 100%;
+}
+/deep/.el-tabs__item {
+  display: contents;
+}
+/deep/.el-tabs--border-card > .el-tabs__content {
+  padding: 0 15px 15px 15px;
+}
+/deep/.el-tabs__nav-wrap.is-scrollable {
+  padding: 0;
+}
+/deep/.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
+    color: #2c3350;
+}
+/deep/.el-tabs--border-card>.el-tabs__header .el-tabs__item:not(.is-disabled):hover {
+   color: #2c3350;
+}
+.title {
+  height: 45px;
+  font-size: 22px;
+  font-weight: bold;
+  padding-left: 10px;
+}
+.title span {
+  display: inline-block;
+  height: 4px;
+  width: 4px;
+  text-align: center;
+  background-color: #2b324e;
+  margin: -16px 0px 4px 6px;
+}
+.dot {
+  width: 5px;
+  height: 5px;
+  background-color: #abaab8;
+  border-radius: 90px;
+  margin: 0 10px 6px 0;
+}
+.content ul {
+  height: 177px;
+  display: -webkit-box;
+  text-overflow: ellipsis;
+  overflow : hidden;
+  -webkit-box-orient: vertical;
+}
+.content li {
+  padding: 3px 0;
+}
+.content a {
+  font-size: 16px;
+  color: #6d6d77;
+}
+.tt {
+  color: #abaab8;
+  float: right;
+}
+.content a > span {
+  display: inline-block;
+  max-width: 600px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.entermore {
+  margin-top: 10px;
+  width: 765px;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  background: #f5f5f5;
+  font-size: 16px;
+}
+</style>

src/layout/altai/train/service.vue

@@ -0,0 +1,52 @@
+<template>
+  <div id="service">
+    <el-row>
+      <el-col :span="24" class="top">
+        <span>常用服务</span>
+      </el-col>
+      <el-col :span="24" class="fuwu">
+        <el-col class="img" :span="8" v-for="(item,index) in serviceList" :key="index">
+          <a href="#">
+            <el-image :src="item.url" style="width:349px;height:100px"></el-image>
+          </a>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'service',
+  props: {
+    serviceList: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() { },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.top {
+  height: 60px;
+  line-height: 60px;
+}
+.top span {
+  font-size: 22px;
+  color: #2c3350;
+  font-weight: bold;
+  padding: 0 20px;
+}
+.fuwu {
+  overflow: hidden;
+  margin-left: 35px;
+  width: 1154px;
+  height: 337px;
+}
+.img{
+  margin: 5px auto;
+}
+</style>

src/views/altai/train.vue

@@ -14,10 +14,10 @@
               <meeting :meetList="meetList"></meeting>
             </el-col>
             <el-col :span="16" class="jishu">
-              <dynamic></dynamic>
+              <dynamic :dynamicList="dynamicList"></dynamic>
             </el-col>
             <el-col :span="24" class="service">
-              常用服务
+              <service :serviceList="serviceList"></service>
             </el-col>
           </el-col>
           <el-col :span="24" class="foot">
@@ -34,18 +34,22 @@ import top from '../../layout/altai/index/top.vue';
 import native from '../../layout/altai/index/native.vue';
 import meeting from '../../layout/altai/train/meeting.vue';
 import dynamic from '../../layout/altai/train/dynamic.vue';
+import service from '../../layout/altai/train/service.vue';
 import foot from '../../layout/altai/index/foot.vue';
 export default {
   name: 'info',
   props: {
     foot: null,//头部+底部数据
     meetList:null,//会议数据
+    dynamicList:null,//科技动态
+    serviceList:null,//常用服务图片
   },
   components: {
     top, //头部
     native, //导航
     meeting,//国际会议中心
     dynamic,//科技动态
+    service,//常用服务
     foot, //底部
   },
   data: () => ({}),
@@ -84,12 +88,12 @@ export default {
   width: 790px;
   height: 300px;
   overflow: hidden;
-  border: 1px solid #ccc;
+  background-color: #fff;
 }
 .service {
   height: 300px;
   overflow: hidden;
-  border: 1px solid #ccc;
+  background-color: #fff;
   margin: 10px 0 0 0;
 }
 .foot {