diff --git a/language/original-web.txt b/language/original-web.txt index 843886bd0..5cd55cd07 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1350,7 +1350,11 @@ AI机器人 汇报人 提交时间 +应用 +机器人设置 去聊天 +返回 +会议设置 我是一个人工智能助手，为用户提供问题解答和指导。我没有具体的身份，只是一个程序。您有什么问题可以问我哦？ 我是Claude,一个由Anthropic公司创造出来的AI助手机器人。我的工作是帮助人类,与人对话并给出解答。 我是文心一言，英文名是ERNIE Bot。我能够与人对话互动，回答问题，协助创作，高效便捷地帮助人们获取信息、知识和灵感。 @@ -1358,4 +1362,8 @@ AI机器人 机器人暂未开启 创建一个全新的会议视频会议，与会者可以在实时中进行面对面的视听交流。通过视频会议平台，参与者可以分享屏幕、共享文档，并与其他与会人员进行讨论和协。 加入视频会议，参与已经创建的会议，在会议过程中与其他参会人员进行远程实时视听交流和协作。 -新会议 \ No newline at end of file +新会议 +新建会议 +LDAP设置 +邮件管理 +APP推送 \ No newline at end of file diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue index 796924dad..669cd92c0 100644 --- a/resources/assets/js/components/Mobile/Tabbar.vue +++ b/resources/assets/js/components/Mobile/Tabbar.vue @@ -12,7 +12,7 @@
{{$L(item.label)}}
- +
@@ -30,6 +30,9 @@ + @@ -113,7 +116,7 @@ export default { }, computed: { - ...mapState(['userIsAdmin', 'cacheDialogs', 'reportUnreadNumber']), + ...mapState(['userIsAdmin', 'cacheDialogs', 'reportUnreadNumber', 'approveUnreadNumber']), ...mapGetters(['dashboardTask']), routeName() { diff --git a/resources/assets/js/pages/manage/apply.vue b/resources/assets/js/pages/manage/apply.vue index 33a87fecf..5f928c69f 100644 --- a/resources/assets/js/pages/manage/apply.vue +++ b/resources/assets/js/pages/manage/apply.vue @@ -202,10 +202,30 @@ export default { workReportTabs: "my", // aibotList: [ - { value: "openai", label: "ChatGPT", src: $A.apiUrl('../images/avatar/default_openai.png'), desc: this.$L('我是一个人工智能助手，为用户提供问题解答和指导。我没有具体的身份，只是一个程序。您有什么问题可以问我哦？') }, - { value: "claude", label: "Claude", src: $A.apiUrl('../images/avatar/default_claude.png'), desc: this.$L('我是Claude,一个由Anthropic公司创造出来的AI助手机器人。我的工作是帮助人类,与人对话并给出解答。') }, - { value: "wenxin", label: "Wenxin", src: $A.apiUrl('../avatar/Wenxin.png'), desc: this.$L('我是文心一言，英文名是ERNIE Bot。我能够与人对话互动，回答问题，协助创作，高效便捷地帮助人们获取信息、知识和灵感。') }, - { value: "qianwen", label: "Qianwen", src: $A.apiUrl('../avatar/%E9%80%9A%E4%B9%89%E5%8D%83%E9%97%AE.png'), desc: this.$L('我是达摩院自主研发的超大规模语言模型，能够回答问题、创作文字，还能表达观点、撰写代码。') }, + { + value: "openai", + label: "ChatGPT", + src: $A.apiUrl('../images/avatar/default_openai.png'), + desc: this.$L('我是一个人工智能助手，为用户提供问题解答和指导。我没有具体的身份，只是一个程序。您有什么问题可以问我哦？') + }, + { + value: "claude", + label: "Claude", + src: $A.apiUrl('../images/avatar/default_claude.png'), + desc: this.$L('我是Claude,一个由Anthropic公司创造出来的AI助手机器人。我的工作是帮助人类,与人对话并给出解答。') + }, + { + value: "wenxin", + label: "Wenxin", + src: $A.apiUrl('../avatar/Wenxin.png'), + desc: this.$L('我是文心一言，英文名是ERNIE Bot。我能够与人对话互动，回答问题，协助创作，高效便捷地帮助人们获取信息、知识和灵感。') + }, + { + value: "qianwen", + label: "Qianwen", + src: $A.apiUrl('../avatar/%E9%80%9A%E4%B9%89%E5%8D%83%E9%97%AE.png'), + desc: this.$L('我是达摩院自主研发的超大规模语言模型，能够回答问题、创作文字，还能表达观点、撰写代码。') + }, ], aibotTabAction: "opanai", aibotShow: false, diff --git a/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue b/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue index fcad53f4f..0324786fb 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue @@ -21,7 +21,7 @@ type="timerange" format="HH:mm" :placeholder="$L('请选择签到时间')"/> -
+
diff --git a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue index 520046720..345f2ce34 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue @@ -43,7 +43,7 @@ {{ $L('开启') }} {{ $L('关闭') }} - +
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss index 5953d901d..a7130d647 100644 --- a/resources/assets/sass/pages/page-apply.scss +++ b/resources/assets/sass/pages/page-apply.scss @@ -125,16 +125,19 @@ .ivu-form-item { padding: 12px 0 0 0; - .ivu-form-item .ivu-form-item-content { display: flex; >.ivu-form { margin-bottom: 8px; + } } + } + } + .block-setting-box { position: relative; @@ -144,6 +147,30 @@ border: 1px solid #eeeeee; transition: box-shadow 0.3s; + @media (max-width: 420px) { + .block-setting-advance{ + >.ivu-form-item{ + display: flex; + flex-direction: column; + .ivu-form-item-label{ + text-align: left; + } + } + } + } + + @media (max-width: 460px) { + .block-setting-msg-unread{ + >.ivu-form-item{ + display: flex; + flex-direction: column; + .ivu-form-item-label{ + text-align: left; + } + } + } + } + h3 { position: absolute; top: 0;