clay commit : header icon

src/i18n/langs/cn.js

@@ -30,9 +30,11 @@ const cn = {
     'number_students': '在校学生人数',
     'graduate_tutor': '研究生导师',
     'research_team': '科研团队',
-    'high_level_talents': '高层次人才',
+    'high_level_talents': '省部级以上高层次人才',
-    'major_projects': '重大项目',
+    'major_projects': '国家级重大项目',
     'contact_us': '联系我们',
+    'person': '人',
+    'pics': '个',
     'adress': '犀浦校区地址:中国四川省成都市高新区西部园区西南交通大学信息科学与技术学院',
     'code': '邮政编码:611756',
     'tel': '电话:+86 28 66366709(行政)',

src/i18n/langs/en.js

@@ -24,13 +24,15 @@ const en = {
     'scientific': 'Scientific',
     'undergraduate_education': 'Undergraduate education',
     'postgraduate_education': 'Postgraduate education',
-    'employees': 'Employees',
+    'employees': 'Faculty Members',
-    'number_students': 'Number of students',
+    'number_students': 'Internal Students',
-    'graduate_tutor': 'Graduate tutor',
+    'graduate_tutor': 'Tutors',
-    'research_team': 'Research team',
+    'research_team': 'Scientific Research Team',
-    'high_level_talents': 'High level talents',
+    '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',

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)
       }
     }

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)
       }
     }

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-if="login_blue && $i18n.locale  == 'cn'"><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-if="!login_blue && $i18n.locale  == 'cn'"><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-if="login_blue && $i18n.locale  == 'en'"><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  == 'en'"><img src="@/assets/header/enzl.png" alt=""></div>
             </div>
           </el-col>
         </div>

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">
+            <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'">
-                <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"
+              <template slot="title" v-if="item.children.length > 0 && $i18n.locale  === 'en'">{{ item.englishTitle }}</template>
-                        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  === 'cn'&&(chile.displayType == 1 || chile.displayType == 3)">{{ chile.title }}</span>
-                <span v-if="$i18n.locale  === 'en'">{{ chile.englishTitle }}</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)">
+            <el-menu-item v-if="!item.children.length>0 && (item.displayType != 4)" :key="itemIndex" :index="menuIndex +'-'+itemIndex"
-              <span v-if="$i18n.locale  === 'cn'">{{ item.title }}</span>
+                          @click="clickSecondMenu(item)">
-              <span v-if="$i18n.locale  === 'en'">{{ item.englishTitle }}</span>
+              <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>

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>

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() {