国际化优化

resources/assets/js/main/components/UserView.vue

@@ -3,8 +3,8 @@
         <Tooltip :disabled="nickname === null" :delay="delay" :transfer="transfer" :placement="placement" @on-popper-show="popperShow">
             {{nickname || username}}
             <div slot="content">
-                <div>用户名：{{username}}</div>
-                <div>职位/职称：{{profession || '-'}}</div>
+                <div>{{$L('用户名')}}: {{username}}</div>
+                <div>{{$L('职位/职称')}}: {{profession || '-'}}</div>
             </div>
         </Tooltip>
     </div>

resources/assets/js/main/components/chat/Index.vue

@@ -18,7 +18,7 @@
         <!--对话列表-->
         <ul class="chat-user" :style="{display:chatTap=='dialog'?'flex':'none'}">
             <li class="sreach">
-                <Input placeholder="搜索" prefix="ios-search" v-model="dialogSearch"/>
+                <Input :placeholder="$L('搜索')" prefix="ios-search" v-model="dialogSearch"/>
             </li>
             <li class="lists">
                 <ul>
@@ -45,7 +45,7 @@
         <!--联系人列表-->
         <ul class="chat-team" :style="{display:chatTap=='team'?'flex':'none'}">
             <li class="sreach">
-                <Input placeholder="搜索" prefix="ios-search" v-model="teamSearch"/>
+                <Input :placeholder="$L('搜索')" prefix="ios-search" v-model="teamSearch"/>
             </li>
             <li class="lists">
                 <ul>
@@ -60,7 +60,7 @@
                     </li>
                     <li v-if="teamNoDataText==$L('数据加载中.....')" class="chat-none"><w-loading/></li>
                     <li v-else-if="Object.keys(teamLists).length == 0" class="chat-none">{{teamNoDataText}}</li>
-                    <li v-if="teamHasMorePages" class="chat-more" @click="getTeamLists(true)">加载更多...</li>
+                    <li v-if="teamHasMorePages" class="chat-more" @click="getTeamLists(true)">{{$L('加载更多...')}}</li>
                 </ul>
             </li>
         </ul>
@@ -72,22 +72,22 @@
                 <Dropdown class="manage-title-right" placement="bottom-end" trigger="click" @on-click="dialogDropdown" transfer>
                     <Icon type="ios-more"/>
                     <DropdownMenu slot="list">
-                        <DropdownItem name="delete">删除对话</DropdownItem>
-                        <DropdownItem name="clear">清除聊天记录</DropdownItem>
+                        <DropdownItem name="delete">{{$L('删除对话')}}</DropdownItem>
+                        <DropdownItem name="clear">{{$L('清除聊天记录')}}</DropdownItem>
                     </DropdownMenu>
                 </Dropdown>
             </div>
             <ScrollerY ref="manageLists" class="manage-lists" @on-scroll="messageListsScroll">
                 <div ref="manageBody" class="manage-body">
-                    <div v-if="messageHasMorePages" class="manage-more" @click="getDialogMessage(true)">加载更多...</div>
+                    <div v-if="messageHasMorePages" class="manage-more" @click="getDialogMessage(true)">{{$L('加载更多...')}}</div>
                     <div v-if="messageNoDataText==$L('数据加载中.....')" class="manage-more"><w-loading/></div>
                     <div v-else-if="messageNoDataText" class="manage-more">{{messageNoDataText}}</div>
                     <chat-message v-for="(info, index) in messageLists" :key="index" :info="info"></chat-message>
                 </div>
-                <div class="manage-lists-message-new" v-if="messageNew > 0" @click="messageBottomGo(true)">有{{messageNew}}条新消息</div>
+                <div class="manage-lists-message-new" v-if="messageNew > 0" @click="messageBottomGo(true)">{{$L('有%条新消息', messageNew)}}</div>
             </ScrollerY>
             <div class="manage-send" @click="clickDialog(dialogTarget.username)">
-                <textarea ref="textarea" class="manage-input" v-model="messageText" placeholder="请输入要发送的消息" @keydown="messageSend($event)"></textarea>
+                <textarea ref="textarea" class="manage-input" v-model="messageText" :placeholder="$L('请输入要发送的消息')" @keydown="messageSend($event)"></textarea>
             </div>
             <div class="manage-quick">
                 <emoji-picker @emoji="messageInsertText" :search="messageEmojiSearch">
@@ -96,7 +96,7 @@
                     </div>
                     <div slot="emoji-picker" slot-scope="{ emojis, insert, display }">
                         <div class="emoji-box">
-                            <Input class="emoji-input" placeholder="搜索" v-model="messageEmojiSearch" prefix="ios-search"/>
+                            <Input class="emoji-input" :placeholder="$L('搜索')" v-model="messageEmojiSearch" prefix="ios-search"/>
                             <div>
                                 <div v-for="(emojiGroup, category) in emojis" :key="category">
                                     <h5>{{ category }}</h5>
@@ -680,16 +680,16 @@
                         lasttext = data.text;
                         break;
                     case 'image':
-                        lasttext = '[图片]';
+                        lasttext = this.$L('[图片]');
                         break;
                     case 'taskB':
-                        lasttext = data.text + " [来自关注任务]";
+                        lasttext = data.text + " " + this.$L("[来自关注任务]"_;
                         break;
                     case 'report':
-                        lasttext = data.text + " [来自工作报告]";
+                        lasttext = data.text + " " + this.$L("[来自工作报告]");
                         break;
                     default:
-                        lasttext = '[未知类型]';
+                        lasttext = this.$L('[未知类型]');
                         break;
                 }
                 let plusUnread = msgDetail.sender != this.dialogTarget.username || !this.openWindow;
@@ -863,7 +863,7 @@
                                 this.addMessageData({
                                     id: tempId,
                                     type: 'notice',
-                                    notice: '历史消息',
+                                    notice: this.$L('历史消息'),
                                 }, false, isNextPage);
                             } else {
                                 tempLists = tempLists.reverse();
@@ -993,8 +993,8 @@
                     case 'clear':
                     case 'delete':
                         this.$Modal.confirm({
-                            title: '确认操作',
-                            content: type === 'delete' ? '你确定要删除此对话吗？' : '你确定要清除聊天记录吗？',
+                            title: this.$L('确认操作'),
+                            content: type === 'delete' ? this.$L('你确定要删除此对话吗？') : this.$L('你确定要清除聊天记录吗？'),
                             loading: true,
                             onOk: () => {
                                 let username = this.dialogTarget.username;
@@ -1088,7 +1088,7 @@
                         });
                         //
                         this.addDialog(Object.assign(this.dialogTarget, {
-                            lasttext: '[图片]',
+                            lasttext: this.$L('[图片]'),
                             lastdate: data.indate
                         }));
                         this.openDialog(this.dialogTarget);

resources/assets/js/main/components/chat/message.vue

@@ -1,7 +1,7 @@
 <template>
     <div :data-id="info.id">
 
-        <!--文本、任务-->
+        <!--文本、任务、报告-->
         <div v-if="info.type==='text' || info.type==='taskB' || info.type==='report'">
             <div v-if="info.self===true" class="list-right">
                 <div v-if="info.error" class="item-error" @click="clickError(info.error)">
@@ -16,10 +16,10 @@
                         <div class="item-text-view" v-html="textMsg(info.text)"></div>
                     </div>
                     <template v-if="info.type==='taskB'">
-                        <div v-if="info.other.type==='task'" class="item-link" @click="taskDetail(info.other.id)">来自关注任务:<a href="javascript:void(0)">{{info.other.title}}</a></div>
-                        <div v-if="info.other.type==='file'" class="item-link">来自关注任务:<a target="_blank" :href="fileDownUrl(info.other.id)">{{info.other.name}}</a></div>
+                        <div v-if="info.other.type==='task'" class="item-link" @click="taskDetail(info.other.id)">{{$L('来自关注任务')}}:<a href="javascript:void(0)">{{info.other.title}}</a></div>
+                        <div v-if="info.other.type==='file'" class="item-link">{{$L('来自关注任务')}}:<a target="_blank" :href="fileDownUrl(info.other.id)">{{info.other.name}}</a></div>
                     </template>
-                    <div v-else-if="info.type==='report'" class="item-link" @click="reportDetail(info.other.id, info.other.title)">来自工作报告:<a href="javascript:void(0)">{{info.other.title}}</a></div>
+                    <div v-else-if="info.type==='report'" class="item-link" @click="reportDetail(info.other.id, info.other.title)">{{$L('来自工作报告')}}:<a href="javascript:void(0)">{{info.other.title}}</a></div>
                 </div>
                 <img class="item-userimg" @click="clickUser" :src="info.userimg" onerror="this.src=window.location.origin+'/images/other/avatar.png'"/>
             </div>
@@ -35,10 +35,10 @@
                         <div class="item-text-view" v-html="textMsg(info.text)"></div>
                     </div>
                     <template v-if="info.type==='taskB'">
-                        <div v-if="info.other.type==='task'" class="item-link" @click="taskDetail(info.other.id)">来自关注任务:<a href="javascript:void(0)">{{info.other.title}}</a></div>
-                        <div v-if="info.other.type==='file'" class="item-link">来自关注任务:<a target="_blank" :href="fileDownUrl(info.other.id)">{{info.other.name}}</a></div>
+                        <div v-if="info.other.type==='task'" class="item-link" @click="taskDetail(info.other.id)">{{$L('来自关注任务')}}:<a href="javascript:void(0)">{{info.other.title}}</a></div>
+                        <div v-if="info.other.type==='file'" class="item-link">{{$L('来自关注任务')}}:<a target="_blank" :href="fileDownUrl(info.other.id)">{{info.other.name}}</a></div>
                     </template>
-                    <div v-else-if="info.type==='report'" class="item-link" @click="reportDetail(info.other.id, info.other.title)">来自工作报告:<a href="javascript:void(0)">{{info.other.title}}</a></div>
+                    <div v-else-if="info.type==='report'" class="item-link" @click="reportDetail(info.other.id, info.other.title)">{{$L('来自工作报告')}}:<a href="javascript:void(0)">{{info.other.title}}</a></div>
                 </div>
             </div>
         </div>
@@ -252,7 +252,7 @@
 
             clickError(err) {
                 this.$Modal.error({
-                    title: "错误详情",
+                    title: this.$L("错误详情"),
                     content: err
                 });
             },

resources/assets/js/main/components/report/add.vue

@@ -168,7 +168,7 @@
                                     username: userInfo.username,
                                     userimg: userInfo.userimg,
                                     indate: Math.round(new Date().getTime() / 1000),
-                                    text: this.dataDetail.ccuserAgain ? '修改了工作报告' : '发送了工作报告',
+                                    text: this.dataDetail.ccuserAgain ? this.$L('修改了工作报告') : this.$L('发送了工作报告'),
                                     other: {
                                         id: this.dataDetail.id,
                                         type: this.dataDetail.type,

resources/assets/js/main/components/report/my.vue

@@ -48,7 +48,6 @@
 <script>
     import DrawerTabsContainer from "../DrawerTabsContainer";
     import ReportAdd from "./add";
-    import ReportContent from "./content";
     import WDrawer from "../iview/WDrawer";
 
     /**
@@ -56,7 +55,7 @@
      */
     export default {
         name: 'ReportMy',
-        components: {WDrawer, ReportContent, ReportAdd, DrawerTabsContainer},
+        components: {WDrawer, ReportAdd, DrawerTabsContainer},
         props: {
             canload: {
                 type: Boolean,
@@ -282,7 +281,7 @@
                                     username: userInfo.username,
                                     userimg: userInfo.userimg,
                                     indate: Math.round(new Date().getTime() / 1000),
-                                    text: res.data.ccuserAgain ? '修改了工作报告' : '发送了工作报告',
+                                    text: res.data.ccuserAgain ? this.$L('修改了工作报告') : this.$L('发送了工作报告'),
                                     other: {
                                         id: res.data.id,
                                         type: res.data.type,