更新

src/App.vue

@@ -20,12 +20,12 @@ export default {
 
 <style lang="less">
 html {
-  overflow-x: hidden;
+  overflow-x: visible;
   overflow-y: auto;
 }
 body {
   margin: 0;
-  overflow-x: hidden;
+  overflow-x: visible;
 }
 .textOver {
   overflow: hidden;

src/layout/common/dates.vue

@@ -1,38 +0,0 @@
-<template>
-  <div id="dates">
-    <span class="date"
-      >{{ date }}星期{{
-        week == 1 ? '一' : week == 2 ? '二' : week == 3 ? '三' : week == 4 ? '四' : week == 5 ? '五' : week == 6 ? '六' : week == 7 ? '日' : ''
-      }}</span
-    >
-  </div>
-</template>
-
-<script>
-import moment from 'moment';
-export default {
-  name: 'dates',
-  props: {},
-  components: {},
-  data: () => ({
-    data: '',
-    week: '',
-  }),
-  created() {
-    this.searchdate();
-  },
-  computed: {},
-  methods: {
-    searchdate() {
-      let dates = moment().format('YYYY-MM-DD ');
-      let week = moment().format('d');
-      console.log(week);
-      this.week = week;
-      this.date = dates;
-      console.log(dates);
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped></style>

src/layout/common/menus.vue

@@ -0,0 +1,83 @@
+<template>
+  <div id="menus">
+    <el-row>
+      <el-col :span="24">
+        <el-menu :default-active="$route.path" router class="el-menu-demo" mode="horizontal" @select="handleSelect">
+          <el-menu-item index="/news/index">新闻动态</el-menu-item>
+          <el-menu-item index="/result/index">成果展示</el-menu-item>
+          <el-menu-item index="/service/index">计算服务</el-menu-item>
+          <el-menu-item index="/communication/index">交流活动</el-menu-item>
+          <el-menu-item index="/partisan/index">党建学苑</el-menu-item>
+        </el-menu>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'menus',
+  props: {},
+  components: {},
+  data: function() {
+    return {
+      activeIndex: '',
+    };
+  },
+  created() {},
+  methods: {
+    handleSelect(key, keyPath) {
+      console.log(key, keyPath);
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.el-menu {
+  background: #2152994f;
+}
+.el-menu--horizontal > .el-menu-item {
+  height: 70px;
+  line-height: 70px;
+}
+.el-menu-item {
+  font-size: 22px;
+  font-family: 微软雅黑;
+  color: rgb(255, 255, 255);
+  padding: 0 75px;
+  border-right: 2px solid #76bdfe;
+}
+.el-menu-item:last-child {
+  border-right: none;
+  padding: 0 76px;
+}
+.el-menu.el-menu--horizontal {
+  border-bottom: none;
+}
+.el-menu--horizontal .el-menu-item:not(.is-disabled):focus,
+.el-menu--horizontal .el-menu-item:not(.is-disabled):hover {
+  outline: 0;
+  color: #fff;
+}
+.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
+.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
+.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
+  background-color: #215299;
+}
+.el-menu--horizontal > .el-menu-item.is-active {
+  border-bottom: none;
+  color: #fff;
+  background: #215299;
+}
+</style>

src/layout/common/newmenu.vue

@@ -1,119 +0,0 @@
-<template>
-  <div id="newmenu">
-    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
-      <el-menu-item index="1">新闻动态</el-menu-item>
-      <el-menu-item index="2" @click="result">成果展示</el-menu-item>
-      <el-menu-item index="3">计算服务</el-menu-item>
-      <el-menu-item index="4">交流活动</el-menu-item>
-      <el-menu-item index="5" @click="toPartisan">党建学院</el-menu-item>
-    </el-menu>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'newmenu',
-  props: {},
-  components: {},
-  data: () => ({
-    activeIndex: '13131',
-    activeIndex2: '1',
-  }),
-  created() {},
-  computed: {},
-  methods: {
-    handleSelect(key, keyPath) {
-      console.log(key, keyPath);
-    },
-    toPartisan() {
-      this.$router.push({ path: '/partisan/index' });
-    },
-
-    result() {
-      this.$router.push({ path: '/result/index' });
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.menu {
-  height: 70px;
-  overflow: hidden;
-}
-
-/deep/.el-menu--horizontal > .el-menu-item {
-  float: left;
-  height: 60px;
-  line-height: 60px;
-  margin: 0;
-  color: #909399;
-  width: 240.5px;
-  text-align: center;
-  float: left;
-  width: 238px;
-  text-align: center;
-  border-right: 2px solid #76bdfe;
-  font-size: 22px;
-  color: #fff;
-  background: #2152994f;
-}
-
-/deep/.el-menu--horizontal > .el-menu-item:nth-child(5) {
-  float: left;
-  height: 60px;
-  line-height: 60px;
-  margin: 0;
-  color: #fff;
-
-  text-align: center;
-  float: left;
-  width: 245px;
-  text-align: center;
-  border: none;
-  font-size: 22px;
-  background: #2152994f;
-}
-
-/deep/.el-menu-item:hover {
-  background: #215299 !important;
-  color: #fff !important;
-  border: none;
-  font-size: 22px !important;
-  border-right: 2px solid #76bdfe;
-}
-
-/deep/.el-menu--horizontal > .el-menu-item:first-child.is-active {
-  background: #215299;
-  border: none;
-  border-right: 2px solid #76bdfe;
-  color: #fff;
-}
-
-/deep/.el-menu--horizontal > .el-menu-item:last-child.is-active {
-  background: #215299;
-  border: none;
-  color: #fff;
-}
-
-/deep/.el-menu--horizontal > .el-menu-item.is-active {
-  background: #215299;
-  border: none;
-  color: #fff;
-  border-right: 2px solid #76bdfe;
-  // border-left: 2px solid #76bdfe;
-}
-
-/deep/.el-menu.el-menu--horizontal {
-  border-bottom: none;
-  background: none;
-}
-
-/deep/.el-menu--horizontal > .el-menu-item {
-  border-bottom: none;
-}
-
-/deep/.menu ul .active {
-  background: #215299 !important;
-}
-</style>

src/layout/common/top.vue

@@ -2,26 +2,21 @@
   <div id="logo">
     <el-col :span="24" class="top">
       <div class="w_1200">
-        <span class="date"
-          >{{ date }}星期{{
-            week == 1 ? '一' : week == 2 ? '二' : week == 3 ? '三' : week == 4 ? '四' : week == 5 ? '五' : week == 6 ? '六' : week == 7 ? '日' : ''
-          }}</span
-        >
+        <span class="date">{{ data }}</span>
       </div>
     </el-col>
     <el-col :span="24" class="logo">
       <div class="w_1200">
-        <el-col :span="24" class="logotop">
-          <el-col :span="2" @click.native="onclicks()"> <el-image :src="src"></el-image></el-col>
-          <el-col :span="16"
-            ><p class="logotitle">吉林省计算中心</p>
-            <p class="logoinfo">JiLin province computing center</p></el-col
-          >
-          <el-col :span="6" class="search">
-            <el-col :soan="16" class="searchtitle">
-              <el-input placeholder="关键词" @select="handleSelect" style="height:30px" class="newinput"></el-input> </el-col
-            ><el-col :span="2"><el-button type="primary" icon="el-icon-search"></el-button></el-col>
-          </el-col>
+        <el-col :span="2" class="image" @click.native="clickBtn()">
+          <el-image :src="src"></el-image>
+        </el-col>
+        <el-col :span="15" class="title" @click.native="clickBtn()">
+          <p>吉林省计算中心</p>
+          <p>JiLin province computing center</p>
+        </el-col>
+        <el-col :span="7" class="search">
+          <el-input placeholder="关键词" v-model="input"></el-input>
+          <el-button icon="el-icon-search"></el-button>
         </el-col>
       </div>
     </el-col>
@@ -37,8 +32,8 @@ export default {
   data: () => ({
     src: require('@/assets/logo.png'),
     newsrc: require('@/assets/123.jpg'),
-    date: '',
-    week: '',
+    data: '',
+    input: '',
   }),
   created() {
     this.searchdate();
@@ -46,24 +41,24 @@ export default {
   computed: {},
   methods: {
     searchdate() {
-      let dates = moment().format('YYYY-MM-DD ');
+      let date = moment().format('YYYY-MM-DD ');
       let week = moment().format('d');
-      console.log(week);
-      this.week = week;
-      this.date = dates;
-      console.log(dates);
+      let newWeek = week == 1 ? '一' : week == 2 ? '二' : week == 3 ? '三' : week == 4 ? '四' : week == 5 ? '五' : week == 6 ? '六' : week == 7 ? '日' : '';
+      let newDate = date + '星期' + newWeek;
+      this.$set(this, `data`, newDate);
     },
-    onclicks() {
-      console.log('fsdnfs');
-
+    clickBtn() {
       this.$router.push({ path: '/' });
     },
-    handleSelect() {},
   },
 };
 </script>
 
 <style lang="less" scoped>
+.w_1200 {
+  width: 1200px;
+  margin: 0 auto;
+}
 .top {
   height: 40px;
   overflow: hidden;
@@ -71,32 +66,29 @@ export default {
   color: #fff;
   line-height: 40px;
 }
-.w_1200 {
-  width: 1200px;
-  margin: 0 auto;
-}
 .logo {
   height: 200px;
   overflow: hidden;
-}
-
-.logo .logotop {
-  padding: 75px 10px;
-  height: 210px;
-}
-
-.logo .logotitle {
-  color: #fff;
-  font-size: 40px;
-  margin: 0;
-}
-
-.logo .logoinfo {
-  font-size: 16px;
-  color: #fff;
-  font-family: 黑体;
-  text-transform: uppercase;
-  margin: 0;
+  .image {
+    padding: 66px 0;
+  }
+  .title {
+    padding: 66px 0;
+    p:first-child {
+      font-size: 40px;
+      color: rgb(255, 255, 255);
+      font-family: 黑体;
+    }
+    p:last-child {
+      font-size: 16px;
+      color: rgb(255, 255, 255);
+      font-family: 黑体;
+      text-transform: uppercase;
+    }
+  }
+  .title:hover {
+    cursor: pointer;
+  }
 }
 .search {
   height: 40px;
@@ -104,22 +96,22 @@ export default {
   border-radius: 25px;
   color: #fff;
   padding: 0 0 0 16px;
-}
-.search .searchtitle {
-  width: 240px;
+  margin: 80px 0;
+  .el-input {
+    float: left;
+    width: 85%;
+  }
+  .el-button {
+    float: left;
+    padding: 8px 8px;
+    background: transparent;
+    border: none;
+    font-size: 25px;
+  }
 }
 /deep/.el-input__inner {
   background: transparent;
-
-  border: none;
-  float: left;
-}
-
-/deep/.search .el-button--primary {
   border: none;
-  background: none;
-  padding: 0;
-  margin: 10px 0 0 0;
-  font-size: 17px;
+  color: #fff;
 }
 </style>

src/layout/common/lianjie.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="jianjie">
+  <div id="links">
     <el-col :span="24">
       <el-col :span="4" class="titles"> 友情链接</el-col>
       <el-col :span="5" v-for="(item, index) in linklist" :key="index" class="info"
@@ -11,7 +11,7 @@
 
 <script>
 export default {
-  name: 'jianjie',
+  name: 'links',
   props: {},
   components: {},
   data: () => ({

src/router/index.js

@@ -9,17 +9,6 @@ const routes = [
     name: '',
     component: () => import('../views/index.vue'),
   },
-  //成果展示
-  {
-    path: '/result/index',
-    name: '成果展示',
-    component: () => import('../views/result/index.vue'),
-  },
-  {
-    path: '/partisan/index',
-    name: '党建学苑',
-    component: () => import('../views/partisan/index.vue'),
-  },
   // 新闻动态
   {
     path: '/news/index',
@@ -32,6 +21,30 @@ const routes = [
     meta: { title: '新闻详情', subSite: true },
     component: () => import('../views/news/listDetail.vue'),
   },
+  // 计算服务
+  {
+    path: '/service/index',
+    meta: { title: '计算服务', subSite: true },
+    component: () => import('../views/service/index.vue'),
+  },
+  // 交流互动
+  {
+    path: '/communication/index',
+    meta: { title: '交流互动', subSite: true },
+    component: () => import('../views/communication/index.vue'),
+  },
+  //成果展示
+  {
+    path: '/result/index',
+    name: '成果展示',
+    component: () => import('../views/result/index.vue'),
+  },
+  // 党建学苑
+  {
+    path: '/partisan/index',
+    name: '党建学苑',
+    component: () => import('../views/partisan/index.vue'),
+  },
 ];
 
 const router = new VueRouter({

src/views/communication/index.vue

@@ -0,0 +1,86 @@
+<template>
+  <div id="index">
+    <el-row>
+      <el-col :span="24" class="style">
+        <el-col :span="24" class="top">
+          <top></top>
+        </el-col>
+        <el-col :span="24" class="menu">
+          <div class="w_1200">
+            <menus></menus>
+          </div>
+        </el-col>
+        <el-col :span="24" class="main">
+          <div class="w_1200">
+            交流互动
+          </div>
+        </el-col>
+        <el-col :span="24" class="foot">
+          <div class="w_1200">
+            <foot></foot>
+          </div>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import top from '@/layout/common/top.vue';
+import menus from '@/layout/common/menus.vue';
+import foot from '@/layout/common/foot.vue';
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'index',
+  props: {},
+  components: {
+    top,
+    menus,
+    foot,
+  },
+  data: function() {
+    return {};
+  },
+  created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.w_1200 {
+  width: 1200px;
+  margin: 0 auto;
+}
+.style {
+  .menu {
+    height: 70px;
+    margin: 0 0 10px 0;
+  }
+  .main {
+    min-height: 600px;
+    margin: 0 0 10px 0;
+    .left {
+      min-height: 1050px;
+      background: #fff;
+      margin: 0 10px 0 0;
+    }
+    .right {
+      width: 78%;
+      min-height: 1050px;
+      background: #fff;
+    }
+  }
+  .foot {
+    height: 135px;
+  }
+}
+</style>

src/views/index.vue

@@ -1,65 +1,67 @@
 <template>
   <div id="index">
     <el-row>
-      <top></top>
-      <div class="w_1200">
-        <el-col :span="24" class="menu">
-          <div class="w_1200">
-            <newmenu></newmenu>
-          </div>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24">
-            <el-col :span="12" class="maintopleft">
-              <dynamic></dynamic>
-            </el-col>
-            <el-col :span="12" class="maintopright">
-              <jobs :jobsList="jobsList"></jobs>
-            </el-col>
-
-            <el-col :span="8" class="context">
-              <notice :noticeList="noticeList"></notice>
-            </el-col>
-            <el-col :span="8" class="between">
-              <service :serviceList="serviceList"></service>
-            </el-col>
-            <el-col :span="8" class="context">
-              <technology :jishuList="jishuList"></technology>
-            </el-col>
-
-            <el-col :span="24" class="lianjie">
-              <lianjie></lianjie>
-            </el-col>
+      <el-col :span="24" class="top">
+        <top></top>
+      </el-col>
+      <el-col :span="24" class="menu">
+        <div class="w_1200">
+          <menus></menus>
+        </div>
+      </el-col>
+      <el-col :span="24" class="main">
+        <div class="w_1200">
+          <el-col :span="12" class="maintopleft">
+            <dynamic></dynamic>
+          </el-col>
+          <el-col :span="12" class="maintopright">
+            <jobs :jobsList="jobsList"></jobs>
+          </el-col>
+          <el-col :span="8" class="context">
+            <notice :noticeList="noticeList"></notice>
+          </el-col>
+          <el-col :span="8" class="between">
+            <service :serviceList="serviceList"></service>
+          </el-col>
+          <el-col :span="8" class="context">
+            <technology :jishuList="jishuList"></technology>
           </el-col>
-        </el-col>
-        <el-col :span="24" class="foot"> <foot></foot> </el-col>
-      </div>
+          <el-col :span="24" class="lianjie">
+            <links></links>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="24" class="foot">
+        <div class="w_1200">
+          <foot></foot>
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
 import top from '@/layout/common/top.vue';
-import newmenu from '@/layout/common/newmenu.vue';
+import menus from '@/layout/common/menus.vue';
 import dynamic from '@/layout/index/dynamic.vue';
 import jobs from '@/layout/index/jobs.vue';
 import notice from '@/layout/index/notice.vue';
 import service from '@/layout/index/service.vue';
 import technology from '@/layout/index/technology.vue';
-import lianjie from '@/layout/common/lianjie.vue';
+import links from '@/layout/index/links.vue';
 import foot from '@/layout/common/foot.vue';
 export default {
   name: 'index',
   props: {},
   components: {
     top,
-    newmenu,
+    menus,
     dynamic,
     jobs,
     notice,
     service,
     technology,
-    lianjie,
+    links,
     foot,
   },
   data: () => ({
@@ -182,17 +184,11 @@ export default {
   width: 1200px;
   margin: 0 auto;
 }
-
-/deep/ body {
-  margin: 0;
-  overflow: hidden;
-}
 .main {
   height: 730px;
   overflow: hidden;
   margin: 10px 0 0 0;
 }
-
 .maintopleft {
   height: 300px;
   background-color: #fff;

src/views/news/index.vue

@@ -3,16 +3,11 @@
     <el-row>
       <el-col :span="24" class="style">
         <el-col :span="24" class="top">
-          头部
-        </el-col>
-        <el-col :span="24" class="banner">
-          <div class="w_1200">
-            logo
-          </div>
+          <top></top>
         </el-col>
         <el-col :span="24" class="menu">
           <div class="w_1200">
-            菜单
+            <menus></menus>
           </div>
         </el-col>
         <el-col :span="24" class="main">
@@ -27,7 +22,7 @@
         </el-col>
         <el-col :span="24" class="foot">
           <div class="w_1200">
-            底部
+            <foot></foot>
           </div>
         </el-col>
       </el-col>
@@ -36,6 +31,9 @@
 </template>
 
 <script>
+import top from '@/layout/common/top.vue';
+import menus from '@/layout/common/menus.vue';
+import foot from '@/layout/common/foot.vue';
 import newsQuestion from '@/layout/news/newsQuestion.vue';
 import infoList from '@/layout/news/infoList.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
@@ -43,6 +41,9 @@ export default {
   name: 'index',
   props: {},
   components: {
+    top,
+    menus,
+    foot,
     newsQuestion,
     infoList,
   },
@@ -100,12 +101,9 @@ export default {
   margin: 0 auto;
 }
 .style {
-  .top {
-    height: 40px;
-  }
-  .banner {
-    height: 220px;
-  }
+  // .top {
+  //   height: 40px;
+  // }
   .menu {
     height: 70px;
     margin: 0 0 10px 0;
@@ -125,7 +123,7 @@ export default {
     }
   }
   .foot {
-    height: 120px;
+    height: 135px;
   }
 }
 </style>

src/views/partisan/index.vue

@@ -1,12 +1,18 @@
 <template>
   <div id="partisan">
     <el-row>
-      <div class="w_1200">
-        <top></top>
+      <el-col :span="24" class="style">
+        <el-col :span="24" class="top">
+          <top></top>
+        </el-col>
+        <el-col :span="24" class="menu">
+          <div class="w_1200">
+            <menus></menus>
+          </div>
+        </el-col>
+      </el-col>
+      <el-col :span="24" class="main">
         <div class="w_1200">
-          <newmenu></newmenu>
-        </div>
-        <el-col :span="24" class="main">
           <el-col :span="24" class="images">
             <el-carousel indicator-position="outside" height="380px" width="590px">
               <el-carousel-item v-for="(item, index) in ruleList" :key="index" class="ruleList">
@@ -36,62 +42,65 @@
               ><span>{{ item.publish_time }}</span>
             </el-col>
           </el-col>
-        </el-col>
-        <el-col :span="24" class="foot">
-          <div class="w_1200">
-            底部
-          </div>
-        </el-col>
-      </div>
+        </div>
+      </el-col>
+      <el-col :span="24" class="foot">
+        <div class="w_1200">
+          <foot></foot>
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
 import top from '@/layout/common/top.vue';
-import newmenu from '@/layout/common/newmenu.vue';
+import menus from '@/layout/common/menus.vue';
+import foot from '@/layout/common/foot.vue';
 export default {
   name: 'partisan',
   props: {},
-  components: { top, newmenu },
+  components: { top, menus, foot },
   data: () => ({
+    // 图片新闻
+    ruleList: [
+      {
+        title: '标题',
+        img_url: require('@/assets/123.jpg'),
+      },
+    ],
+    // 党建工作
     workList: [
-      { title: '科技部关于发布国家重点研发计划制造基础技术与关键部件等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
+      {
+        title: '标题',
+        publish_time: '2020-05-23',
+      },
+      {
+        title: '八条数据',
+        publish_time: '2020-05-23',
+      },
     ],
+    // 学习园地
     stuList: [
-      { title: '科技部关于发布国家重点研发计划制造基础技术与关键部件等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
+      {
+        title: '标题',
+        publish_time: '2020-05-23',
+      },
+      {
+        title: '八条数据',
+        publish_time: '2020-05-23',
+      },
     ],
+    // 党风廉政
     politicsList: [
-      { title: '科技部关于发布国家重点研发计划制造基础技术与关键部件等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-      { title: '科技部关于发布国家重点研发计划“制造基础技术与关键部件”等重点专项2020年度项目申报指南的通知', publish_time: '2020-05-23' },
-    ],
-    ruleList: [
       {
-        img_url: 'http://img4.imgtn.bdimg.com/it/u=2771440800,1562527424&fm=26&gp=0.jpg',
-        title: '吉林省计算中心实验室科技科技科技科技科技吉林省计算中心实验室科技科技科技科技科技吉林省计算中心实验室科技科技科技科技科技',
+        title: '标题',
+        publish_time: '2020-05-23',
+      },
+      {
+        title: '八条数据',
+        publish_time: '2020-05-23',
       },
-      { img_url: 'http://img1.imgtn.bdimg.com/it/u=1880227863,1592959696&fm=26&gp=0.jpg', title: '吉林省计算中心实验室科技科技科技科技科技' },
-      { img_url: 'http://img2.imgtn.bdimg.com/it/u=841078319,3400677981&fm=11&gp=0.jpg', title: '吉林省计算中心实验室科技科技科技科技科技' },
     ],
   }),
   created() {},
@@ -106,9 +115,9 @@ export default {
   margin: 0 auto;
 }
 .main {
-  height: 800px;
+  min-height: 600px;
   overflow: hidden;
-  margin: 20px 0;
+  margin: 10px 0;
 }
 .left {
   background-color: #ffffff;
@@ -201,6 +210,6 @@ export default {
   padding: 7px;
 }
 .foot {
-  height: 120px;
+  height: 135px;
 }
 </style>

src/views/result/index.vue

@@ -1,32 +1,44 @@
 <template>
   <div id="partisan">
     <el-row>
-      <div class="w_1200">
-        <top></top>
-        <div class="w_1200">
-          <newmenu></newmenu>
-        </div>
+      <el-col :span="24" class="style">
+        <el-col :span="24" class="top">
+          <top></top>
+        </el-col>
+        <el-col :span="24" class="menu">
+          <div class="w_1200">
+            <menus></menus>
+          </div>
+        </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="5" class="left">
-            <el-col :span="24" class="leftone">
-              <left></left>
+          <div class="w_1200">
+            <el-col :span="5" class="left">
+              <el-col :span="24" class="leftone">
+                <left></left>
+              </el-col>
+              <el-col :span="24" class="lefttwo">
+                <leftunder> </leftunder>
+              </el-col>
             </el-col>
-            <el-col :span="24" class="lefttwo">
-              <leftunder> </leftunder>
+            <el-col :span="19" class="context">
+              <right></right>
             </el-col>
-          </el-col>
-          <el-col :span="19" class="context">
-            <right></right>
-          </el-col>
+          </div>
+        </el-col>
+        <el-col :span="24" class="foot">
+          <div class="w_1200">
+            <foot></foot>
+          </div>
         </el-col>
-      </div>
+      </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
 import top from '@/layout/common/top.vue';
-import newmenu from '@/layout/common/newmenu.vue';
+import menus from '@/layout/common/menus.vue';
+import foot from '@/layout/common/foot.vue';
 import left from '@/layout/result/left.vue';
 import right from '@/layout/result/right.vue';
 import leftunder from '@/layout/result/leftunder.vue';
@@ -34,7 +46,7 @@ import leftunder from '@/layout/result/leftunder.vue';
 export default {
   name: 'partisan',
   props: {},
-  components: { top, newmenu, left, right, leftunder },
+  components: { top, menus, foot, left, right, leftunder },
   data: () => ({}),
   created() {},
   computed: {},
@@ -48,27 +60,23 @@ export default {
   margin: 0 auto;
 }
 .main {
-  height: 740px;
+  min-height: 700px;
   overflow: hidden;
   margin: 10px 0;
-}
-
-.main .left {
-  height: 600px;
-}
-
-.main .left .leftone {
-  height: 300px;
-  background-color: #fff;
-}
-
-.main .left .lefttwo {
-  height: 300px;
-  background-color: #fff;
-  margin: 10px 0 0 0;
-}
-
-.main .context {
-  min-height: 610px;
+  .left {
+    margin: 0 10px 0 0;
+    .leftone {
+      background: #fff;
+    }
+    .lefttwo {
+      background-color: #fff;
+      margin: 10px 0 0 0;
+    }
+  }
+  .context {
+    width: 78%;
+    min-height: 730px;
+    background: #fff;
+  }
 }
 </style>

src/views/service/index.vue

@@ -0,0 +1,86 @@
+<template>
+  <div id="index">
+    <el-row>
+      <el-col :span="24" class="style">
+        <el-col :span="24" class="top">
+          <top></top>
+        </el-col>
+        <el-col :span="24" class="menu">
+          <div class="w_1200">
+            <menus></menus>
+          </div>
+        </el-col>
+        <el-col :span="24" class="main">
+          <div class="w_1200">
+            计算服务
+          </div>
+        </el-col>
+        <el-col :span="24" class="foot">
+          <div class="w_1200">
+            <foot></foot>
+          </div>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import top from '@/layout/common/top.vue';
+import menus from '@/layout/common/menus.vue';
+import foot from '@/layout/common/foot.vue';
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'index',
+  props: {},
+  components: {
+    top,
+    menus,
+    foot,
+  },
+  data: function() {
+    return {};
+  },
+  created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.w_1200 {
+  width: 1200px;
+  margin: 0 auto;
+}
+.style {
+  .menu {
+    height: 70px;
+    margin: 0 0 10px 0;
+  }
+  .main {
+    min-height: 600px;
+    margin: 0 0 10px 0;
+    .left {
+      min-height: 1050px;
+      background: #fff;
+      margin: 0 10px 0 0;
+    }
+    .right {
+      width: 78%;
+      min-height: 1050px;
+      background: #fff;
+    }
+  }
+  .foot {
+    height: 135px;
+  }
+}
+</style>