From 9366b9c4bd50f7670d32c72ea07ffc0639347e4c Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 9 Oct 2022 23:51:52 +0800
Subject: [PATCH] clay commit : header icon

---
 src/i18n/langs/cn.js                          |  6 +++--
 src/i18n/langs/en.js                          | 12 +++++----
 src/views/content/components/dire_data.vue    |  2 +-
 .../content/components/dire_data_tow.vue      |  2 +-
 src/views/header/index.vue                    |  8 +++---
 src/views/header/mobile_herder.vue            | 27 +++++++------------
 src/views/index/components/bottom.vue         | 12 ++++-----
 src/views/index/components/slideshow_card.vue |  2 +-
 8 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index c6bb259..31af9f5 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -30,9 +30,11 @@ const cn = {
     'number_students': '在校学生人数',
     'graduate_tutor': '研究生导师',
     'research_team': '科研团队',
-    'high_level_talents': '高层次人才',
-    'major_projects': '重大项目',
+    'high_level_talents': '省部级以上高层次人才',
+    'major_projects': '国家级重大项目',
     'contact_us': '联系我们',
+    'person': '人',
+    'pics': '个',
     'adress': '犀浦校区地址:中国四川省成都市高新区西部园区西南交通大学信息科学与技术学院',
     'code': '邮政编码:611756',
     'tel': '电话:+86 28 66366709(行政)',
diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js
index 4769a34..1402de4 100644
--- a/src/i18n/langs/en.js
+++ b/src/i18n/langs/en.js
@@ -24,13 +24,15 @@ const en = {
     'scientific': 'Scientific',
     'undergraduate_education': 'Undergraduate education',
     'postgraduate_education': 'Postgraduate education',
-    'employees': 'Employees',
-    'number_students': 'Number of students',
-    'graduate_tutor': 'Graduate tutor',
-    'research_team': 'Research team',
-    'high_level_talents': 'High level talents',
+    'employees': 'Faculty Members',
+    'number_students': 'Internal Students',
+    'graduate_tutor': 'Tutors',
+    'research_team': 'Scientific Research Team',
+    'high_level_talents': 'Outstanding Talents',
     'major_projects': 'Major projects',
     'contact_us': 'CONTACT US',
+    'person': '',
+    'pics': '',
     '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',
diff --git a/src/views/content/components/dire_data.vue b/src/views/content/components/dire_data.vue
index 94c288c..9624c88 100644
--- a/src/views/content/components/dire_data.vue
+++ b/src/views/content/components/dire_data.vue
@@ -57,7 +57,7 @@ export default {
   },
   methods:{
     linkClick(chile){
-      if (chile.link){
+      if (chile.link!=null && chile.link != ""){
         window.open(chile.link)
       }
     }
diff --git a/src/views/content/components/dire_data_tow.vue b/src/views/content/components/dire_data_tow.vue
index c564fcf..ee99437 100644
--- a/src/views/content/components/dire_data_tow.vue
+++ b/src/views/content/components/dire_data_tow.vue
@@ -53,7 +53,7 @@ export default {
   },
   methods:{
     linkClick(chile){
-      if (chile.link){
+      if (chile.link!=null && chile.link != ""){
         window.open(chile.link)
       }
     }
diff --git a/src/views/header/index.vue b/src/views/header/index.vue
index 00f6bde..0caa2eb 100644
--- a/src/views/header/index.vue
+++ b/src/views/header/index.vue
@@ -61,10 +61,10 @@
             </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-show="en_logo_blue"><img src="@/assets/header/en.png" alt=""></div>
-              <div class="iconfont" @click="switchLang" v-show="en_login_white"><img src="@/assets/header/en1.png" alt=""></div>
-              <div class="iconfont" @click="switchLang" v-show="ch_logo_blue"><img src="@/assets/header/enz.png" alt=""></div>
-              <div class="iconfont" @click="switchLang" v-show="ch_logo_white"><img src="@/assets/header/enzl.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>
           </el-col>
         </div>
diff --git a/src/views/header/mobile_herder.vue b/src/views/header/mobile_herder.vue
index 1b87f2d..bbb547e 100644
--- a/src/views/header/mobile_herder.vue
+++ b/src/views/header/mobile_herder.vue
@@ -35,31 +35,22 @@
           </template>
 
           <span v-for="(item,itemIndex) in menu.children" :key="itemIndex">
-            <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>
-
+            <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>
+              <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.title }}</span>
-                <span v-if="$i18n.locale  === 'en'">{{ chile.englishTitle }}</span>
+                <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>
               </el-menu-item>
             </el-submenu>
-            <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 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>
           </span>
-
-
         </el-submenu>
       </el-menu>
     </el-drawer>
diff --git a/src/views/index/components/bottom.vue b/src/views/index/components/bottom.vue
index 886f84f..278091d 100644
--- 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}}</div>
+                  <div class="table_tr_right">{{data.worker}}{{$t('message.person')}}</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}}</div>
+                  <div class="table_tr_right">{{data.students}}{{$t('message.person')}}</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}}</div>
+                  <div class="table_tr_right">{{data.postgraduateTutor}}{{$t('message.person')}}</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}}</div>
+                  <div class="table_tr_right">{{data.scientificTeam}}{{$t('message.pics')}}</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}}</div>
+                  <div class="table_tr_right">{{data.highLevelTalents}}{{$t('message.person')}}</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}}</div>
+                  <div class="table_tr_right">{{data.majorProjects}}{{$t('message.pics')}}</div>
                 </div>
               </td>
             </tr>
diff --git a/src/views/index/components/slideshow_card.vue b/src/views/index/components/slideshow_card.vue
index 7a0b59a..c47cd4b 100644
--- a/src/views/index/components/slideshow_card.vue
+++ b/src/views/index/components/slideshow_card.vue
@@ -104,7 +104,7 @@ export default {
     },
 // 定时器自动切换
     timer() {
-      this.time = setInterval(this.leftMove.bind(this), 1000);
+      this.time = setInterval(this.leftMove.bind(this), 2000);
     },
 // 鼠标移入移出事件
     listenMouseEvent() {