Merge branch 'master' of http://git.cc-lotus.info/smart-center/web-common

src/layout/index/chengguo.vue

@@ -11,15 +11,16 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="newsMain">
-          <el-col class="chengguolist" :span="24" v-for="(tag, index) in chengguolist" :key="index" :type="tag.type"
-                  @click="$router.push({ path: '/detail', params:{id:tag.id} })">
-            <el-col :span="20">
-              {{tag.title}}
+           <el-col :span="24" v-for="(tag, index) in chengguolist" :key="index" :type="tag.type">
+              <el-col class="chengguolist" :span="24" v-for="(item, index) in tag.children" :key="index">
+                <el-col :span="16" @click="$router.push({ path: '/detail', params:{id:item.id} })">
+                  <p class="textOver">{{ item.title }}</p>
+                </el-col>
+                <el-col :span="8" style="text-align:right;">
+                  {{item.publish_time}}
+                </el-col>
+              </el-col>
             </el-col>
-            <el-col :span="4" style="text-align:right;">
-              {{tag.time}}
-            </el-col>
-          </el-col>
         </el-col>
       </el-col>
     </el-row>
@@ -46,6 +47,15 @@ export default {
 </script>
 
 <style lang="less" scoped>
+p {
+  margin: 0;
+  padding: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .news {
   padding: 10px;
 }
@@ -65,4 +75,8 @@ export default {
 .newsMain {
   padding: 5px 0;
 }
+.chengguolist p:hover{
+  color:#850000;
+  cursor: pointer;
+}
 </style>

src/layout/index/mingshi.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="news">
+  <div id="mingshi">
     <el-row>
       <el-col :span="24" class="news">
         <el-col :span="24" class="topTit">
@@ -11,13 +11,14 @@
           </el-col>
         </el-col>
           <el-col :span="24" class="newsMain">
-            <el-col class="chengguolist" :span="24" v-for="(tag, index) in mingshilist" :key="index" :type="tag.type"
-                  @click="$router.push({ path: '/detail', params:{id:tag.id} })">
-              <el-col :span="16">
-                {{tag.title}}
-              </el-col>
-              <el-col :span="8" style="text-align:right;">
-                {{tag.time}}
+            <el-col :span="24" v-for="(tag, index) in mingshilist" :key="index" :type="tag.type">
+              <el-col class="chengguolist" :span="24" v-for="(item, index) in tag.children" :key="index">
+                <el-col :span="16" @click="$router.push({ path: '/detail', params:{id:item.id} })">
+                  <p class="textOver">{{ item.title }}</p>
+                </el-col>
+                <el-col :span="8" style="text-align:right;">
+                  {{item.publish_time}}
+                </el-col>
               </el-col>
             </el-col>
           </el-col>
@@ -28,7 +29,7 @@
 
 <script>
 export default {
-  name: 'news',
+  name: 'mingshi',
   props: {
     mingshilist:null,
   },
@@ -45,6 +46,15 @@ export default {
 </script>
 
 <style lang="less" scoped>
+p {
+  margin: 0;
+  padding: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .news {
   padding: 10px;
 }
@@ -64,4 +74,8 @@ export default {
   border-bottom: 1px dashed #ccc;
   margin: 1px;
 }
+.chengguolist p:hover{
+  color:#850000;
+  cursor: pointer;
+}
 </style>

src/layout/index/news.vue

@@ -11,13 +11,14 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="newsMain">
-          <el-col class="chengguolist" :span="24" v-for="(tag, index) in newslist" :key="index" :type="tag.type"
-                  @click="$router.push({ path: '/detail', params:{id:tag.id} })">
-            <el-col :span="20">
-              {{tag.title}}
-            </el-col>
-            <el-col :span="4" style="text-align:right;">
-              {{tag.time}}
+          <el-col :span="24" v-for="(tag, index) in newslist.children" :key="index" :type="tag.type">
+            <el-col class="chengguolist" :span="24" v-for="(item, index) in tag.children" :key="index">
+              <el-col :span="20" @click="$router.push({ path: '/detail', params:{id:item.id} })">
+                <p class="textOver">{{ item.title }}</p>
+              </el-col>
+              <el-col :span="4" style="text-align:right;">
+                {{item.publish_time}}
+              </el-col>
             </el-col>
           </el-col>
         </el-col>
@@ -46,6 +47,15 @@ export default {
 </script>
 
 <style lang="less" scoped>
+p {
+  margin: 0;
+  padding: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .news {
   padding: 10px;
 }
@@ -62,6 +72,14 @@ export default {
   border-bottom: 1px dashed #ccc;
   margin: 1px;
 }
+.chengguolist .el-link {
+  font-size: 16px;
+  color: #000;
+}
+.chengguolist p:hover{
+  color:#850000;
+  cursor: pointer;
+}
 .newsMain {
   padding: 5px 0;
 }

src/layout/index/notice.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="news">
+  <div id="notice">
     <el-row>
       <el-col :span="24" class="news">
         <el-col :span="24" class="topTit">
@@ -10,17 +10,18 @@
             <el-link :underline="false" :style="`color:${Color}`">MORE<i class="el-icon-video-play"></i></el-link>
           </el-col>
         </el-col>
-          <el-col :span="24" class="newsMain">
-            <el-col class="chengguolist" :span="24" v-for="(tag, index) in noticelist" :key="index" :type="tag.type"
-                  @click="$router.push({ path: '/detail', params:{id:tag.id} })">
-              <el-col :span="16">
-                {{tag.title}}
+        <el-col :span="24" class="newsMain">
+          <el-col :span="24" v-for="(tag, index) in noticelist.children" :key="index" :type="tag.type">
+            <el-col class="chengguolist" :span="24" v-for="(item, index) in tag.children" :key="index">
+              <el-col :span="16" @click="$router.push({ path: '/detail', params:{id:item.id} })">
+                <p class="textOver">{{ item.title }}</p>
               </el-col>
               <el-col :span="8" style="text-align:right;">
-                {{tag.time}}
+                {{item.publish_time}}
               </el-col>
             </el-col>
           </el-col>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -28,23 +29,32 @@
 
 <script>
 export default {
-  name: 'news',
+  name: 'notice',
   props: {
-    noticelist:null,
+    noticelist: null,
   },
   components: {},
   data: () => ({
-    borderColor:'#850000',
-    Color:'#850000',
-    title:"通知公告",
+    borderColor: '#850000',
+    Color: '#850000',
+    title: "通知公告",
   }),
-  created() {},
+  created() { },
   computed: {},
   methods: {},
 };
 </script>
 
 <style lang="less" scoped>
+p {
+  margin: 0;
+  padding: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .news {
   padding: 10px;
 }
@@ -59,9 +69,13 @@ export default {
 .newsMain {
   padding: 5px 0;
 }
-.chengguolist{
+.chengguolist {
   padding: 10px 0;
   border-bottom: 1px dashed #ccc;
   margin: 1px;
 }
+.chengguolist p:hover{
+  color:#850000;
+  cursor: pointer;
+}
 </style>

src/layout/index/top.vue

@@ -2,7 +2,8 @@
   <div id="top">
     <el-row>
       <el-col :span="24" class="image">
-        <el-image :src="logolist.logo"></el-image>
+        <!-- <el-image :src="topInfo.logo" v-if="topInfo && topInfo.logo"></el-image> -->
+         <el-image :src="topInfo.logo"></el-image>
       </el-col>
     </el-row>
   </div>
@@ -12,7 +13,7 @@
 export default {
   name: 'top',
   props: {
-    logolist: null,
+    topInfo: null,
   },
   components: {},
   data: () => ({}),

src/views/index/index.vue

@@ -3,7 +3,7 @@
     <el-row style="overflow-y: hidden;">
       <el-col :span="24" class="top">
         <div class="w_1200">
-          <top :logolist="logolist"></top>
+          <top :topInfo="topInfo"></top>
         </div>
       </el-col>
       <el-col :span="24" class="menu">
@@ -49,7 +49,7 @@ import footinfo from '../../layout/index/foot.vue';
 export default {
   name: 'index',
   props: {
-    logolist:null,
+    topInfo:null,
     noticelist:null,
     newslist:null,
     mingshilist:null,