Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

src/layout/result/leftunder.vue

@@ -7,7 +7,7 @@
     <el-col>
       <el-menu default-active="1" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" text-color="#215299" active-text-color="#215299">
         <el-menu-item index="1" v-for="(item, index) in liebiaoList" :key="index"
-          ><span slot="title" @click="clickUrl()">{{ item.title }}</span></el-menu-item
+          ><span slot="title" @click="clickUrl(item.title)">{{ item.title }}</span></el-menu-item
         >
       </el-menu>
     </el-col>
@@ -21,13 +21,23 @@ export default {
   components: {},
   data: () => ({
     src: require('@/assets/achieveCenter.png'),
-    liebiaoList: [{ title: '超算联盟' }, { title: '国家网格' }, { title: '教学中心' }, { title: '创业基地' }, { title: '软件中心' }, { title: '交流互动' }],
+    liebiaoList: [{ title: '超算联盟' }, { title: '国家网格' }, { title: '教学中心' }, { title: '创业基地' }, { title: '软件中心' }],
   }),
   created() {},
   computed: {},
   methods: {
-    clickUrl() {
-      this.$router.push({ path: '/shuju/shujulist' });
+    clickUrl(title) {
+      if (title == '超算联盟') {
+        this.$router.push({ path: '/achievement/index' });
+      } else if (title == '国家网格') {
+        this.$router.push({ path: '/achievement/achievement' });
+      } else if (title == '教学中心') {
+        this.$router.push({ path: '/achievement/knowledge' });
+      } else if (title == '创业基地') {
+        this.$router.push({ path: '/achievement/technology' });
+      } else if (title == '软件中心') {
+        this.$router.push({ path: '/achievement/technology' });
+      }
     },
     handleOpen(key, keyPath) {
       console.log(key, keyPath);

src/layout/result/left.vue

@@ -7,7 +7,7 @@
     <el-col>
       <el-menu default-active="1" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" text-color="#215299" active-text-color="#215299">
         <el-menu-item index="1" v-for="(item, index) in liebiaoList" :key="index"
-          ><span slot="title" @click="clickUrl()">{{ item.title }}</span></el-menu-item
+          ><span slot="title" @click="clickUrl(item.title)">{{ item.title }}</span></el-menu-item
         >
       </el-menu>
     </el-col>
@@ -21,13 +21,22 @@ export default {
   components: {},
   data: () => ({
     src: require('@/assets/achieveCenter.png'),
-    liebiaoList: [{ title: '平台建设' }, { title: '展示成果' }, { title: '知识交流' }, { title: 'xxxx' }],
+    liebiaoList: [{ title: '平台建设' }, { title: '项目成果' }, { title: '知识产权' }, { title: '科技支撑' }],
   }),
   created() {},
   computed: {},
   methods: {
-    clickUrl() {
-      this.$router.push({ path: '/shuju/shujulist' });
+    clickUrl(title) {
+      console.log(title);
+      if (title == '平台建设') {
+        this.$router.push({ path: '/achievement/index' });
+      } else if (title == '项目成果') {
+        this.$router.push({ path: '/achievement/achievement' });
+      } else if (title == '知识产权') {
+        this.$router.push({ path: '/achievement/knowledge' });
+      } else if (title == '科技支撑') {
+        this.$router.push({ path: '/achievement/technology' });
+      }
     },
     handleOpen(key, keyPath) {
       console.log(key, keyPath);

src/layout/common/menus.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <el-menu :default-active="$route.path" router class="el-menu-demo" mode="horizontal">
           <el-menu-item index="/news/index">新闻动态</el-menu-item>
-          <el-menu-item index="/result/index">成果展示</el-menu-item>
+          <el-menu-item index="/achievement/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>

src/router/index.js

@@ -35,9 +35,9 @@ const routes = [
   },
   //成果展示
   {
-    path: '/result/index',
+    path: '/achievement/index',
     name: '成果展示',
-    component: () => import('../views/result/index.vue'),
+    component: () => import('../views/achievement/index.vue'),
   },
   // 党建学苑
   {

src/views/result/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="partisan">
+  <div id="index">
     <el-row>
       <el-col :span="24" class="style">
         <el-col :span="24" class="top">
@@ -14,10 +14,10 @@
           <div class="w_1200">
             <el-col :span="5" class="left">
               <el-col :span="24" class="leftone">
-                <left></left>
+                <seminar></seminar>
               </el-col>
               <el-col :span="24" class="lefttwo">
-                <leftunder> </leftunder>
+                <cooperation> </cooperation>
               </el-col>
             </el-col>
             <el-col :span="19" class="context">
@@ -39,14 +39,14 @@
 import top from '@/layout/common/top.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';
+import seminar from '@/layout/achievement/seminar.vue';
+import right from '@/layout/achievement/right.vue';
+import cooperation from '@/layout/achievement/cooperation.vue';
 
 export default {
-  name: 'partisan',
+  name: 'index',
   props: {},
-  components: { top, menus, foot, left, right, leftunder },
+  components: { top, menus, foot, seminar, right, cooperation },
   data: () => ({}),
   created() {},
   computed: {},
@@ -60,7 +60,7 @@ export default {
   margin: 0 auto;
 }
 .main {
-  min-height: 700px;
+  min-height: 670px;
   overflow: hidden;
   margin: 10px 0;
   .left {
@@ -75,7 +75,7 @@ export default {
   }
   .context {
     width: 78%;
-    min-height: 730px;
+    min-height: 670px;
     background: #fff;
   }
 }