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

src/layout/common/newmenu.vue

@@ -16,8 +16,8 @@ export default {
   props: {},
   components: {},
   data: () => ({
-    activeIndex: '121313',
-    // activeIndex2: '1',
+    activeIndex: '13131',
+    activeIndex2: '1',
   }),
   created() {},
   computed: {},
@@ -63,10 +63,10 @@ export default {
   line-height: 60px;
   margin: 0;
   color: #fff;
-  width: 240px;
+
   text-align: center;
   float: left;
-  width: 238px;
+  width: 245px;
   text-align: center;
   border: none;
   font-size: 22px;

src/layout/common/top.vue

@@ -12,7 +12,7 @@
     <el-col :span="24" class="logo">
       <div class="w_1200">
         <el-col :span="24" class="logotop">
-          <el-col :span="2"> <el-image :src="src"></el-image></el-col>
+          <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
@@ -53,7 +53,11 @@ export default {
       this.date = dates;
       console.log(dates);
     },
+    onclicks() {
+      console.log('fsdnfs');
 
+      this.$router.push({ path: '/' });
+    },
     handleSelect() {},
   },
 };

src/layout/index/jobs.vue

@@ -74,7 +74,7 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  height: 38px;
+  padding: 6px 0;
 }
 .title span:first-child {
   display: inline-block;

src/layout/index/notice.vue

@@ -81,7 +81,7 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  height: 38px;
+  padding: 6px 0;
 }
 .title span:first-child {
   display: inline-block;

src/layout/index/service.vue

@@ -82,7 +82,7 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  height: 38px;
+  padding: 6px 0;
 }
 .title span:first-child {
   display: inline-block;

src/layout/index/technology.vue

@@ -81,7 +81,7 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  height: 38px;
+  padding: 6px 0;
 }
 .title span:first-child {
   display: inline-block;

src/views/news/listDetail.vue

@@ -67,11 +67,10 @@ export default {
       menuColor: 'rgb(254, 149, 14)',
       menuIndex: '0',
       columnName: '',
-      display: '',
+      display: '0',
     };
   },
   created() {
-    this.$set(this, `display`, this.displays);
     this.searchInfo();
   },
   methods: {
@@ -85,19 +84,21 @@ export default {
       this.menuIndex = index;
       this.columnName = name;
       this.menuColor = 'rgb(254, 149, 14)';
-      this.display = '0';
     },
   },
   computed: {
     ...mapState(['user']),
+    dispaly() {
+      return this.$route.query.display;
+    },
     pageTitle() {
       return `${this.$route.meta.title}`;
     },
     col_name() {
       return this.$route.query.col_name;
     },
-    displays() {
-      return this.$route.query.display;
+    id() {
+      return this.$route.query.id;
     },
   },
   metaInfo() {