diff --git a/language/original-web.txt b/language/original-web.txt index 3c00a85c2..5cd55cd07 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1349,3 +1349,21 @@ AI机器人 汇报人 提交时间 + +应用 +机器人设置 +去聊天 +返回 +会议设置 +我是一个人工智能助手，为用户提供问题解答和指导。我没有具体的身份，只是一个程序。您有什么问题可以问我哦？ +我是Claude,一个由Anthropic公司创造出来的AI助手机器人。我的工作是帮助人类,与人对话并给出解答。 +我是文心一言，英文名是ERNIE Bot。我能够与人对话互动，回答问题，协助创作，高效便捷地帮助人们获取信息、知识和灵感。 +我是达摩院自主研发的超大规模语言模型，能够回答问题、创作文字，还能表达观点、撰写代码。 +机器人暂未开启 +创建一个全新的会议视频会议，与会者可以在实时中进行面对面的视听交流。通过视频会议平台，参与者可以分享屏幕、共享文档，并与其他与会人员进行讨论和协。 +加入视频会议，参与已经创建的会议，在会议过程中与其他参会人员进行远程实时视听交流和协作。 +新会议 +新建会议 +LDAP设置 +邮件管理 +APP推送 \ No newline at end of file diff --git a/public/images/apply/addProject.svg b/public/images/apply/addProject.svg new file mode 100644 index 000000000..3cf886bcd --- /dev/null +++ b/public/images/apply/addProject.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/public/images/apply/addTask.svg b/public/images/apply/addTask.svg new file mode 100644 index 000000000..090f1aa72 --- /dev/null +++ b/public/images/apply/addTask.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + diff --git a/public/images/apply/allUser.svg b/public/images/apply/allUser.svg new file mode 100644 index 000000000..3d145a93b --- /dev/null +++ b/public/images/apply/allUser.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/apply/apppush.svg b/public/images/apply/apppush.svg new file mode 100644 index 000000000..23d67cb70 --- /dev/null +++ b/public/images/apply/apppush.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/approve.svg b/public/images/apply/approve.svg new file mode 100644 index 000000000..43b11ce10 --- /dev/null +++ b/public/images/apply/approve.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/calendar.svg b/public/images/apply/calendar.svg new file mode 100644 index 000000000..5243eea5d --- /dev/null +++ b/public/images/apply/calendar.svg @@ -0,0 +1,19 @@ + + + + + + + diff --git a/public/images/apply/createMeeting.svg b/public/images/apply/createMeeting.svg new file mode 100644 index 000000000..c1d209e64 --- /dev/null +++ b/public/images/apply/createMeeting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/file.svg b/public/images/apply/file.svg new file mode 100644 index 000000000..800cfa2f8 --- /dev/null +++ b/public/images/apply/file.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/public/images/apply/joinMeeting.svg b/public/images/apply/joinMeeting.svg new file mode 100644 index 000000000..9ae39f7ae --- /dev/null +++ b/public/images/apply/joinMeeting.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/public/images/apply/ldap.svg b/public/images/apply/ldap.svg new file mode 100644 index 000000000..d4ac17dc0 --- /dev/null +++ b/public/images/apply/ldap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/mail.svg b/public/images/apply/mail.svg new file mode 100644 index 000000000..2ac06af37 --- /dev/null +++ b/public/images/apply/mail.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/meeting.svg b/public/images/apply/meeting.svg new file mode 100644 index 000000000..c1d209e64 --- /dev/null +++ b/public/images/apply/meeting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/report.svg b/public/images/apply/report.svg new file mode 100644 index 000000000..7ad49933c --- /dev/null +++ b/public/images/apply/report.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/robot.svg b/public/images/apply/robot.svg new file mode 100644 index 000000000..801356ba6 --- /dev/null +++ b/public/images/apply/robot.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/scan.svg b/public/images/apply/scan.svg new file mode 100644 index 000000000..f0ecc2c8c --- /dev/null +++ b/public/images/apply/scan.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/apply/setting.svg b/public/images/apply/setting.svg new file mode 100644 index 000000000..99a6c4942 --- /dev/null +++ b/public/images/apply/setting.svg @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/public/images/apply/signin.svg b/public/images/apply/signin.svg new file mode 100644 index 000000000..78caec255 --- /dev/null +++ b/public/images/apply/signin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/assets/js/components/DrawerOverlay/index.vue b/resources/assets/js/components/DrawerOverlay/index.vue index 1307dd7a5..bd0a651e3 100644 --- a/resources/assets/js/components/DrawerOverlay/index.vue +++ b/resources/assets/js/components/DrawerOverlay/index.vue @@ -5,12 +5,13 @@ :closable="escClosable" :mask-closable="maskClosable" :footer-hide="true" - :transition-names="[$A.isAndroid() ? '' : `drawer-slide-${placement}`, '']" + :transition-names="[$A.isAndroid() ? '' : `drawer-slide-${transitionName}`, '']" :beforeClose="beforeClose" fullscreen :class-name="modalClass"> - + diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index f7521fef4..a8ab3edd3 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -1,5 +1,12 @@ @@ -214,13 +234,18 @@ 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 ApproveExport from "../components/ApproveExport"; import {mapState} from 'vuex' export default { - components:{list,listDetails,DrawerOverlay,ImgUpload}, + components:{list,listDetails,DrawerOverlay,ImgUpload,ApproveSetting,ApproveExport}, name: "approve", data() { return { + showType: 1, + exportApproveShow: false, + isShowIcon: false, modalTransferIndex: window.modalTransferIndex, minDate: new Date(2020, 0, 1), @@ -306,7 +331,7 @@ export default { } }, computed: { - ...mapState([ 'wsMsg','userInfo','userIsAdmin' ]), + ...mapState([ 'wsMsg','userInfo','userIsAdmin','windowWidth' ]), departmentList(){ let departmentNames = (this.userInfo.department_name || '').split(','); return (this.userInfo.department || []).map((h,index)=>{ @@ -340,6 +365,14 @@ export default { if(!val){ this.addData.other = "" } + }, + showType(val){ + if(val == 1){ + this.tabsClick() + } + }, + windowWidth(val){ + this.isShowIcon = val < 515 } }, mounted() { @@ -348,6 +381,7 @@ export default { this.getUnreadList() this.addData.department_id = this.userInfo.department[0] || 0; this.addData.startTime = this.addData.endTime = this.getCurrentDate(); + this.isShowIcon = this.windowWidth < 515 }, methods:{ // 获取当前时间 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 @@