dengjie commit : 修改新闻中心第四个border-right为none的样式

2022-10-07 18:57:48 +08:00
31 changed files with 563 additions and 717 deletions
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@ ENV = 'development'

 # EBTS/开发环境
 #VUE_APP_BASE_API = '/dev-api'
-#VUE_APP_BASE_API = 'http://localhost:8085/dev-api'
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://192.168.101.4:8085/dev-api'
+#VUE_APP_BASE_API = 'http://sist.swjtu.edu.cn/dev-api'
 SITE_TYPE = 'NEd5n92EMIpyyBslaNqsRgE'
 #VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api'

--- a/.env.production
+++ b/.env.production
@@ -3,4 +3,5 @@ ENV = 'production'

 # EBTS/生产环境
 #VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = '/dev-api'
+#VUE_APP_BASE_API = 'http://192.168.190.67/dev-api'
+VUE_APP_BASE_API = 'http://sist.swjtu.edu.cn/dev-api'
--- a/README.md
+++ b/README.md
@@ -29,24 +29,4 @@ npm install --registry=https://registry.npm.taobao.org
 ### 启动服务
 ```
 npm run dev
-```
-
-
-
-
-
-1. title上间距太大,更紧凑一点
-2. 通知公告调整到4个, 第4个永远写死
-
-
-
-
-
-
-
-
-
-
-
-
-
+```
--- a/package-lock.json
+++ b/package-lock.json
@@ -1786,50 +1786,12 @@
          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
          "dev": true
        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
        "big.js": {
          "version": "3.2.0",
          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
          "dev": true
        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
        "css-select": {
          "version": "4.2.1",
          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz",
@@ -1883,13 +1845,6 @@
          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
          "dev": true
        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
        "html-webpack-plugin": {
          "version": "3.2.0",
          "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
@@ -1973,16 +1928,6 @@
            "ansi-regex": "^2.0.0"
          }
        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
        "util.promisify": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
@@ -1992,53 +1937,6 @@
            "define-properties": "^1.1.2",
            "object.getownpropertydescriptors": "^2.0.3"
          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
-          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "big.js": {
-              "version": "5.2.2",
-              "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-              "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-              "dev": true,
-              "optional": true
-            },
-            "emojis-list": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-              "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-              "dev": true,
-              "optional": true
-            },
-            "json5": {
-              "version": "2.2.1",
-              "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-              "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-              "dev": true,
-              "optional": true
-            },
-            "loader-utils": {
-              "version": "2.0.2",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-              "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
-              }
-            }
-          }
        }
      }
    },
@@ -12364,6 +12262,87 @@
        }
      }
    },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.3",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
    "vue-router": {
      "version": "3.5.3",
      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz",
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -30,13 +30,6 @@ export function getNode(data) {
    data:data
  })
 }
-export function getNodeNav(data) {
-  return request({
-    url: '/web/nodeNav',
-    method: 'post',
-    data:data
-  })
-}
 // 获取文章列表
 export function getArticleList(data) {
  return request({
--- a/src/assets/header/enz.png
+++ b/src/assets/header/enz.png
--- a/src/assets/header/enz@2x.png
+++ b/src/assets/header/enz@2x.png
--- a/src/assets/header/enzl.png
+++ b/src/assets/header/enzl.png
--- a/src/assets/header/enzl@2x.png
+++ b/src/assets/header/enzl@2x.png
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -30,12 +30,10 @@ const cn = {
    'number_students': '在校学生人数',
    'graduate_tutor': '研究生导师',
    'research_team': '科研团队',
-    'high_level_talents': '省部级以上高层次人才',
-    'major_projects': '国家级重大重点项目',
+    'high_level_talents': '高层次人才',
+    'major_projects': '重大项目',
    'contact_us': '联系我们',
-    'person': '人',
-    'pics': '个',
-    'adress': '犀浦校区地址:中国四川省成都市郫都区犀安路 999 号西南交通大学信息科学与技术学院',
+    'adress': '犀浦校区地址:中国四川省成都市高新区西部园区西南交通大学信息科学与技术学院',
    'code': '邮政编码:611756',
    'tel': '电话:+86 28 66366709(行政)',
    'copyright': '版权所有◎2015西南交通大学信息科学与技术学院. All rights reserved.意见反馈',
--- a/src/i18n/langs/en.js
+++ b/src/i18n/langs/en.js
@@ -24,18 +24,16 @@ const en = {
    'scientific': 'Scientific',
    'undergraduate_education': 'Undergraduate education',
    'postgraduate_education': 'Postgraduate education',
-    'employees': 'Faculty Members',
-    'number_students': 'Internal Students',
-    'graduate_tutor': 'Tutors',
-    'research_team': 'Scientific Research Team',
-    'high_level_talents': 'Outstanding Talents',
+    'employees': 'Employees',
+    'number_students': 'Number of students',
+    'graduate_tutor': 'Graduate tutor',
+    'research_team': 'Research team',
+    'high_level_talents': 'High level talents',
    'major_projects': 'Major projects',
-    'contact_us': '',
-    'person': '',
-    'pics': '',
-    'adress': '',
-    'code': '',
-    'tel': '',
+    'contact_us': 'CONTACT US',
+    'adress': 'Add: 01606#, 01608#, 01614#, School of Information Science and Technology,Southwest Jiaotong University, No.111, Erhuanlu Beiyiduan Chengdu, 610031 P.R.China',
+    'code': 'E-mail: scce@home.swjtu.edu.cn',
+    'tel': 'Tel: +86 28 66366709; +86 28 66366741   |   Fax: +86 28 87600743',
    'copyright': 'Copyright © 2014 School of Information Science and Technology, SWJTU. All rights reserved.   Feedback',
    'chinese_site': 'Southwest Jiaotong University(中文)',
    'english_site': 'Southwest Jiaotong University(ENGLISH)',
--- a/src/main.js
+++ b/src/main.js
@@ -9,17 +9,6 @@ import 'element-ui/lib/theme-chalk/display.css';
 import en from 'element-ui/lib/locale/lang/en'
 import cn from 'element-ui/lib/locale/lang/zh-CN'

-//要添加的代码
-router.beforeEach((to, from, next) => {
-  // chrome
-  document.body.scrollTop = 0
-  // firefox
-  document.documentElement.scrollTop = 0
-  // safari
-  window.pageYOffset = 0
-  next()
-})
-
 i18n.mergeLocaleMessage('en', en)
 i18n.mergeLocaleMessage('zh', cn)

--- a/src/utils/sist.js
+++ b/src/utils/sist.js
@@ -98,35 +98,22 @@ export function toArticle(news, width) {
    if (info == null) {
      return
    }
-    let routeData = null;
    if (info.three == null) {
      if (width) {
-        routeData = "/pc/" + info.second.encodeId + "?id=" + news.id + "&type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang");
+        vm.$router.push("/pc/" + info.second.encodeId + "?id=" + news.id + "&type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang"));
      } else {
-        routeData = "/mobile/" + info.second.encodeId + "?id=" + news.id + "&type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang");
+        vm.$router.push("/mobile/" + info.second.encodeId + "?id=" + news.id + "&type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang"));
      }
    } else {
-      console.log(info.three, "toArticle,info.three")
      if (width) {
-        routeData = "/pc/" + info.second.encodeId + "/" + info.three.encodeId + "?id=" + news.id + "&lang=" + sessionStorage.getItem("lang");
+        vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "&id=" + news.id + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang"));
      } else {
-        routeData = "/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "?id=" + news.id + "&lang=" + sessionStorage.getItem("lang");
+        vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "&id=" + news.id + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang"));
      }
    }
-    linkTo(routeData)
  })
 }

-function linkTo(routeData) {
-  let userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
-  if (userAgent.indexOf("Safari") > -1) {
-    window.location.href = window.location.origin + routeData
-  } else {
-    window.open(routeData.href, "_blank")
-  }
-}
-
-
 export function lookMoreComment(item, width) {
  info(item.id).then(res => {
    let info = null
@@ -163,23 +150,19 @@ export function lookMoreFixedComment(id, width) {
  }
  if (info == null) {
    return
-    let routeData = null;
-    if (info.three == null) {
-      if (width) {
-        routeData = "/pc/" + info.second.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang");
-      } else {
-        routeData = "/mobile/" + info.second.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang");
-      }
+  }
+  if (info.three == null) {
+    if (width) {
+      vm.$router.push("/pc/" + info.second.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang"));
    } else {
-      if (width) {
-        routeData = "/pc/" + info.second.encodeId + "/" + info.three.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang");
-      } else {
-        routeData = "/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang");
-      }
+      vm.$router.push("/mobile/" + info.second.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang"));
+    }
+  } else {
+    if (width) {
+      vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang"));
+    } else {
+      vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang"));
    }
-    linkTo(routeData)
-    // window.location.href = window.location.origin + routeData.href
-    // window.open(window.location.origin + routeData.href, "_blank")
  }
 }

--- a/src/views/content/components/dire_data.vue
+++ b/src/views/content/components/dire_data.vue
@@ -1,38 +1,31 @@
 <template>
-  <div class="dire_data" style="background-color:#fff;  margin-top: 3rem;">
+<div class="dire_data"  style="background-color:#fff;  margin-top: 3rem;">

-    <el-row v-for="(dire,index) in value" :key="index">
-      <!--正文内容-->
-
-
-      <el-col class="context" :span="23">
-        <!--      <el-row class="context_el-row">-->
-        <!--        <el-col :span="1" :offset="1">-->
-        <!--          <img class="context_img" src="@/assets/teaching_staff/eji_icon_ys.png" alt=""/>-->
-        <!--        </el-col>-->
-        <!--        <el-col :span="4" class="context_name">{{ dire.name }}</el-col>-->
-        <!--        <el-col :span="16">-->
-        <!--          <hr class="context_hr">-->
-        <!--        </el-col>-->
-        <!--      </el-row>-->
-        <el-row class="context_el-row">
+  <el-row v-for="(dire,index) in value" :key="index">
+    <!--正文内容-->
+    <el-col class="context" :span="23">
+      <el-row class="context_el-row">
+        <el-col :span="1" :offset="1">
          <img class="context_img" src="@/assets/teaching_staff/eji_icon_ys.png" alt="">
-          <div class="context_name">{{ dire.name }}</div>
-          <div class="context_hr"></div>
-        </el-row>
-        <el-row v-for="(chile,index) in dire.children" :key="index">
-          <el-col class="name" :offset="1" :span="23">
-            {{ chile.name }}
-          </el-col>
+        </el-col>
+        <el-col :span="4" class="context_name">{{ dire.name }}</el-col>
+        <el-col :span="16">
+          <hr class="context_hr">
+        </el-col>
+      </el-row>
+      <el-row v-for="(chile,index) in dire.children" :key="index">
+        <el-col class="name" :offset="1" :span="23">
+          {{ chile.name }}
+        </el-col>
          <el-col class="text" :offset="1" :span="23">
            <div v-for="(item,index) in chile.children" :key="index" @click="linkClick(item)">
-              {{ item.name }}
+                {{ item.name }}
            </div>
          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-  </div>
+      </el-row>
+    </el-col>
+  </el-row>
+</div>
 </template>

 <script>
@@ -41,9 +34,9 @@ export default {
  data() {
    return {
      width: document.documentElement.clientWidth
-    };
+    }
  },
-  props: {
+  props:{
    value: {
      type: Array,
      default: [{
@@ -55,52 +48,51 @@ export default {
              {
                children: [],
                name: "人员1"
-              }
-            ]
+              },
+            ],
          }
-        ]
-      }]
-    }
+        ],
+      }],
+    },
  },
-  methods: {
-    linkClick(chile) {
-      if (chile.link!=null && chile.link != "" && chile.link != '""'){
-        window.open(chile.link);
+  methods:{
+    linkClick(chile){
+      if (chile.link){
+        window.open(chile.link)
      }
    }
  }
-};
+}
 </script>

 <style scoped lang="scss">
+
 .context {
  margin: 3rem 2rem;
  padding-bottom: 3rem;
-  width: 92%;
-  background: #FFFFFF;
+  //width: 84.3rem;
+  //background: #FFFFFF;

  .context_el-row {
-    display: flex;
    margin-top: 2rem;

    .context_img {
      width: 2.2rem;
-      margin-left: 3%;
    }

    .context_name {
      font-size: 1.8rem;
+      font-family: PingFangSC-Medium, PingFang SC;
      font-weight: 500;
      color: #1956BC;
-      padding: 0 20px;
-      white-space:nowrap;
+      line-height: 2.2rem;
    }

    .context_hr {
+      line-height: 2.2rem;
      margin-top: 1.1rem;
+      border: #1956BC solid 0.1rem;
      background-color: #1956BC;
-      width: 100%;
-      height: 2px;
    }
  }

@@ -110,12 +102,10 @@ export default {
    font-weight: 600;
    //color: #1956BC;
  }
-
  .text {
    font-size: 1.4rem;
    //color: #3C3C3C;
    clear: left;
-
    div {
      float: left;
      margin-top: .4rem;
@@ -124,44 +114,10 @@ export default {
      margin-right: 1.5rem;
      color: #000000;
    }
-
-    div:hover {
+    div:hover{
      color: #1956BC;
    }
  }
 }

-
-//.context {
-//  margin: 3rem 2rem;
-//  padding-bottom: 3rem;
-//width: 84.3rem;
-//background: #FFFFFF;
-
-//.context_el-row {
-//  margin-top: 2rem;
-//
-//  .context_img {
-//    width: 2.2rem;
-//  }
-//
-//  .context_name {
-//    font-size: 1.8rem;
-//    font-family: PingFangSC-Medium, PingFang SC;
-//    font-weight: 500;
-//    color: #1956BC;
-//    line-height: 2.2rem;
-//  }
-//
-//  .context_hr {
-//    line-height: 2.2rem;
-//    margin-top: 1.1rem;
-//    border: #1956BC solid 0.1rem;
-//    background-color: #1956BC;
-//  }
-//}
-
-
-//}
-
 </style>
--- a/src/views/content/components/dire_data_tow.vue
+++ b/src/views/content/components/dire_data_tow.vue
@@ -4,16 +4,13 @@
      <!--正文内容-->
      <el-col class="context" :span="23">
        <el-row class="context_el-row">
-<!--          <el-col :span="1" :offset="1">-->
-<!--            <img class="context_img" src="@/assets/teaching_staff/eji_icon_ys.png" alt="">-->
-<!--          </el-col>-->
-<!--          <el-col :span="4" class="context_name">{{ dire.name }}</el-col>-->
-<!--          <el-col :span="16">-->
-<!--            <hr class="context_hr">-->
-<!--          </el-col>-->
-          <img class="context_img" src="@/assets/teaching_staff/eji_icon_ys.png" alt="">
-          <div class="context_name">{{ dire.name }}</div>
-          <div class="context_hr"></div>
+          <el-col :span="1" :offset="1">
+            <img class="context_img" src="@/assets/teaching_staff/eji_icon_ys.png" alt="">
+          </el-col>
+          <el-col :span="4" class="context_name">{{ dire.name }}</el-col>
+          <el-col :span="16">
+            <hr class="context_hr">
+          </el-col>
        </el-row>
        <el-row>
          <el-col :offset="1" :span="22">
@@ -56,7 +53,7 @@ export default {
  },
  methods:{
    linkClick(chile){
-      if (chile.link!=null && chile.link != "" && chile.link != '""'){
+      if (chile.link){
        window.open(chile.link)
      }
    }
@@ -67,61 +64,34 @@ export default {
 <style scoped lang="scss">

 .context {
-  margin: 2rem 2rem;
+  margin: 3rem 2rem;
  padding-bottom: 3rem;
-  width: 92%;
-  background: #FFFFFF;
-  //padding-bottom: 3rem;
  //width: 84.3rem;
  //background: #FFFFFF;
+
  .context_el-row {
-    display: flex;
    margin-top: 2rem;

    .context_img {
      width: 2.2rem;
-      margin-left: 3%;
    }

    .context_name {
      font-size: 1.8rem;
+      font-family: PingFangSC-Medium, PingFang SC;
      font-weight: 500;
      color: #1956BC;
-      padding: 0 20px;
-      white-space:nowrap;
+      line-height: 2.2rem;
    }

    .context_hr {
+      line-height: 2.2rem;
      margin-top: 1.1rem;
+      border: #1956BC solid 0.1rem;
      background-color: #1956BC;
-      width: 100%;
-      height: 2px;
    }
  }

-  //.context_el-row {
-  //  margin-top: 2rem;
-  //
-  //  .context_img {
-  //    width: 2.2rem;
-  //  }
-  //
-  //  .context_name {
-  //    font-size: 1.8rem;
-  //    font-family: PingFangSC-Medium, PingFang SC;
-  //    font-weight: 500;
-  //    color: #1956BC;
-  //    line-height: 2.2rem;
-  //  }
-  //
-  //  .context_hr {
-  //    line-height: 2.2rem;
-  //    margin-top: 1.1rem;
-  //    border: #1956BC solid 0.1rem;
-  //    background-color: #1956BC;
-  //  }
-  //}
-
  .name {
    margin-top: 2rem;
    font-size: 1.6rem;
--- a/src/views/content/components/file_list.vue
+++ b/src/views/content/components/file_list.vue
@@ -95,9 +95,6 @@ export default {
  },
  methods: {
    getDateTime(date) {
-      if(typeof(date) == "string" &&  date.indexOf('-') != -1){
-        date = date.replace(/-/g,'/');
-      }
      let time = new Date(date);
      let year = time.getFullYear();
      let month = time.getMonth() + 1
--- a/src/views/content/components/list.vue
+++ b/src/views/content/components/list.vue
@@ -39,8 +39,7 @@
                <div class="tw_context_title" @click="getContext(item)">
                  {{ item.title }}
                </div>
-                <div v-if="item.description" class="tw_context_text">{{ item.description }}</div>
-                <div v-if="!item.description" class="tw_context_text" v-html="item.content"></div>
+                <div class="tw_context_text" v-html="item.content"></div>
              </div>
            </el-col>
            <el-col v-show="width>992" :xs="1" :sm="1" :md="3" :lg="4" :xl="3">
@@ -55,18 +54,18 @@

      <el-row>
        <el-col class="pagination_p">
-          <el-pagination v-if="!small"
-                         :small="!small"
-                         @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="listData.pageNum"
-                         :page-size="listData.pageSize"
-                         :page-sizes="[5,10,20, 30, 50, 100]"
-                         layout="prev, pager,next,sizes,  jumper"
-                         :total="listData.total">
+          <el-pagination  v-if="!small"
+                          :small="!small"
+                          @size-change="handleSizeChange"
+                          @current-change="handleCurrentChange"
+                          :current-page.sync="listData.pageNum"
+                          :page-sizes="[10,20, 30, 50, 100]"
+                          layout="prev, pager,next,sizes,  jumper"
+                          :total="listData.total">
          </el-pagination>
          <el-pagination v-if="small"
                         :small="small"
+                         @size-change="handleSizeChange"
                         @current-change="handleCurrentChange"
                         :current-page.sync="listData.pageNum"
                         layout="prev ,pager,next"
@@ -90,21 +89,21 @@ export default {
        return {
          data: [],
          pageNum: 1,
-          pageSize: 5,
+          pageSize: 10,
        }
      },
    },
  },
  data() {
    return {
-      listData: this.list,
+      listData : this.list,
      width: document.documentElement.clientWidth,
      small: document.documentElement.clientWidth <= 992,
      query: '',
    }
  },
-  watch: {
-    list(val) {
+  watch:{
+    list(val){
      this.listData = val
    }
  },
@@ -123,7 +122,7 @@ export default {
      } else {
        routeData = this.$router.resolve({path: "/pc/" + this.listData.secondId + router});
      }
-      window.open(routeData.href, "_blank")
+      window.open(routeData.href,"_blank")
    },
    handleSizeChange(val) {
      console.log(`每页 ${val} 条`);
@@ -288,7 +287,6 @@ export default {
    float: none;
  }
 }
-
 .query {
  //margin: 1rem 0;
  z-index: 50;
--- a/src/views/content/components/simple_list.vue
+++ b/src/views/content/components/simple_list.vue
@@ -99,19 +99,10 @@ export default {
  },
  methods: {
    getDateTime(date) {
-      if(typeof(date) == "string" &&  date.indexOf('-') != -1){
-        date = date.replace(/-/g,'/');
-      }
      let time = new Date(date);
      let year = time.getFullYear();
      let month = time.getMonth() + 1
-      if (month < 10){
-        month = "0"+month
-      }
      let day = time.getDate();
-      if (day<10){
-        day = "0"+ day
-      }
      return year + "-" + month + "-" + day;
    },
    getContext(context) {
@@ -186,7 +177,6 @@ export default {

    .article_name {
      float: left;
-      cursor: pointer;
      overflow: hidden;
      text-overflow: ellipsis;
      display: -webkit-box; //作为弹性伸缩盒子模型显示。
--- a/src/views/content/index.vue
+++ b/src/views/content/index.vue
@@ -45,7 +45,6 @@
          </div>
        </el-col>

-
        <el-col v-if="$i18n.locale  === 'en'" :xs="2" :sm="2" :md="2" :lg="2" :xl="3">
          <div class="grid-content"></div>
        </el-col>
@@ -81,7 +80,96 @@
          <el-row>
            <el-col>
              <div class="tab">
-                <router-link style="color: #1956BC; font-size: 16px;" to="/home">{{ $t('message.home') }}</router-link>
+                <router-link style="color: #1956BC; font-size: 16px;" to="/home">{{ $t("message.home") }}</router-link>
+                <span> > </span>
+                <span>
+                <!--<router-link to="">-->
+                <span v-if="$i18n.locale  === 'cn'">{{ crumbs.one.title }}</span>
+                <span v-if="$i18n.locale  === 'en'">{{ crumbs.one.englishTitle }}</span>
+                  <!--</router-link>-->
+                </span>
+                <span> > </span>
+                <span>
+                  <span v-if="$i18n.locale  === 'cn'">{{ crumbs.two.title }}</span>
+                  <span v-if="$i18n.locale  === 'en'">{{ crumbs.two.englishTitle }}</span>
+                </span>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <Introduction :introduction="contextData" v-if="type === 1"/>
+              <List :list="contextData" v-if="type === 2 && listDataType == 0"/>
+              <SimpleList :list="contextData" v-if="type === 2 && listDataType == 1"/>
+              <FileList :value="contextData" v-if="type === 4"/>
+              <DireData :value="contextData" v-if="type === 3 && dreDataType == '1'"/>
+              <DireDataTow :value="contextData" v-if="type === 3 && dreDataType == '2'"/>
+              <Details :value="detailsData" v-if="type == null"/>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row v-show="false">
+        <el-col v-if="$i18n.locale  === 'cn'" :xs="2" :sm="2" :md="1.5" :lg="2" :xl="4">
+          <div class="grid-content"></div>
+        </el-col>
+
+        <el-col v-if="$i18n.locale  === 'cn'" v-show="width" :md="6" :lg="6" :xl="4">
+          <div class="left_lab">
+            <div class="lab">
+              <div class="lab_div">
+                <div class="lab_list">
+                  <img src="@/assets/school_profile/eji_icon_xz.png" alt="">
+                  <span class="lab_title">教师名录</span>
+                </div>
+                <div class="lab_list">
+                  <img src="@/assets/school_profile/eji_icon_xz.png" alt="">
+                  <span class="lab_title">教师名录</span>
+                </div>
+                <div class="lab_list">
+                  <img src="@/assets/school_profile/eji_icon_xz.png" alt="">
+                  <span class="lab_title">教师名录</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+
+        <el-col v-if="$i18n.locale  === 'en'" :xs="2" :sm="2" :md="2" :lg="2" :xl="3">
+          <div class="grid-content"></div>
+        </el-col>
+
+        <el-col v-if="$i18n.locale  === 'en'" v-show="width" :md="6" :lg="6" :xl="5">
+          <div class="left_lab english" ref="lab">
+            <div class="lab">
+              <div v-for="(nav,index) in navList" class="lab_div">
+                <div v-if="index === showIndex" class="lab_list lab_select" @click="navClick(nav,index)">
+                  <div class="lab_img">
+                    <img src="@/assets/school_profile/eji_icon_xz.png" alt="">
+                  </div>
+                  <div class="lab_title">
+                    {{ nav.englishTitle }}
+                  </div>
+                </div>
+                <div v-if="index !== showIndex" class="lab_list" @click="navClick(nav,index)">
+                  <div class="lab_img">
+                    <img src="@/assets/school_profile/eji_icon_xz.png" alt="">
+                  </div>
+                  <div class="lab_title">
+                    {{ nav.englishTitle }}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+
+        <!--<el-col v-if="$i18n.locale  === 'cn'" :xs="20" :sm="20" :md="15" :lg="14" :xl="12">-->
+        <el-col :xs="20" :sm="20" :md="15" :lg="14" :xl="12">
+          <el-row>
+            <el-col>
+              <div class="tab">
+                <router-link style="color: #1956BC; font-size: 16px;" to="/home">{{ $t("message.home") }}</router-link>
                <span> > </span>
                <span>
                <!--<router-link to="">-->
@@ -119,7 +207,7 @@
          <el-row>
            <el-col>
              <div class="tab">
-                <router-link style="color: #1956BC; font-size: 16px;" to="/">{{ $t('message.home') }}</router-link>
+                <router-link style="color: #1956BC; font-size: 16px;" to="/">{{ $t("message.home") }}</router-link>
                <span> > </span>
                <span>
                <!--<router-link to="">-->
@@ -160,16 +248,15 @@

 <script>
 import {getNode, crumbs, article} from "@/api";
-import Introduction from './components/Introduction.vue'
-import List from './components/list.vue'
-import DireData from './components/dire_data.vue'
-import DireDataTow from './components/dire_data_tow.vue'
-import Details from './components/details.vue'
-import FileList from './components/file_list.vue'
-import SimpleList from './components/simple_list.vue'
+import Introduction from "./components/Introduction.vue";
+import List from "./components/list.vue";
+import DireData from "./components/dire_data.vue";
+import DireDataTow from "./components/dire_data_tow.vue";
+import Details from "./components/details.vue";
+import FileList from "./components/file_list.vue";
+import SimpleList from "./components/simple_list.vue";
 import {handleTree} from "@/utils/ebts";
 import {getParentNode, setLanguage} from "@/utils/sist";
-import {getNodeNav} from "../../api";

 export default {
  name: "index",
@@ -197,104 +284,86 @@ export default {
      bgImage: null,
      crumbs: {
        "two": {
-          "title": "学院领导",
+          "title": "学院领导"
        },
        "one": {
-          "title": "学院概况",
+          "title": "学院概况"
        }
      },
      detailsData: {}
-    }
+    };
  },
  watch: {
    $route(to, from) {
-      console.log("$route触发了")
-      this.showIndex = 0
-      this.rest()
-      let arcId = this.$route.params && this.$route.query.id
+      console.log("我被触发了");
+      this.showIndex = 0;
+      let arcId = this.$route.params && this.$route.query.id;
      this.navId = this.$route.params && this.$route.params.navId;
-      let id = this.$route.params && this.$route.params.secondId
-      this.type = this.$route.query && this.$route.query.type
+      let id = this.$route.params && this.$route.params.secondId;
+      this.type = this.$route.query && this.$route.query.type;
      if (this.type == 3 || this.type == 1 || this.type == 2) {
-        this.secondId = id
-        this.showSecond = false
+        this.secondId = id;
        this.getCrumbs();
+        this.showSecond = false;
        let info = getParentNode(this.secondId);
-        console.log("获取到info", info)
+        console.log("获取到info", info);
        if (arcId != undefined) {
-          console.log("getContext")
-          this.getContext(arcId)
+          console.log("getContext");
+          this.getContext(arcId);
        } else {
-          console.log("getContent")
-          this.getContent(info.second)
+          console.log("getContent");
+          this.getContent(info.second);
        }
-        return
+        return;
      } else {
-        console.log(this.navId, "this.navId")
+        console.log(this.navId, "this.navId");
        if (undefined == this.navId) {
-          console.log(this.navId, "this.navId1")
-          this.secondId = id
-          this.getNodes()
-          this.getCrumbs();
+          this.getNodes();
        }
      }
-      this.showSecond = true
+      this.showSecond = true;
      if (arcId != undefined) {
-        this.getContext(arcId)
+        this.getContext(arcId);
      }
      try {
-        this.$refs.lab.style.height = this.navList.length * 8 + 10 + 'rem'
+        this.$refs.lab.style.height = this.navList.length * 8 + 10 + "rem";
      } catch (e) {
      }
-      this.showIndex = 0
-      // if (this.secondId!=id){
-      //   this.getCrumbs();
-      // }
-      console.log("开始循环查找id信息",this.secondId == id && this.navList,this.secondId , id, this.navList)
      if (this.secondId == id && this.navList) {
        for (let i = 0; i < this.navList.length; i++) {
          if (this.navId == this.navList[i].encodeId) {
-            console.log("找到了")
-            this.showIndex = i
-            this.getContent(this.navList[i])
+            this.showIndex = i;
+            this.getContent(this.navList[i]);
          }
        }
      } else {
-        console.log("跳转的路由和以前不一样")
-        this.navList = []
-        this.secondId = id
-        this.getNav()
+        this.navList = [];
+        this.secondId = id;
+        this.getNav();
      }
    }
  },
  created() {
-    console.log("created触发了")
-    setLanguage(this)
-    this.showIndex = 0
+    setLanguage(this);
+    this.showIndex = 0;
    this.secondId = this.$route.params && this.$route.params.secondId;
    this.navId = this.$route.params && this.$route.params.navId;
-    this.type = this.$route.query && this.$route.query.type
-    console.log(this.type, "this.type")
+    this.type = this.$route.query && this.$route.query.type;
+    console.log(this.type, "this.type");
    setTimeout(() => {
-      this.getNav()
-      this.getNodes()
+      this.getNav();
    }, 200);
    //this.getNav()
    this.getCrumbs();
  },
  methods: {
-    rest() {
-      this.showIndex = 0
-      this.navId = null
-      this.type = null
-    },
    /**
     * 获得面包屑导航
     */
-    getCrumbs(id) {
+    getCrumbs() {
      crumbs(this.secondId).then(res => {
-        this.crumbs = res.data
-      })
+        this.crumbs = res.data;
+      });
    },
    /**
     * 获得内容
@@ -302,9 +371,9 @@ export default {
     */
    getContext(arcId) {
      article(arcId).then(res => {
-        this.detailsData = res.data.data
-        this.type = null
-      })
+        this.detailsData = res.data.data;
+        this.type = null;
+      });
    },
    /**
     *  获得菜单下的信息
@@ -312,34 +381,34 @@ export default {
    getNav() {
      this.getCrumbs();
      if (this.type == 3 || this.type == 1 || this.type == 2) {
-        console.log("进入二级")
-        this.showSecond = false
-        let info = null
+        console.log("进入二级");
+        this.showSecond = false;
+        let info = null;
        info = getParentNode(this.secondId);
        if (info == null) {
          location.reload();
        }
-        let arcId = null
+        let arcId = null;

-        arcId = this.$route.query && this.$route.query.id
-        console.log(arcId)
+        arcId = this.$route.query && this.$route.query.id;
+        console.log(arcId);
        if (arcId != undefined) {
-          this.getContext(arcId)
+          this.getContext(arcId);
        } else {
-          console.log("获取二级列表")
-          this.getContent(info.second)
+          console.log("获取二级列表");
+          this.getContent(info.second);
        }
-        return
+        return;
      }
-      this.showSecond = true
+      this.showSecond = true;
+      this.getNodes();
    },

    /**
     * 获得节点信息
     */
    async getNodes() {
-      console.log("getNodes被触发了")
-      this.navList = []
+      this.navList = [];
      // await getNode({id: this.secondId}).then(res => {
      //   this.navList = res.data
      //   try {
@@ -369,38 +438,29 @@ export default {
      //     }
      //   }
      // })
-      let res = await getNodeNav({id: this.secondId})
+      let res = await getNode({id: this.secondId});
      // todo 延时异步问题
-      console.log(res, "2222")
-      if (res.data.length == 0) {
-        this.navList = []
-        this.showSecond = false
-        return
-      }
-      this.navList = res.data
-      // setTimeout(() => {
-      this.$refs.lab.style.height = res.data.length * 8 + 10 + 'rem'
-      console.log("qqq")
-      // }, 100);
-
+      setTimeout(() => {
+        this.$refs.lab.style.height = res.data.length * 8 + 10 + "rem";
+      }, 100);
+      this.navList = res.data;
      // if (!this.navList){
      //   return
      // }
      for (let i = 0; i < this.navList.length; i++) {
        if (this.navId == this.navList[i].encodeId) {
-          this.showIndex = i
+          this.showIndex = i;
        }
      }
-      let arcId = this.$route.query && this.$route.query.id
-      console.log("进入到arcId 的判断", arcId)
+      let arcId = this.$route.query && this.$route.query.id;
      if (arcId != undefined) {
-        this.getContext(arcId)
+        this.getContext(arcId);
      } else {
-        console.log("进入到this.navId 的判断", this.navId)
+        console.log("测试,我被触发了!");
        if (this.navId == undefined) {
-          this.getContent(this.navList[0])
+          this.getContent(this.navList[0]);
        } else {
-          this.getContent(this.navList[this.showIndex])
+          this.getContent(this.navList[this.showIndex]);
        }
      }
    },
@@ -409,39 +469,39 @@ export default {
     * @param menu
     */
    getContent(menu) {
-      console.log("getContent被触发了", menu)
+      console.log("getContent内部,menu:", menu);
+      console.log(menu);
      if (menu == undefined) {
-        return
+        return;
      }
-      this.type = menu.type
-      this.contextData = null
-      this.bgImage = menu.link
-      let data = null
+      this.type = menu.type;
+      this.contextData = null;
+      this.bgImage = menu.link;
+      let data = null;
      if (this.type === 2 || this.type === 4) {
        data = {
          id: menu.encodeId,
          pageNum: 1,
          pageSize: 5
-        }
-        this.listDataType = 0
-        console.log(menu.isSimple,"menu.isSimple")
+        };
+        this.listDataType = 0;
        if (this.type === 4 || menu.isSimple == 1) {
-          data.pageSize = 10
-          this.listDataType = 1
+          data.pageSize = 10;
+          this.listDataType = 1;
        }
      } else {
        data = {
-          id: menu.encodeId,
-        }
+          id: menu.encodeId
+        };
      }
      getNode(data).then(res => {
-        console.log(res, "res值")
+        console.log(res, "res值");
        console.log(this.type);
        if (null == res.data && null == res.rows) {
-          this.contextData = null
-          console.log("将值设为null", this.contextData)
-          this.type = 0
-          return
+          this.contextData = null;
+          console.log("将值设为null", this.contextData);
+          this.type = 0;
+          return;
        }
        if (this.type === 2 || this.type === 4) {
          this.contextData = {
@@ -450,21 +510,21 @@ export default {
            pageNum: data.pageNum,
            pageSize: data.pageSize,
            navId: menu.encodeId,
-            secondId: this.secondId,
-          }
+            secondId: this.secondId
+          };
        } else if (this.type == 1) {
-          this.contextData = res.data
+          this.contextData = res.data;
        } else if (this.type == 3) {
          if (res.additional == "") {
-            this.dreDataType = "1"
+            this.dreDataType = "1";
          } else {
-            console.log(this.dreDataType, "this.organizationType")
-            this.dreDataType = res.additional
+            console.log(this.dreDataType, "this.organizationType");
+            this.dreDataType = res.additional;
          }
-          this.contextData = handleTree(res.data, "id", "pid", null, null)
-          console.log(this.contextData, "this.contextData")
+          this.contextData = handleTree(res.data, "id", "pid", null, null);
+          console.log(this.contextData, "this.contextData");
        }
-      })
+      });
    },


@@ -475,14 +535,14 @@ export default {
     */
    navClick(nav, index) {
      //if (index != this.showIndex) {
-      this.showIndex = index
-      this.type = nav.type
+      this.showIndex = index;
+      this.type = nav.type;
      this.$router.push("/pc/" + this.secondId + "/" + nav.encodeId + "?lang=" + sessionStorage.getItem("lang"));
      //this.getContent(nav)
      //}
    }
-  },
-}
+  }
+};
 </script>

 <style scoped lang="scss">
@@ -532,9 +592,9 @@ export default {
    box-shadow: 0rem 0.2rem 0.4rem 0rem rgba(6, 42, 102, 0.67);
    border-radius: 0rem 0rem 2.5rem 2rem;

-    .lab_list:last-child {
-      border: none;
-    }
+    //.lab_list:last-child {
+    //  border: none;
+    //}

    .lab_div {
      border-bottom: 0.1rem solid #94BCFF !important;
@@ -590,6 +650,34 @@ export default {
  }
 }

+//.left_lab {
+//  --lab: 1.5rem;
+//  --left_lab: calc(var(--lab) * 3.2);
+//  width: 22rem;
+//  background: #1956BC;
+//  border-radius: 0 0 13px 0;
+//  padding-bottom: var(--left_lab);
+//  padding-top: 5rem;
+//  padding-left: 4.8rem;
+//  margin-left: 4rem;
+//  .lab {
+//    background: #FFFFFF;
+//    box-shadow: 0 1px 3px 0 rgba(6, 42, 102, 0.67);
+//    border-radius: 0 0 16px 13px;
+//    margin-right: -2rem!important;
+//    .lab_div {
+//      padding-left: var(--lab);
+//      .lab_list {
+//        line-height: 8rem;
+//        border-bottom: .1rem solid #94BCFF;
+//      }
+//      .lab_list:last-child {
+//        border-bottom: none !important;
+//      }
+//    }
+//  }
+//}
+
 .tab {
  margin-left: 1.9rem;
  margin-top: 1.5rem;
@@ -598,6 +686,7 @@ export default {

  a {
    text-decoration: none;
+    font-size: 1.4rem !important;
    color: #3C3C3C;
  }
 }
@@ -616,25 +705,26 @@ export default {
      width: 14.25rem;
      margin-bottom: 2.25rem;
      border-radius: 0rem 0rem 1.2rem 1rem;
+        .lab_list {
+          margin-left: .75rem;
+          width: 13.5rem;
+          height: 6rem;
+          line-height: 6rem;

-      .lab_list {
-        margin-left: .75rem;
-        width: 13.5rem;
-        height: 6rem;
-        line-height: 6rem;
+          .lab_img {
+            margin-top: .1rem;
+            width: 1.05rem;
+            height: 1.05rem;
+            display: none;
+            margin-left: 3rem;
+          }

-        .lab_img {
-          margin-top: .1rem;
-          width: 1.05rem;
-          height: 1.05rem;
-          display: none;
-          margin-left: 3rem;
+          .lab_title {
+            margin-left: 1.5rem;
+          }
        }

-        .lab_title {
-          margin-left: 1.5rem;
-        }
-      }
+
    }
  }
 }
--- a/src/views/footer/index.vue
+++ b/src/views/footer/index.vue
@@ -8,8 +8,7 @@
        <el-row>
          <el-col :span="12">
            <div class="fLeft" style="margin-top: 1rem">
-              <p style="font-family:Verdana, Geneva, sans-serif;font-weight:500;font-size:2rem; padding-bottom:6px; ">
-                {{ $t('message.contact_us') }}
+              <p style="font-family:Verdana, Geneva, sans-serif;font-weight:500;font-size:2rem; padding-bottom:6px; ">{{ $t('message.contact_us') }}
                <!--CONTACT US-->
              </p>
              <p style="margin-top: 6px;">
@@ -32,11 +31,8 @@
          </el-col>
          <el-col :span="12">
            <table class="fRight" cellpadding="0" cellspacing="0" border="0">
-              <tbody>
-              <tr>
-                <td>
-<!--                  <img style="width: 6.7rem;" src="http://sist.swjtu.edu.cn:80/zh/images/logo3.jpg">-->
-                </td>
+              <tbody><tr>
+                <td><img  style="width: 6.7rem;" src="http://sist.swjtu.edu.cn:80/zh/images/logo3.jpg"></td>
                <td><p><a href="http://www.swjtu.edu.cn/" target="_blank">
                  {{ $t('message.chinese_site') }}
                  <!--西南交通大学（中文）-->
@@ -67,8 +63,7 @@
                  </a></p>
                </td>
              </tr>
-              </tbody>
-            </table>
+              </tbody></table>
          </el-col>
        </el-row>
      </el-col>
@@ -89,25 +84,21 @@ export default {
  background-color: rgb(107, 109, 108);
  color: #b2b2b2 !important;
  font-size: 1.2rem;
-
-  a {
+  a{
    color: #b2b2b2 !important;
-    text-decoration: none;
+    text-decoration:none;
  }

-  .fLeft {
+  .fLeft{
    text-decoration: none;
    margin-top: 1rem;
-
    p {
      margin-top: .5rem;
    }
  }
-
-  .fRight {
+  .fRight{
    margin-top: 1rem;
    text-decoration: red;
-
    p {
      margin-left: 1rem;
      margin-top: .5rem;
--- a/src/views/header/index.vue
+++ b/src/views/header/index.vue
@@ -8,8 +8,8 @@
          <el-col v-show="width" :xs="1" :sm="1" :md="4" :lg="4" :xl="5">
            <div class="icon">
 <!--              <div class="icont"><img src="@/assets/header/logo@2x.png" alt=""></div>-->
-              <div class="icont" v-show="login_blue" ><img src="@/assets/header/logob.png" alt=""></div>
-              <div class="icont" v-show="!login_blue"><img src="@/assets/header/logol.png" alt=""></div>
+              <div class="icont" v-show="logo" ><img src="@/assets/header/logob.png" alt=""></div>
+              <div class="icont" v-show="!logo"><img src="@/assets/header/logol.png" alt=""></div>

              <!--            <div class="iconb"><img src="@/assets/header/sy_logo2@2x.png" alt=""></div>-->
            </div>
@@ -59,12 +59,10 @@
                <!--<div class="secondary" v-if="index == 5">-->
              </div>
            </span>
-              <div class="iconfont" @click="login" v-show="login_blue"><img src="@/assets/header/denglu.png" alt=""></div>
-              <div class="iconfont" @click="login" v-show="!login_blue"><img src="@/assets/header/denglu1.png" alt=""></div>
-              <div class="iconfont" @click="switchLang" v-if="login_blue && $i18n.locale  == 'cn'"><img src="@/assets/header/en.png" alt=""></div>
-              <div class="iconfont" @click="switchLang" v-if="!login_blue && $i18n.locale  == 'cn'"><img src="@/assets/header/en1.png" alt=""></div>
-              <div class="iconfont" @click="switchLang" v-if="login_blue && $i18n.locale  == 'en'"><img src="@/assets/header/enz.png" alt=""></div>
-              <div class="iconfont" @click="switchLang" v-if="!login_blue && $i18n.locale  == 'en'"><img src="@/assets/header/enzl.png" alt=""></div>
+              <div class="iconfont" @click="login" v-show="logo"><img src="@/assets/header/denglu.png" alt=""></div>
+              <div class="iconfont" @click="login" v-show="!logo"><img src="@/assets/header/denglu1.png" alt=""></div>
+              <div class="iconfont" @click="switchLang" v-show="logo"><img src="@/assets/header/en.png" alt=""></div>
+              <div class="iconfont" @click="switchLang" v-show="!logo"><img src="@/assets/header/en1.png" alt=""></div>
            </div>
          </el-col>
        </div>
@@ -86,11 +84,7 @@ export default {
      pc: document.documentElement.clientWidth > 992,
      menuData: [],
      link_color:'#C5DCFE',
-      login_blue:true,
-      en_logo_blue:false,
-      en_login_white:false,
-      ch_logo_blue:true,
-      ch_logo_white:false
+      logo:true
    }
  },
  mounted() {
@@ -101,22 +95,19 @@ export default {
    window.onscroll = ()=>{
      // 获取滚动距离
      let top = document.documentElement.scrollTop || document.body.scrollTop;
+
      if (top !== 0) {
        Head.style = "position: fixed;top: 0;background-color: #fff;"
        header_bgc.style= "position: fixed;top: 0;background-color: #fff;box-shadow: 0px 1px 3px 0px rgba(8,57,122,0.18);"
        this.link_color='#0A51AE'
-        this.login_blue=false
-        this.ch_logo_blue=false
-        this.ch_logo_white=true
-        // this.en_login_white=false
+        this.logo=false
+        // link_text.style="color:#fff;"
+        // link_text.addClass('active')
      }else if(top === 0){
        Head.style = "position: static;"
        header_bgc.style= "position: static;background: linear-gradient(180deg, #0A51AE 0%, rgba(25,84,167,0.9) 56%, rgba(21,82,167,0.7) 69%, rgba(16,80,168,0.4) 85%, rgba(11,81,173,0) 100%);"
        this.link_color='#C5DCFE'
-        this.login_blue=true
-        this.ch_logo_blue=true
-        this.ch_logo_white=false
-        // this.en_login_white=true
+        this.logo=true
      }
    }
    const that = this
@@ -142,7 +133,8 @@ export default {
      window.open(routeData.href, "_blank")
    },
    menuCut(menu) {
-      window.open("/pc/" + menu.encodeId + "?type=" + menu.type + "&lang=" + sessionStorage.getItem("lang"))
+      console.log(menu)
+      this.$router.push("/pc/" + menu.encodeId + "?type=" + menu.type + "&lang=" + sessionStorage.getItem("lang"));
    },
    switchLang() {
      let lang = ''
@@ -368,12 +360,5 @@ export default {
  }
 }

-@media screen and (max-width: 992px) {
-  #header{
-    display: none!important;
-  }
-  #header_bgc{
-    display: none!important;
-  }
-}
+
 </style>
--- a/src/views/header/mobile_herder.vue
+++ b/src/views/header/mobile_herder.vue
@@ -1,6 +1,6 @@
 <template>
-  <div id="mobile_herder" class="mobile_herder">
-    <div class="bottom" id="bottom">
+  <div class="mobile_herder">
+    <div class="bottom">
      <div @click="drawer = true">
        <i class="el-icon-s-fold"></i>
      </div>
@@ -35,35 +35,31 @@
          </template>

          <span v-for="(item,itemIndex) in menu.children" :key="itemIndex">
-            <el-submenu :index="menuIndex +'-'+itemIndex" v-if="item.children.length > 0 && item.displayType != 4">
-              <template slot="title" v-if="item.children.length > 0 &&$i18n.locale  === 'cn' ">{{
-                  item.title
-                }}</template>
-              <template slot="title" v-if="item.children.length > 0 && $i18n.locale  === 'en'">{{
-                  item.englishTitle
-                }}</template>
+            <el-submenu :index="menuIndex +'-'+itemIndex" v-if="item.children.length > 0">
+
+              <template slot="title" v-if="item.children.length == 0 && $i18n.locale  === 'cn'">
+                <span @click="clickSecondMenu(item)">{{ item.title }}</span>
+              </template>
+              <template slot="title" v-if="item.children.length == 0&& $i18n.locale  === 'en'">
+                <span @click="clickSecondMenu(item)">{{ item.englishTitle }}</span>
+              </template>
+
+              <template slot="title" v-if="item.children.length > 0 &&$i18n.locale  === 'cn' ">{{ item.title }}</template>
+              <template slot="title"
+                        v-if="item.children.length > 0 && $i18n.locale  === 'en'">{{ item.englishTitle }}</template>
              <el-menu-item v-for="(chile ,chileIndex) in item.children" :key="chileIndex"
-                            v-if="chile.displayType != 4"
                            :index="menuIndex + '-' +itemIndex + '-' +chileIndex" @click="clickMenu(chile,item)">
-                <span v-if="$i18n.locale  === 'cn'&&(chile.displayType == 1 || chile.displayType == 3)">{{
-                    chile.title
-                  }}</span>
-                <span v-if="$i18n.locale  === 'en'&&(chile.displayType == 1 || chile.displayType == 2)">{{
-                    chile.englishTitle
-                  }}</span>
+                <span v-if="$i18n.locale  === 'cn'">{{ chile.title }}</span>
+                <span v-if="$i18n.locale  === 'en'">{{ chile.englishTitle }}</span>
              </el-menu-item>
            </el-submenu>
-            <el-menu-item v-if="!item.children.length>0 && (item.displayType != 4)" :key="itemIndex"
-                          :index="menuIndex +'-'+itemIndex"
-                          @click="clickSecondMenu(item)">
-              <span v-if="$i18n.locale  === 'cn'&&(item.displayType == 1 || item.displayType == 3)">{{
-                  item.title
-                }}</span>
-              <span v-if="$i18n.locale  === 'en'&&(item.displayType == 1 || item.displayType == 2)">{{
-                  item.englishTitle
-                }}</span>
+            <el-menu-item v-if="!item.children.length>0" :key="itemIndex" :index="menuIndex +'-'+itemIndex" @click="clickSecondMenu(item)">
+              <span v-if="$i18n.locale  === 'cn'">{{ item.title }}</span>
+              <span v-if="$i18n.locale  === 'en'">{{ item.englishTitle }}</span>
            </el-menu-item>
          </span>
+
+
        </el-submenu>
      </el-menu>
    </el-drawer>
@@ -149,7 +145,6 @@ export default {
 }

 .mobile_herder {
-
  .top {
    padding-left: 2rem;
    height: 4rem;
--- a/src/views/index/components/academy_and_sciences.vue
+++ b/src/views/index/components/academy_and_sciences.vue
@@ -15,7 +15,7 @@
                {{item.title}}
              </div>
            </div>
-            <div class="sciences_more more" @click="lookMore('b4Lm82Ct_eaF2u5XDABv0TM')">
+            <div class="more" @click="lookMore('b4Lm82Ct_eaF2u5XDABv0TM')">
              <span class="more_text">更多</span>
              <img src="../../../assets/index/academy_and_sciences/gangduobai1.png" alt="">
            </div>
@@ -34,8 +34,8 @@
                  <div class="academy_content_title">
                    {{sciencesData[0].title}}
                  </div>
-                  <div v-if="sciencesData[0].description" class="academy_content_text">{{sciencesData[0].description}}</div>
-                  <div v-if="!sciencesData[0].description" class="academy_content_text" v-html="sciencesData[0].content"></div>
+                  <div class="academy_content_text" v-html="sciencesData[0].content">
+                  </div>
                </div>
              </el-col>
              <el-col :span="2">
@@ -50,14 +50,14 @@
                  <div class="academy_content_title">
                    {{sciencesData[1].title}}
                  </div>
-                  <div v-if="sciencesData[1].description" class="academy_content_text">{{sciencesData[1].description}}</div>
-                  <div v-if="!sciencesData[1].description" class="academy_content_text" v-html="sciencesData[1].content"></div>
+                  <div class="academy_content_text" v-html="sciencesData[1].content">
+                  </div>
                </div>
              </el-col>
            </el-row>
            <el-row>
              <el-col :span="11">
-                <div class="academy_content" @click="getArticle(sciencesData[2])">
+                <div class="academy_content" @click="getArticle(sciencesData[1])">
                  <div class="academy_content_icontime">
                    <div class="img"></div>
                    <span>{{getDateTime(sciencesData[2].publishTime)}}</span>
@@ -65,8 +65,8 @@
                  <div class="academy_content_title">
                    {{sciencesData[2].title}}
                  </div>
-                  <div v-if="sciencesData[2].description" class="academy_content_text">{{sciencesData[2].description}}</div>
-                  <div v-if="!sciencesData[2].description" class="academy_content_text" v-html="sciencesData[2].content"></div>
+                  <div class="academy_content_text" v-html="sciencesData[2].content">
+                  </div>
                </div>
              </el-col>
              <el-col :span="2">
@@ -74,7 +74,7 @@
              </el-col>

              <el-col :span="11">
-                <div class="academy_content" @click="getArticle(sciencesData[3])">
+                <div class="academy_content" @click="getArticle(sciencesData[1])">
                  <div class="academy_content_icontime">
 <!--                    <img :src="src" alt="">-->
                    <div class="img"></div>
@@ -83,12 +83,12 @@
                  <div class="academy_content_title">
                    {{sciencesData[3].title}}
                  </div>
-                  <div v-if="sciencesData[3].description" class="academy_content_text">{{sciencesData[3].description}}</div>
-                  <div v-if="!sciencesData[3].description" class="academy_content_text" v-html="sciencesData[3].content"></div>
+                  <div class="academy_content_text" v-html="sciencesData[3].content">
+                  </div>
                </div>
              </el-col>
            </el-row>
-            <div class="academy_more more" @click="lookMore('47sdOe8NQs0B4EHmM-wFWjQ')">
+            <div class="more" @click="lookMore('47sdOe8NQs0B4EHmM-wFWjQ')">
              <span class="more_text">更多</span>
              <img src="../../../assets/index/academy_and_sciences/gangduobai1.png" alt="">
            </div>
@@ -121,7 +121,7 @@ export default {
  methods: {
    clickTo(link) {
      //console.log(link)
-      window.location.href = window.location.origin + link; //当前标签页
+      window.location.href = link;//当前标签页
    },
    getArticle(news) {
      toArticle(news, this.width);
@@ -150,35 +150,17 @@ export default {
    },

    getDateTime(date) {
-      if(typeof(date) == "string" &&  date.indexOf('-') != -1){
-        date = date.replace(/-/g,'/');
-      }
      let time = new Date(date);
      let year = time.getFullYear();
      let month = time.getMonth() + 1
-      if (month < 10){
-        month = "0"+month
-      }
      let day = time.getDate();
-      if (day<10){
-        day = "0"+ day
-      }
      return year + "-" + month + "-" + day;
    },

    getMonthTime(date) {
-      if(typeof(date) == "string" &&  date.indexOf('-') != -1){
-        date = date.replace(/-/g,'/');
-      }
      let time = new Date(date);
      let month = time.getMonth() + 1
-      if (month < 10){
-        month = "0"+month
-      }
      let day = time.getDate();
-      if (day<10){
-        day = "0"+ day
-      }
      return month + "-" + day;
    },
  },
@@ -220,8 +202,8 @@ export default {
    text-align: left;
    background: linear-gradient(240deg, rgba(0, 75, 177, 0) 0%, rgba(6, 79, 175, 0.64) 44%, #0A51AE 100%);
    padding-left: 1.9rem;
-    margin-top: 2rem;
-    margin-bottom: 2rem;
+    margin-top: 5rem;
+    margin-bottom: 5rem;
  }

  .sciences_content {
@@ -253,20 +235,13 @@ export default {
      -webkit-line-clamp: 1; //显示的行
    }
  }
-   .sciences_more{
-    margin-top: 3rem;
-    margin-bottom: 3rem;
-  }
-  .academy_more{
-    margin-top: 1.7rem;
-    margin-bottom: 3rem;
-  }
+
  .more {
    width: 100%;
    display: flex;
    height: 2.3rem;
-    //margin-top: 3rem;
-    //margin-bottom: 3rem;
+    margin-top: 3.4rem;
+    margin-bottom: 3rem;
    cursor: pointer;
    .more_text {
      font-size: 1.6rem;
@@ -289,7 +264,6 @@ export default {
    color: #0049AF;
    .academy_content_text{
      color: #575757;
-      font-size: 1.4rem !important;
    }

    .img {
@@ -299,13 +273,22 @@ export default {

  .academy_content {
    cursor: pointer;
-    height: 10.5rem;
+
+    //&:hover{
+    //  box-shadow: 0 8px 11px 0 rgba(0, 73, 174, 0.5);
+    //  background: #FFFFFF;
+    //  color: #0049AF;
+    //  .academy_content_text{
+    //    color: #575757;
+    //  }
+    //}
+
+
    background-color: rgba(10, 81, 174, 0.89);
    padding: 2.5rem 2.3rem;
    border-radius: 16px;
    margin-bottom: 1.9rem;
    color: #FFFFFF;
-
    &_icontime {
      display: flex;
      margin-bottom: 1.1rem;
@@ -331,7 +314,7 @@ export default {
      //width: 139px;
      width: 100%;
      //height: 38px;
-      font-size: 1.6rem;
+      font-size: 1.4rem;
      font-weight: bold;
      //color: #FFFFFF;
      line-height: 1.9rem;
--- a/src/views/index/components/announcements.vue
+++ b/src/views/index/components/announcements.vue
@@ -23,8 +23,8 @@
              </div>
              <div class="announcements_text_line"></div>
              <div class="announcements_text_title">{{item.title}}</div>
-              <div  v-if="item.description" class="announcements_text_content">{{item.description}}</div>
-              <div  v-if="!item.description"  class="announcements_text_content" v-html="item.content"></div>
+              <div class="announcements_text_content" v-html="item.content">
+              </div>
            </div>
          </el-col>
        </el-row>
@@ -75,18 +75,12 @@ export default {
      });
    },
    getDateTime(date) {
-      if(typeof(date) == "string" &&  date.indexOf('-') != -1){
-        date = date.replace(/-/g,'/');
-      }
      let time = new Date(date);
      let year = time.getFullYear();
      let month = time.getMonth() + 1
      return year + "-" + month;
    },
    getDayTime(date) {
-      if(typeof(date) == "string" &&  date.indexOf('-') != -1){
-        date = date.replace(/-/g,'/');
-      }
      let time = new Date(date);
      let day = time.getDate();
      return day;
@@ -110,8 +104,8 @@ export default {
    width: 100%;
    display: flex;
    justify-content: center;
-    padding-top: 2rem;
-    padding-bottom: 2rem;
+    padding-top: 6.3rem;
+    padding-bottom: 5.6rem;

    .line_left {
      line-height: 4.4rem;
@@ -179,7 +173,7 @@ export default {

      width: 100%;
      height: 3.8rem;
-      font-size: 1.6rem;
+      font-size: 1.4rem;
      font-weight: bold;
      color: #000000;
      line-height: 1.9rem;
@@ -195,7 +189,7 @@ export default {
    &_content {
      width: 100%;
      height: 7rem;
-      font-size: 1.4rem;
+      font-size: 1rem;
      font-weight: 500;
      color: #777777;
      line-height: 1.8rem;
--- a/src/views/index/components/bottom.vue
+++ b/src/views/index/components/bottom.vue
@@ -21,7 +21,7 @@
              <td>
                <div class="right one">
                  <div class="table_tr_left">{{ $t('message.employees') }}</div>
-                  <div class="table_tr_right">{{data.worker}}{{$t('message.person')}}</div>
+                  <div class="table_tr_right">{{data.worker}}人</div>
                </div>
              </td>
            </tr>
@@ -29,7 +29,7 @@
              <td>
                <div class="right tow">
                  <div class="table_tr_left">{{ $t('message.number_students') }}</div>
-                  <div class="table_tr_right">{{data.students}}{{$t('message.person')}}</div>
+                  <div class="table_tr_right">{{data.students}}人</div>
                </div>
              </td>
            </tr>
@@ -37,7 +37,7 @@
              <td>
                <div class="right three">
                  <div class="table_tr_left">{{ $t('message.graduate_tutor') }}</div>
-                  <div class="table_tr_right">{{data.postgraduateTutor}}{{$t('message.person')}}</div>
+                  <div class="table_tr_right">{{data.postgraduateTutor}}人</div>
                </div>
              </td>
            </tr>
@@ -45,7 +45,7 @@
              <td>
                <div class="right fourth">
                  <div class="table_tr_left">{{ $t('message.research_team') }}</div>
-                  <div class="table_tr_right">{{data.scientificTeam}}{{$t('message.pics')}}</div>
+                  <div class="table_tr_right">{{data.scientificTeam}}人</div>
                </div>
              </td>
            </tr>
@@ -53,7 +53,7 @@
              <td>
                <div class="right five">
                  <div class="table_tr_left">{{ $t('message.high_level_talents') }}</div>
-                  <div class="table_tr_right">{{data.highLevelTalents}}{{$t('message.person')}}</div>
+                  <div class="table_tr_right">{{data.highLevelTalents}}个</div>
                </div>
              </td>
            </tr>
@@ -61,7 +61,7 @@
              <td>
                <div class="right six">
                  <div class="table_tr_left">{{ $t('message.major_projects') }}</div>
-                  <div class="table_tr_right">{{data.majorProjects}}{{$t('message.pics')}}</div>
+                  <div class="table_tr_right">{{data.majorProjects}}个</div>
                </div>
              </td>
            </tr>
--- a/src/views/index/components/news_center.vue
+++ b/src/views/index/components/news_center.vue
@@ -22,12 +22,13 @@
        <el-col :span="6" v-for="(item,index) in newsData" :key="index" :class="'border_right-' + (index + 1)">
          <div class="news_context" @click="getArticle(item)">
            <div class="news_context_img">
+              <img v-if="!item.imgurl" src="../../../assets/index/news_center/t4.png" alt="">
              <img v-if="item.imgurl" :src="item.imgurl" alt="">
            </div>
            <div class="news_context_text" >
              <div class="news_context_text-title">{{ item.title }}</div>
-              <div v-if="item.description" class="news_context_text-content">{{item.description}}</div>
-              <div v-if="!item.description" class="news_context_text-content" v-html="item.content"></div>
+              <div class="news_context_text-content" v-html="item.content">
+              </div>
              <div class="news_context_time">
                <div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
                <span class="time">{{ getDateTime(item.publishTime) }}</span>
@@ -78,19 +79,10 @@ export default {
      });
    },
    getDateTime(date) {
-      if(typeof(date) == "string" &&  date.indexOf('-') != -1){
-        date = date.replace(/-/g,'/');
-      }
      let time = new Date(date);
      let year = time.getFullYear();
      let month = time.getMonth() + 1
-      if (month < 10){
-        month = "0"+month
-      }
      let day = time.getDate();
-      if (day<10){
-        day = "0"+ day
-      }
      return year + "-" + month + "-" + day;
    },
  },
@@ -161,8 +153,7 @@ export default {
  background-size: cover;
  background-repeat: no-repeat;
  //width: 100%;
-  //height: 61rem;
-  padding-bottom: 2rem;
+  height: 61rem;

  .headline {
    display: flex;
@@ -184,7 +175,7 @@ export default {
      text-align: left;
      background: linear-gradient(240deg, rgba(0, 75, 177, 0) 0%, rgba(6, 79, 175, 0.64) 44%, #0A51AE 100%);
      padding-left: 1.9rem;
-      margin-top: 2rem;
+      margin-top: 6.3rem;

      .vertica_line {
        width: .1rem;
@@ -212,7 +203,7 @@ export default {
  .more {
    display: flex;
    height: 3.7rem;
-    margin-top: 4rem;
+    margin-top: 9.8rem;
    cursor: pointer;

    .more_text {
@@ -240,7 +231,6 @@ export default {
  }
 }

-
 .news {
  margin: 4rem auto 0 auto;
  width: 115.4rem;
@@ -328,6 +318,7 @@ export default {
        }

        .time {
+          width: 6rem;
          height: 1.4rem;
          font-size: 1rem;
          font-weight: 500;
--- a/src/views/index/components/party_building_activities.vue
+++ b/src/views/index/components/party_building_activities.vue
@@ -92,8 +92,8 @@ export default {
    width: 100%;
    display: flex;
    justify-content: center;
-    padding-top: 3rem;
-    padding-bottom: 2rem;
+    padding-top: 6.3rem;
+    padding-bottom: 4.4rem;

    .line_left {
      line-height: 4.4rem;
--- a/src/views/index/components/slideshow_card.vue
+++ b/src/views/index/components/slideshow_card.vue
@@ -66,13 +66,8 @@ export default {
  },
  methods: {
    clickTo(link) {
-      // let userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
-      window.location.href = link
-      // if (userAgent.indexOf("Safari") > -1) {
-      //   window.location.href = link
-      // } else {
-      //   window.open(link, "_blank")
-      // }
+      //console.log(link)
+      window.location.href = link;//当前标签页
    },
    constructor() {
      this.bannerWrap = document.getElementsByClassName("banner-card")[0];
@@ -109,7 +104,7 @@ export default {
    },
 // 定时器自动切换
    timer() {
-      this.time = setInterval(this.leftMove.bind(this), 2000);
+      this.time = setInterval(this.leftMove.bind(this), 1000);
    },
 // 鼠标移入移出事件
    listenMouseEvent() {
--- a/src/views/index/components/undergraduate_and_graduate.vue
+++ b/src/views/index/components/undergraduate_and_graduate.vue
@@ -9,13 +9,12 @@
              <span>{{ $t("message.undergraduate_education") }}</span>
            </div>
            <div class="vline">
-              <div class="undergraduate_content" v-for="(item,index) in undergraduateData" :key="index"
-                   @click="getArticle(item)">
+              <div class="undergraduate_content" v-for="(item,index) in undergraduateData" :key="index" @click="getArticle(item)">
                <div class="undergraduate_content_time">
-                  {{ getMonthTime(item.publishTime) }}
+                  {{getMonthTime(item.publishTime)}}
                </div>
                <div class="undergraduate_content_text">
-                  {{ item.title }}
+                  {{item.title}}
                </div>
              </div>
              <div class="more" @click="lookMore('KW_T7dJ2lt5sC-RJZSnPtk0')">
@@ -26,17 +25,15 @@
          </el-col>
          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
            <div class="graduate headline">
-              <img class="graduate_img" src="../../../assets/index/undergraduate_and_graduate/boshimaobeifen.png"
-                   alt=""/>
+              <img class="graduate_img" src="../../../assets/index/undergraduate_and_graduate/boshimaobeifen.png" alt=""/>
              <span>{{ $t("message.postgraduate_education") }}</span>
            </div>
-            <div class="undergraduate_content" v-for="(item,index) in graduateData" :key="index"
-                 @click="getArticle(item)">
+            <div class="undergraduate_content" v-for="(item,index) in graduateData" :key="index" @click="getArticle(item)">
              <div class="undergraduate_content_time">
-                {{ getMonthTime(item.publishTime) }}
+                {{getMonthTime(item.publishTime)}}
              </div>
              <div class="undergraduate_content_text">
-                {{ item.title }}
+                {{item.title}}
              </div>
            </div>
            <div class="more" @click="lookMore('1yaM_T4qiBsFULvLXHbMflQ')">
@@ -57,10 +54,10 @@ import {lookMoreFixedComment} from "../../../utils/sist";

 export default {
  name: "undergraduate_and_graduate",
-  data() {
-    return {
-      undergraduateData: [],
-      graduateData: [],
+  data(){
+    return{
+      undergraduateData:[],
+      graduateData:[],
      width: document.documentElement.clientWidth > 992
    }
  },
@@ -75,7 +72,6 @@ export default {
      window.location.href = link;//当前标签页
    },
    getArticle(news) {
-      console.log(news)
      toArticle(news, this.width);
    },
    lookMore(str) {
@@ -100,19 +96,18 @@ export default {
      });
    },

+    getDateTime(date) {
+      let time = new Date(date);
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1
+      let day = time.getDate();
+      return year + "-" + month + "-" + day;
+    },
+
    getMonthTime(date) {
-      if(typeof(date) == "string" &&  date.indexOf('-') != -1){
-        date = date.replace(/-/g,'/');
-      }
      let time = new Date(date);
      let month = time.getMonth() + 1
-      if (month < 10) {
-        month = "0" + month
-      }
      let day = time.getDate();
-      if (day < 10) {
-        day = "0" + day
-      }
      return month + "-" + day;
    },
  },
@@ -122,10 +117,9 @@ export default {
 <style scoped lang="scss">


-.undergraduate_content {
+.undergraduate_content{
  cursor: pointer;
 }
-
@media screen and (max-width: 960px) {
  .undergraduate {
    border-radius: 36px 36px 0 0 !important;
@@ -134,13 +128,12 @@ export default {
    border-radius: 36px 36px 0 0 !important;
  }
  .more {
-    justify-content: center !important;
+    justify-content: center!important;
  }
  .vline {
-    border-right: none !important;
+    border-right: none!important;
  }
 }
-
@media screen and (max-width: 768px) {
  .undergraduate {
    border-radius: 36px 36px 0 0 !important;
@@ -149,11 +142,11 @@ export default {
    border-radius: 36px 36px 0 0 !important;
  }
  .more {
-    justify-content: center !important;
+    justify-content: center!important;
  }

  .vline {
-    border-right: none !important;
+    border-right: none!important;
  }
 }

@@ -167,8 +160,8 @@ export default {
  &_bgc {
    background-color: #fff;
    //height: 33.8rem;
-    margin-top: 3rem;
-    margin-bottom: 3rem;
+    margin-top: 8.1rem;
+    margin-bottom: 5rem;
    border-radius: 36px;
  }

@@ -199,12 +192,10 @@ export default {

  .undergraduate {
    border-radius: 36px 0 0 0;
-
-    &_img {
+    &_img{
      width: 3.1rem;
      height: 3.3rem;
    }
-
    &_content {
      display: flex;
      margin-bottom: 1.5rem;
@@ -267,8 +258,7 @@ export default {

  .graduate {
    border-radius: 0 36px 0 0;
-
-    &_img {
+    &_img{
      width: 4.3rem;
      height: 3.3rem;
    }
--- a/src/views/mobile/index.vue
+++ b/src/views/mobile/index.vue
@@ -233,7 +233,7 @@ export default {
          pageSize: 5
        }
        this.listDataType = 0
-        if (this.type === 4 || menu.isSimple == 1) {
+        if (this.type === 4||menu.isSimple == 1) {
          data.pageSize = 20
          this.listDataType = 1
        }
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,21 +29,21 @@ module.exports = {
  productionSourceMap: true,
  // webpack-dev-server 相关配置
  devServer: {
-    host: '0.0.0.0',
-    // port: port,
-    port: 8080,
-    open: true,
-    proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: `https://sist.swjtu.edu.cn/`,
-        // target: `http://hchyunapi.tomey.live`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: '/dev-api'
-        }
-      }
-    },
+  //   host: '0.0.0.0',
+  //   // port: port,
+  //   port: 8080,
+  //   open: true,
+  //   proxy: {
+  //     // detail: https://cli.vuejs.org/config/#devserver-proxy
+  //     [process.env.VUE_APP_BASE_API]: {
+  //       target: `http://localhost:8085`,
+  //       // target: `http://hchyunapi.tomey.live`,
+  //       changeOrigin: true,
+  //       pathRewrite: {
+  //         ['^' + process.env.VUE_APP_BASE_API]: ''
+  //       }
+  //     }
+  //   },
    disableHostCheck: true
  },
  // 强制内联CSS