调整中英文切换

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.js

@@ -1,6 +1,7 @@
 import enLocale from 'element-ui/lib/locale/lang/en'
 export default {
   "lang": "English",
+  workingHoursHousekeeper: 'TimeSheet', // 工时管家 // TimeSheet Manager
   // 导航
   navigation: {
     reports: 'hours report', // 工时报告

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.js

@@ -1,6 +1,7 @@
 import zhLocale from 'element-ui/lib/locale/lang/en'
 export default {
   "lang": "中文",
+  workingHoursHousekeeper: '工时管家',
   // 导航
   navigation: {
     reports: "工时报告",

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -5,7 +5,7 @@
                 <img v-if="collapsed" class="headImg" src="../assets/image/head_logo.png" />
                 <div v-else class="logo-sys">
                     <img class="headImg" src="../assets/image/head_logo.png" />
-                    <span>{{sysName}}</span>
+                    <span>{{$t('workingHoursHousekeeper')}}</span>
                 </div>
             </el-col>
             <el-col :span="4">
@@ -17,7 +17,7 @@
 
             <el-col :span="10" class="userinfo">
                 <!-- 中英文切换入口 -->
-                <!-- <el-dropdown trigger="click" @command="langChange" style="margin-right:30px;">
+                <el-dropdown trigger="click" @command="langChange" style="margin-right:30px;">
                     <span class="el-dropdown-link userinfo-inner">
                         {{language}} <i class="el-icon-caret-bottom"></i>
                     </span>
@@ -25,7 +25,7 @@
                         <el-dropdown-item divided  command="zh">中文</el-dropdown-item>
                         <el-dropdown-item divided  command="en">English</el-dropdown-item>
                     </el-dropdown-menu>
-                </el-dropdown> -->
+                </el-dropdown>
 
                 <el-dropdown trigger="hover" style="margin-right:30px;">
                     <span class="el-dropdown-link userinfo-inner">
@@ -91,15 +91,17 @@
                         <el-submenu :index="index+''" v-if="!item.leaf">
                             <template slot="title">
                                 <i :class="item.iconCls"></i>
-                                <span class="itemName">{{item.name}}</span>
-                                <!-- <span class="itemName">{{$t(item.meta.text)}}</span> -->
+                                <!-- <span class="itemName">{{item.name}}</span> -->
+                                <span class="itemName">{{$t(item.meta.text)}}</span>
                             </template>
                             <el-menu-item v-for="child in item.children" :index="child.path" :key="child.path" v-if="!child.hidden"><i :class="child.iconCls"></i>{{child.name}}</el-menu-item>
                         </el-submenu>
                         <el-menu-item v-if="item.leaf && item.children.length > 0" :index="item.children[0].path">
                             <i :class="item.iconCls"></i> 
-                            {{item.children[0].name}}
-                            <!-- {{$t(item.meta.text)}} -->
+                            <!-- {{item.children[0].name}} -->
+                            {{$t(item.meta.text)}}
+                            <!-- {{$t('navigation.reports')}} -->
+                            <!-- this.$t('navigation.reports')  // js-->
                         </el-menu-item>
                     </template>
                 </el-menu>
@@ -183,7 +185,6 @@
                 roleArray:["普通员工","超级管理员", "系统管理员", "公司高层","财务管理员", "项目管理员","公司领导"],
                 helpImg: '../assets/image/userHead.png',
                 user: sessionStorage.getItem("user"),
-                sysName: "工时管家",
                 collapsed: sessionStorage.collapsed!=null?(sessionStorage.collapsed=='true'?true:false):false,
                 sysUserName: "",
                 menu: [],
@@ -540,9 +541,10 @@
                     span {
                         display: inline-block;
                         height: 100%;
-                        line-height: 100%;
+                        line-height: 60px;
                         margin-left: 15px;
-                        margin: 20px 0 0 15px;
+                        font-size: 18px;
+                        // margin: 20px 0 0 15px;
                         vertical-align: middle;
                     }
                 }