Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-website

src/components/government/government.vue

@@ -66,9 +66,9 @@ export default {
     zhengwuList: null, //科技政务图片旁边政务活动
     meitiList: null, //科技政务图片旁边媒体焦距
     tongzhiList: null, //通知公告
-    linkList: null, //友情链接
     zhengwu: null, //政务公开
     gongzhongList: null, //公众参与
+    linkList: null, //友情链接
   },
   components: {
     top, //头部

src/layout/government/gongzhong.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="gongzhong">
     <el-col :span="24" class="gongzhong">
-      <el-col :span="24" class="title">公众参与</el-col>
+      <el-col :span="24" class="title">{{ title }}</el-col>
       <el-col class="context" :span="4" v-for="(item, index) in gongzhongList" :key="index">
         <el-link :underline="false" :href="item.url" target="_blank">
           <el-image class="image" :src="item.pic"></el-image>
@@ -19,7 +19,9 @@ export default {
     gongzhongList: null,
   },
   components: {},
-  data: () => ({}),
+  data: () => ({
+    title: '公众参与',
+  }),
   created() {},
   computed: {},
   methods: {},

src/layout/government/notice.vue

@@ -74,16 +74,11 @@ li {
 }
 .list {
   padding: 0 0 0 20px;
-  height: 240px;
-  overflow: hidden;
-}
-.list ul {
-  height: 240px;
-  float: left;
+  height: 230px;
   overflow: hidden;
 }
 .zixunList {
-  padding: 0 0 6px 0;
+  padding: 0 0 5px 0;
 }
 .zixunList .title {
   font-size: 14px;

src/layout/government/zhengwu.vue

@@ -1,12 +1,22 @@
 npm<template>
   <div id="zhengwu">
     <el-col :span="24" class="zhengwu">
-      <el-col :span="24" class="title">{{ title }}</el-col>
-      <el-col class="tubiao" :span="6" v-for="(item, index) in zhengwu" :key="index">
+      <el-col :span="24" class="topTitle">{{ title }}</el-col>
+      <!-- <el-col class="tubiao" :span="6" v-for="(item, index) in zhengwu" :key="index">
         <el-link :underline="false" :href="item.url" target="_blank">
           <el-image class="image" :src="item.pic"></el-image>
           <el-col class="pic_title">{{ item.title }}</el-col>
         </el-link>
+      </el-col> -->
+      <el-col :span="24" class="list">
+        <ul>
+          <li v-for="(item, index) in zhengwu" :key="index">
+            <el-link :underline="false">
+              <el-image class="image" :src="item.pic"></el-image>
+              <el-col class="title">{{ item.title }}</el-col>
+            </el-link>
+          </li>
+        </ul>
       </el-col>
     </el-col>
   </div>
@@ -29,42 +39,70 @@ export default {
 </script>
 
 <style lang="less" scoped>
+ul {
+  padding: 0;
+  margin: 0;
+}
+li {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
 .zhengwu {
   padding: 20px 20px 20px 20px;
   height: 320px;
 }
-.title {
+.topTitle {
   font-size: 22px;
   color: #2c3350;
   font-weight: bold;
   margin: 0 0 10px 0;
 }
-.tubiao {
+.list ul li {
+  float: left;
   border: 1px solid #dee9f9;
   width: 180px;
   height: 110px;
   margin: 0 10px 10px 0;
   text-align: center;
 }
-.tubiao:nth-child(4n) {
-  margin: 0 10px 10px 0;
-}
-.tubiao .pic_title {
-  display: block;
-  float: left;
-  width: 178px;
-  height: 30px;
-  font-size: 22px;
-  line-height: 30px;
-  text-align: center;
-  color: #3981e5;
-  font-size: 18px;
+.list ul li:nth-child(4n) {
+  margin: 0 0 10px 0;
 }
-.tubiao .image {
+.list ul li .image {
   margin: 20px 0 0 0;
 }
-.tubiao:hover {
-  background-color: #dee9f9;
+.list ul li .title {
+  font-size: 18px;
   color: #3981e5;
+  margin: 10px 0;
+}
+.list ul li:hover {
+  background-color: #dee9f9;
 }
+// .tubiao {
+//   border: 1px solid #dee9f9;
+//   width: 180px;
+//   height: 110px;
+//   margin: 0 10px 10px 0;
+//   text-align: center;
+// }
+// .tubiao .pic_title {
+//   display: block;
+//   float: left;
+//   width: 178px;
+//   height: 30px;
+//   font-size: 22px;
+//   line-height: 30px;
+//   text-align: center;
+//   color: #3981e5;
+//   font-size: 18px;
+// }
+// .tubiao .image {
+//   margin: 20px 0 0 0;
+// }
+// .tubiao:hover {
+//   background-color: #dee9f9;
+//   color: #3981e5;
+// }
 </style>

src/views/government/government.vue

@@ -34,43 +34,60 @@ export default {
       phone: '电话：0431-1234567',
       email: '邮箱：123456@163.com',
     },
-
-    gongzhongList: [
+    photoNews: {
+      pic: require('@/assets/photoNews.jpg'),
+      title: '标题',
+    },
+    chuangxinList: [
       {
-        url: 'http://kjt.jl.gov.cn/gzcy/tzxx/',
-        pic: require('@/assets/gk1.png'),
-        title: '厅长信箱',
+        title: '创新吉林',
+        date: '2019-03-06',
       },
       {
-        url: 'http://kjt.jl.gov.cn/gzcy/zxzx/',
-        pic: require('@/assets/gk2.png'),
-        title: '在线咨询',
+        title: '十条数据',
+        date: '2019-03-06',
       },
+    ],
+    guoneiList: [
       {
-        url: 'http://kjt.jl.gov.cn/gzcy/jdts/',
-        pic: require('@/assets/gk3.png'),
-        title: '监督投诉',
+        title: '国内动态',
+        date: '2019-03-06',
       },
       {
-        url: 'http://kjt.jl.gov.cn/gzcy/jyxc/',
-        pic: require('@/assets/gk4.png'),
-        title: '建言献策',
+        title: '十条数据',
+        date: '2019-03-06',
       },
+    ],
+    zhengwuList: [
       {
-        url: 'http://kjt.jl.gov.cn/gzcy/wsdc/',
-        pic: require('@/assets/gk5.png'),
-        title: '网上调查',
+        title: '政务活动',
+        date: '2019-03-06',
       },
       {
-        title: '党政资料',
-        url: 'http://139.210.167.203/free-technological-management/PersonalFiles/getPersonalFileList?pageNumber=1',
-        pic: require('@/assets/gk6.png'),
+        title: '十条数据',
+        date: '2019-03-06',
+      },
+    ],
+    meitiList: [
+      {
+        title: '媒体聚焦',
+        date: '2019-03-06',
+      },
+      {
+        title: '十条数据',
+        date: '2019-03-06',
+      },
+    ],
+    tongzhiList: [
+      {
+        title: '通知公告',
+        date: '2019-03-06',
+      },
+      {
+        title: '八条数据',
+        date: '2019-03-06',
       },
     ],
-    photoNews: {
-      pic: require('@/assets/photoNews.jpg'),
-      title: '标题',
-    },
     zhengwu: [
       {
         title: '高企认定',
@@ -113,55 +130,36 @@ export default {
         pic: require('@/assets/zw8.png'),
       },
     ],
-
-    chuangxinList: [
-      {
-        title: '创新吉林',
-        date: '2019-03-06',
-      },
-      {
-        title: '十条数据',
-        date: '2019-03-06',
-      },
-    ],
-    guoneiList: [
-      {
-        title: '国内动态',
-        date: '2019-03-06',
-      },
-      {
-        title: '十条数据',
-        date: '2019-03-06',
-      },
-    ],
-    zhengwuList: [
+    gongzhongList: [
       {
-        title: '政务活动',
-        date: '2019-03-06',
+        url: 'http://kjt.jl.gov.cn/gzcy/tzxx/',
+        pic: require('@/assets/gk1.png'),
+        title: '厅长信箱',
       },
       {
-        title: '十条数据',
-        date: '2019-03-06',
+        url: 'http://kjt.jl.gov.cn/gzcy/zxzx/',
+        pic: require('@/assets/gk2.png'),
+        title: '在线咨询',
       },
-    ],
-    meitiList: [
       {
-        title: '媒体聚焦',
-        date: '2019-03-06',
+        url: 'http://kjt.jl.gov.cn/gzcy/jdts/',
+        pic: require('@/assets/gk3.png'),
+        title: '监督投诉',
       },
       {
-        title: '十条数据',
-        date: '2019-03-06',
+        url: 'http://kjt.jl.gov.cn/gzcy/jyxc/',
+        pic: require('@/assets/gk4.png'),
+        title: '建言献策',
       },
-    ],
-    tongzhiList: [
       {
-        title: '通知公告',
-        date: '2019-03-06',
+        url: 'http://kjt.jl.gov.cn/gzcy/wsdc/',
+        pic: require('@/assets/gk5.png'),
+        title: '网上调查',
       },
       {
-        title: '八条数据',
-        date: '2019-03-06',
+        title: '党政资料',
+        url: 'http://139.210.167.203/free-technological-management/PersonalFiles/getPersonalFileList?pageNumber=1',
+        pic: require('@/assets/gk6.png'),
       },
     ],
     linkList: [