diff --git a/language/original-web.txt b/language/original-web.txt index 3c00a85c2..843886bd0 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1349,3 +1349,13 @@ AI机器人 汇报人 提交时间 + +去聊天 +我是一个人工智能助手，为用户提供问题解答和指导。我没有具体的身份，只是一个程序。您有什么问题可以问我哦？ +我是Claude,一个由Anthropic公司创造出来的AI助手机器人。我的工作是帮助人类,与人对话并给出解答。 +我是文心一言，英文名是ERNIE Bot。我能够与人对话互动，回答问题，协助创作，高效便捷地帮助人们获取信息、知识和灵感。 +我是达摩院自主研发的超大规模语言模型，能够回答问题、创作文字，还能表达观点、撰写代码。 +机器人暂未开启 +创建一个全新的会议视频会议，与会者可以在实时中进行面对面的视听交流。通过视频会议平台，参与者可以分享屏幕、共享文档，并与其他与会人员进行讨论和协。 +加入视频会议，参与已经创建的会议，在会议过程中与其他参会人员进行远程实时视听交流和协作。 +新会议 \ No newline at end of file diff --git a/public/images/apply/joinMeeting.svg b/public/images/apply/joinMeeting.svg new file mode 100644 index 000000000..28b8a98ff --- /dev/null +++ b/public/images/apply/joinMeeting.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue index 6fc8fc20e..796924dad 100644 --- a/resources/assets/js/components/Mobile/Tabbar.vue +++ b/resources/assets/js/components/Mobile/Tabbar.vue @@ -68,7 +68,8 @@ export default { {icon: '', name: 'project', label: '项目'}, {icon: '', name: 'dialog', label: '消息'}, {icon: '', name: 'contacts', label: '通讯录'}, - {icon: '', name: 'more', label: '更多'}, + {icon: '', name: 'apply', label: '应用'}, + // {icon: '', name: 'more', label: '更多'}, ], navMore: [ [ @@ -200,8 +201,9 @@ export default { }, activeName() { - if (this.isMore || ['manage-calendar', 'manage-file', 'manage-setting'].includes(this.routeName)) { - return 'more'; + if (this.isMore || ['manage-calendar', 'manage-file', 'manage-setting', 'manage-apply', 'manage-approve'].includes(this.routeName)) { + // return 'more'; + return 'apply'; } if (this.routeName === 'manage-dashboard') { diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 93f2765c6..f8c5749a7 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -11,8 +11,7 @@ {{userInfo.nickname}} - - +
@@ -57,18 +56,11 @@
{{$L(item.name)}} - - +
{{$L('团队管理')}} - -
- {{$L('工作报告')}} - -
- {{$L('导出任务统计')}} {{$L('导出超期任务')}} {{$L('导出审批数据')}} @@ -205,7 +197,7 @@
- +
@@ -569,12 +561,10 @@ export default { {path: 'archivedProject', name: '已归档的项目'}, {path: 'team', name: '团队管理', divided: true}, - {path: 'approve', name: '审批中心'}, ]) } else { array.push(...[ {path: 'personal', name: '个人设置', divided: true}, - {path: 'approve', name: '审批中心'}, {path: 'version', name: '更新版本', divided: true, visible: !!this.clientNewVersion}, {path: 'workReport', name: '工作报告', divided: true}, @@ -630,7 +620,7 @@ export default { if (this.routeName === 'manage-project' && !/^\d+$/.test(this.$route.params.projectId)) { return true; } - return ['manage-dashboard', 'manage-calendar', 'manage-messenger', 'manage-file', 'manage-setting'].includes(this.routeName) + return ['manage-dashboard', 'manage-calendar', 'manage-messenger', 'manage-file', 'manage-setting', 'manage-approve', 'manage-apply'].includes(this.routeName) }, }, diff --git a/resources/assets/js/pages/manage/apply.vue b/resources/assets/js/pages/manage/apply.vue index 31f187534..33a87fecf 100644 --- a/resources/assets/js/pages/manage/apply.vue +++ b/resources/assets/js/pages/manage/apply.vue @@ -1,6 +1,6 @@ @@ -178,40 +176,55 @@ import SystemAibot from "./setting/components/SystemAibot"; import SystemCheckin from "./setting/components/SystemCheckin"; import Checkin from "./setting/checkin"; import SystemMeeting from "./setting/components/SystemMeeting"; -import {Store} from "le5le-store"; +import SystemThirdAccess from "./setting/components/SystemThirdAccess"; +import SystemEmailSetting from "./setting/components/SystemEmailSetting"; +import SystemAppPush from "./setting/components/SystemAppPush"; +import { Store } from "le5le-store"; export default { - components: { UserSelect, DrawerOverlay, Report, SystemAibot, SystemCheckin, Checkin, SystemMeeting }, + components: { + UserSelect, + DrawerOverlay, + Report, + SystemAibot, + SystemCheckin, + Checkin, + SystemMeeting, + SystemThirdAccess, + SystemEmailSetting, + SystemAppPush + }, data() { return { - applyList: [ - { value: "approve", label: "审批中心", src: "/images/apply/approve.svg" }, - { value: "report", label: "工作报告", src: "/images/apply/report.svg"}, - { value: "ai", label: "AI机器人", src: "/images/apply/robot.svg" }, - { value: "signIn", label: "签到", src: "/images/apply/signin.svg" }, - { value: "meeting", label: "会议", src: "/images/apply/meeting.svg" }, - { value: "ldap", label: "LDAP", src: "/images/apply/ldap.svg" }, - { value: "mail", label: "邮件", src: "/images/apply/mail.svg" }, - { value: "appPush", label: "APP推送", src: "/images/apply/apppush.svg" }, - ], - + applyList: [], + // workReportShow: false, 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('我是达摩院自主研发的超大规模语言模型，能够回答问题、创作文字，还能表达观点、撰写代码。') }, + ], aibotTabAction: "opanai", aibotShow: false, aibotType: 1, - + aibotDialogSearchLoad: "", + // signInShow: false, signType: 1, - + // meetingShow: false, meetingType: 1, - meetingAddData: { - userids: [], - tracks: ['audio'] - }, - meetingLoadIng: 0 + // + ldapShow: false, + // + mailType: 1, + mailShow: false, + // + appPushType: 1, + appPushShow: false, } }, @@ -219,18 +232,46 @@ export default { }, mounted() { + }, activated() { + this.applyList = [ + { value: "approve", label: "审批中心", src: $A.apiUrl('../images/apply/approve.svg') }, + { value: "report", label: "工作报告", src: $A.apiUrl('../images/apply/report.svg') }, + { value: "ai", label: "AI机器人", src: $A.apiUrl('../images/apply/robot.svg') }, + { value: "signIn", label: "签到", src: $A.apiUrl('../images/apply/signin.svg') }, + { value: "meeting", label: "会议", src: $A.apiUrl('../images/apply/meeting.svg') }, + { value: "ldap", label: "LDAP", src: $A.apiUrl('../images/apply/ldap.svg'), isAdmin: true }, + { value: "mail", label: "邮件", src: $A.apiUrl('../images/apply/mail.svg'), isAdmin: true }, + { value: "appPush", label: "APP推送", src: $A.apiUrl('../images/apply/apppush.svg'), isAdmin: true } + ]; + if (this.windowOrientation == 'portrait') { + this.applyList.push({ value: "calendar", label: "日历", src: $A.apiUrl('../images/apply/apppush.svg') }) + this.applyList.push({ value: "file", label: "文件", src: $A.apiUrl('../images/apply/apppush.svg') }) + this.applyList.push({ value: "addProject", label: "创建项目", src: $A.apiUrl('../images/apply/apppush.svg') }) + this.applyList.push({ value: "addTask", label: "添加任务", src: $A.apiUrl('../images/apply/apppush.svg') }) + if ($A.isEEUiApp) { + this.applyList.push({ value: "scan", label: "扫一扫", src: $A.apiUrl('../images/apply/apppush.svg') }) + } + if (this.userIsAdmin) { + this.applyList.push({ value: "allUser", label: "团队管理", src: $A.apiUrl('../images/apply/apppush.svg') }) + } + this.applyList.push({ value: "setting", label: "设置", src: $A.apiUrl('../images/apply/apppush.svg') }) + } }, computed: { ...mapState([ 'userInfo', 'userIsAdmin', - + 'reportUnreadNumber', 'approveUnreadNumber', + + 'cacheDialogs', + + 'windowOrientation', ]), }, @@ -241,9 +282,13 @@ export default { methods: { applyClick(item) { + this.$emit("on-click", item.value) switch (item.value) { case 'approve': - this.goForward({name: 'manage-approve'}); + case 'calendar': + case 'file': + case 'setting': + this.goForward({ name: 'manage-' + item.value }); break; case 'report': this.workReportShow = true; @@ -254,14 +299,70 @@ export default { this.aibotShow = true; break; case 'signIn': + this.signInType = 1; this.signInShow = true; break; case 'meeting': + this.meetingType = 1; this.meetingShow = true; break; + case 'ldap': + this.ldapShow = true; + break; + case 'mail': + this.mailType = 1; + this.mailShow = true; + break; + case 'appPush': + this.appPushType = 1; + this.appPushShow = true; + break; } }, - onAddMenu(name) { + // 去聊天 + onGoToChat(type) { + let dialogId = 0; + let email = `ai-${type}@bot.system`; + this.cacheDialogs.map(h => { + if (h.email == email) { + dialogId = h.id; + } + }) + if (dialogId) { + if (this.windowOrientation == 'portrait') { + this.$store.dispatch("openDialog", dialogId) + } else { + this.goForward({ name: 'manage-messenger', params: { dialog_id: dialogId } }); + } + this.aibotShow = false; + } else { + this.aibotDialogSearchLoad = type; + this.$store.dispatch("call", { + url: 'dialog/search', + data: { key: email }, + }).then(({ data }) => { + if (data?.length < 1) { + $A.messageError('机器人暂未开启'); + this.aibotDialogSearchLoad = ''; + return; + } + this.$store.dispatch("openDialogUserid", data[0]?.dialog_user.userid).then(_ => { + if (this.windowOrientation != 'portrait') { + this.goForward({ name: 'manage-messenger' }) + } + this.aibotShow = false; + }).catch(({ msg }) => { + $A.modalError(msg) + }).finally(_ => { + this.aibotDialogSearchLoad = ''; + }); + }).catch(_ => { + this.aibotDialogSearchLoad = ''; + }); + } + }, + // 会议 + onMeeting(name) { switch (name) { case 'createMeeting': Store.set('addMeeting', { @@ -276,9 +377,6 @@ export default { break; } this.meetingShow = false; - }, - onMeetingSubmit(){ - } } } diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue index 517cb3e71..c21d40b8b 100644 --- a/resources/assets/js/pages/manage/approve/index.vue +++ b/resources/assets/js/pages/manage/approve/index.vue @@ -7,10 +7,13 @@

{{$L('审批中心')}}

- + +
- - + +
@@ -132,6 +135,8 @@ + +
@@ -214,13 +219,16 @@ import list from "./list.vue"; import listDetails from "./details.vue"; import DrawerOverlay from "../../../components/DrawerOverlay"; import ImgUpload from "../../../components/ImgUpload"; +import ApproveSetting from "./setting"; + import {mapState} from 'vuex' export default { - components:{list,listDetails,DrawerOverlay,ImgUpload}, + components:{list,listDetails,DrawerOverlay,ImgUpload,ApproveSetting}, name: "approve", data() { return { + showType: 1, modalTransferIndex: window.modalTransferIndex, minDate: new Date(2020, 0, 1), @@ -340,6 +348,11 @@ export default { if(!val){ this.addData.other = "" } + }, + showType(val){ + if(val == 1){ + this.tabsClick() + } } }, mounted() { @@ -682,6 +695,9 @@ export default { }); } }); + }, + workflowSetting() { + console.log(1) } } } diff --git a/resources/assets/js/pages/manage/setting/approve.vue b/resources/assets/js/pages/manage/approve/setting.vue similarity index 91% rename from resources/assets/js/pages/manage/setting/approve.vue rename to resources/assets/js/pages/manage/approve/setting.vue index 2e01964e2..293801983 100644 --- a/resources/assets/js/pages/manage/setting/approve.vue +++ b/resources/assets/js/pages/manage/approve/setting.vue @@ -1,18 +1,18 @@ @@ -36,20 +18,9 @@ import SystemSetting from "./components/SystemSetting"; import SystemTaskPriority from "./components/SystemTaskPriority"; import SystemColumnTemplate from "./components/SystemColumnTemplate"; -import SystemEmailSetting from "./components/SystemEmailSetting"; -import SystemAppPush from "./components/SystemAppPush"; -import SystemMeeting from "./components/SystemMeeting"; -import SystemCheckin from "./components/SystemCheckin"; -import SystemThirdAccess from "./components/SystemThirdAccess"; -import SystemAibot from "./components/SystemAibot.vue"; export default { - components: { - SystemAibot, - SystemThirdAccess, - SystemCheckin, - SystemMeeting, - SystemAppPush, SystemColumnTemplate, SystemTaskPriority, SystemSetting, SystemEmailSetting}, + components: {SystemColumnTemplate, SystemTaskPriority, SystemSetting}, data() { return { tabAction: 'setting', diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js index c2b89d974..5c8739231 100755 --- a/resources/assets/js/routes.js +++ b/resources/assets/js/routes.js @@ -54,11 +54,6 @@ export default [ path: 'checkin', component: () => import('./pages/manage/setting/checkin.vue'), }, - { - name: 'manage-setting-approve', - path: 'approve', - component: () => import('./pages/manage/setting/approve.vue'), - }, { name: 'manage-setting-language', path: 'language', diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss index 5dfc61f5b..5953d901d 100644 --- a/resources/assets/sass/pages/page-apply.scss +++ b/resources/assets/sass/pages/page-apply.scss @@ -3,6 +3,7 @@ height: 100%; display: flex; flex-direction: column; + .apply-wrapper { flex: 1; height: 0; @@ -10,29 +11,35 @@ flex-direction: column; position: relative; background-color: #fafafa; + .apply-head { display: flex; align-items: center; padding-bottom: 16px; margin: 32px 32px 0 32px; border-bottom: 1px solid #F4F4F5; + .apply-nav { flex: 1; display: flex; align-items: center; - > h1 { + + >h1 { color: $primary-title-color; font-size: 28px; font-weight: 600; } } } - .apply-row{ + + .apply-row { flex: 1; padding: 16px 30px; - .apply-col{ + + .apply-col { margin-bottom: 16px; - >div{ + + >div { font-size: 12px; font-weight: bold; background: #ffffff; @@ -44,12 +51,23 @@ gap: 10px; cursor: pointer; position: relative; - border: 1px solid #ececec; - >img{ + border: 1px solid #f1f1f1; + + @media (max-width: 510px) { + display: block; + text-align: center; + } + + >img { width: 40px; height: 40px; + + @media (max-width: 510px) { + margin-bottom: 5px; + } } - .manage-box-top-report{ + + .manage-box-top-report { position: absolute; right: -6px; top: -6px; @@ -60,29 +78,37 @@ } } -.ivu-modal-wrap-apply{ +.ivu-modal-wrap-apply { position: relative; - overflow: auto; + overflow: auto; height: 100%; display: flex; flex-direction: column; - .ivu-modal-wrap-apply-title{ + max-width: calc(100vw - 40px); + overflow: auto; + + .ivu-modal-wrap-apply-title { line-height: 40px; font-size: 20px; font-weight: 500; padding: 12px 30px; - >p{ + + >p { float: right; cursor: pointer; color: #2b85e4; font-size: 14px; } } - .ivu-modal-wrap-apply-body{ + + .ivu-modal-wrap-apply-body { position: relative; flex: 1; padding: 8px 30px; - .setting-component-item,.setting-item{ + + // + .setting-component-item, + .setting-item { position: absolute; top: 0; left: 0; @@ -91,29 +117,34 @@ flex: 1; display: flex; flex-direction: column; - >.ivu-form{ + + >.ivu-form { padding: 8px 30px; overflow: auto; flex: 1; - .ivu-form-item{ - padding: 12px 0 0 0; - .ivu-form-item .ivu-form-item-content{ - display: flex; - >.ivu-form{ - margin-bottom: 8px; + .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{ + + .block-setting-box { position: relative; padding: 24px 24px 4px; margin: 24px 0 12px; border-radius: 8px; border: 1px solid #eeeeee; transition: box-shadow 0.3s; - h3{ + + h3 { position: absolute; top: 0; left: 24px; @@ -127,17 +158,21 @@ transform: translateY(-50%) } } - .setting-template{ + + .setting-template { margin-bottom: 12px; - >div{ + + >div { padding-right: 12px; } } - .export-data > p { + + .export-data>p { cursor: pointer; color: #2b85e4; } - .setting-footer{ + + .setting-footer { flex-shrink: 0; position: static; padding: 16px; @@ -148,36 +183,47 @@ } } - .ivu-tabs-content{ - flex: 1; + // + .ivu-tabs { + display: flex; + flex-direction: column; + height: 100%; + + .ivu-tabs-content { + height: 100%; + flex: 1; + } } - // 机器人 - .aibot-ul { + // + .ivu-modal-wrap-ul { list-style-type: none; overflow: hidden; border-radius: 3px; margin-right: -10px; - li{ + + li { float: left; width: calc(50% - 10px); border: 1px solid #eeeeee; box-sizing: border-box; - padding: 28px; + padding: 28px 20px; position: relative; text-align: center; margin-right: 10px; margin-bottom: 10px; border-radius: 5px; cursor: pointer; - img{ + + img { display: block; width: 50px; height: 50px; border-radius: 16px; margin: 0 auto 12px; } - h4{ + + h4 { word-break: break-all; text-overflow: ellipsis; white-space: nowrap; @@ -192,21 +238,46 @@ padding: 0 12px; margin-bottom: 6px; } - p{ + + p { overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 4; + @media (max-width: 510px) { + -webkit-line-clamp: 2; + } } - .btn{ + + .btn { color: #2b85e4; margin: 26px auto 0; cursor: pointer; } + + .load { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: #9797971c; + line-height: 300px; + } } } - - } -} + // 机器人 + .aibot-warp { + position: relative; + height: 100%; + + .ivu-form { + padding: 0; + overflow: hidden; + } + } + + } +} \ No newline at end of file diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss index 9ece80480..0500b3a5c 100644 --- a/resources/assets/sass/pages/page-approve.scss +++ b/resources/assets/sass/pages/page-approve.scss @@ -18,6 +18,7 @@ margin: 32px 20px 16px; margin-bottom: 5px; border-bottom: 1px solid #F4F4F5; + gap: 10px; .approve-nav { flex: 1; @@ -374,3 +375,86 @@ } } } + + +.page-approve-setting{ + + .approve-row { + padding: 24px; + overflow: auto; + margin: 0 !important; + + .ivu-col { + margin-bottom: 16px; + + .approve-col-box { + border-radius: 8px; + border: 1px solid #eeeeee; + transition: box-shadow 0.3s; + cursor: pointer; + + &:hover { + box-shadow: 0 0 10px #e6ecfa; + } + } + + .approve-col-add { + height: 100%; + font-size: 48px; + display: flex; + justify-content: center; + align-items: center; + color: #ededed; + min-height: 95px; + } + + .approve-col-for { + padding: 16px; + padding-bottom: 13px; + display: flex; + flex-direction: column; + + .approve-name{ + font-weight: 500; + color: #135de6; + } + + .divider{ + margin: 12px 0; + margin-bottom: 9px; + } + + .icon-warp{ + position: relative; + } + + > p { + display: flex; + align-items: center; + } + + .approve-button-box { + display: flex; + justify-content: space-between; + align-items: center; + + > p { + display: flex; + align-items: center; + + > i { + font-size: 16px; + margin-left: 8px; + color: rgb(96, 98, 102); + } + } + } + } + } + } +} + +// +.window-portrait .page-approve .approve-mains { + height: calc(100vh - 250px); +} \ No newline at end of file diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss index fcdf1ed7f..9ee0b6c7f 100755 --- a/resources/assets/sass/pages/page-setting.scss +++ b/resources/assets/sass/pages/page-setting.scss @@ -349,65 +349,6 @@ .setting-button { margin-left: 8px; } - - .approve-row { - padding: 24px 40px; - overflow: auto; - - .ivu-col { - margin-bottom: 8px; - - .approve-col-box { - border-radius: 8px; - border: 1px solid #eeeeee; - transition: box-shadow 0.3s; - cursor: pointer; - - &:hover { - box-shadow: 0 0 10px #e6ecfa; - } - } - - .approve-col-add { - height: 100%; - font-size: 48px; - display: flex; - justify-content: center; - align-items: center; - color: #ededed; - min-height: 95px; - } - - .approve-col-for { - padding: 16px; - padding-bottom: 13px; - display: flex; - flex-direction: column; - - > p { - display: flex; - align-items: center; - } - - .approve-button-box { - display: flex; - justify-content: space-between; - align-items: center; - - > p { - display: flex; - align-items: center; - - > i { - font-size: 16px; - margin-left: 8px; - color: rgb(96, 98, 102); - } - } - } - } - } - } } } } diff --git a/resources/assets/statics/public/images/apply/createMeeting.svg b/resources/assets/statics/public/images/apply/createMeeting.svg new file mode 100644 index 000000000..c1d209e64 --- /dev/null +++ b/resources/assets/statics/public/images/apply/createMeeting.svg @@ -0,0 +1 @@ + \ No newline at end of file