diff --git a/public/images/application/create-group.svg b/public/images/application/create-group.svg
new file mode 100644
index 000000000..84ba42dfa
--- /dev/null
+++ b/public/images/application/create-group.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 7a77ae1e7..59387ca65 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -1205,6 +1205,9 @@ export default {
onTabbarClick(act) {
switch (act) {
+ case 'createGroup':
+ this.onAddMenu('group')
+ break;
case 'addTask':
this.onAddTask(0)
break;
diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index ac6605aa1..f68453164 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -406,35 +406,29 @@ export default {
initList() {
let applyList = [
{ value: "approve", label: "审批中心", sort: 30 },
- { value: "report", label: "工作报告", sort: 50 },
{ value: "okr", label: "OKR 管理", sort: 40 },
+ { value: "report", label: "工作报告", sort: 50 },
{ value: "mybot", label: "我的机器人", sort: 55 },
- { value: "robot", label: "AI 机器人", sort: 60 },
+ { value: "robot", label: "AI 机器人", sort: 60, show: this.systemConfig.server_closeai !== 'close' },
{ value: "signin", label: "签到打卡", sort: 70 },
{ value: "meeting", label: "在线会议", sort: 80 },
+ { value: "createGroup", label: "创建群组", sort: 85 },
{ value: "word-chain", label: "群接龙", sort: 90 },
{ value: "vote", label: "群投票", sort: 100 },
+ { value: "addProject", label: "创建项目", sort: 110 },
+ { value: "addTask", label: "添加任务", sort: 120 },
+ { value: "scan", label: "扫一扫", sort: 130, show: $A.isEEUiApp },
+ { value: "setting", label: "设置", sort: 140 },
];
- if (this.systemConfig.server_closeai === 'close') {
- applyList = applyList.filter(h => h.value !== 'robot');
- }
- // wap模式
- if (this.windowOrientation == 'landscape') {
- // 横屏模式
- applyList.push({ value: "scan", label: "扫一扫", show: $A.isEEUiApp, sort: 130 })
- } else {
- // 竖屏模式
+ // 竖屏模式
+ if (this.windowPortrait) {
applyList.push(...[
{ value: "calendar", label: "日历", sort: 10 },
{ value: "file", label: "文件", sort: 20 },
- { value: "addProject", label: "创建项目", sort: 110 },
- { value: "addTask", label: "添加任务", sort: 120 },
- { value: "scan", label: "扫一扫", show: $A.isEEUiApp, sort: 130 },
- { value: "setting", label: "设置", sort: 140 }
])
}
// 管理员
- let adminApplyList = [];
+ const adminApplyList = [];
if (!this.userIsAdmin) {
if (this.userInfo.department_owner) {
adminApplyList.push({ value: "okrAnalyze", label: "OKR 结果", sort: 150 })
@@ -449,10 +443,9 @@ export default {
{ value: "allUser", label: "团队管理", sort: 200 },
])
}
- adminApplyList = adminApplyList.map((h) => {
- h.type = 'admin';
- return h;
- });
+ adminApplyList.map(item => {
+ item.type = 'admin'
+ })
//
this.applyList = [...applyList, ...adminApplyList].sort((a, b) => a.sort - b.sort);
},
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index 233866345..382eaaf8d 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/resources/assets/sass/pages/page-apply.scss
@@ -143,6 +143,10 @@
background-image: url("../images/application/approve.svg");
}
+ &.create-group {
+ background-image: url("../images/application/create-group.svg");
+ }
+
&.add-project {
background-image: url("../images/application/add-project.svg");
}
diff --git a/resources/assets/statics/public/images/application/create-group.svg b/resources/assets/statics/public/images/application/create-group.svg
new file mode 100644
index 000000000..84ba42dfa
--- /dev/null
+++ b/resources/assets/statics/public/images/application/create-group.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file