diff --git a/public/images/apply/okr.svg b/public/images/apply/okr.svg new file mode 100644 index 000000000..dcabcf544 --- /dev/null +++ b/public/images/apply/okr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/apply/okrAnalyze.svg b/public/images/apply/okrAnalyze.svg new file mode 100644 index 000000000..6270061a6 --- /dev/null +++ b/public/images/apply/okrAnalyze.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/assets/js/pages/manage/apply.vue b/resources/assets/js/pages/manage/apply.vue index 68252547b..0deddb922 100644 --- a/resources/assets/js/pages/manage/apply.vue +++ b/resources/assets/js/pages/manage/apply.vue @@ -280,6 +280,8 @@ export default { this.applyList = [ { value: "approve", label: "审批中心", src: $A.apiUrl('../images/apply/approve.svg') }, { value: "report", label: "工作报告", src: $A.apiUrl('../images/apply/report.svg') }, + { value: "okr", label: "OKR管理", src: $A.apiUrl('../images/apply/okr.svg') }, + { value: "okrAnalyze", label: "OKR结果分析", src: $A.apiUrl('../images/apply/okrAnalyze.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'), show: this.userIsAdmin }, @@ -309,6 +311,12 @@ export default { case 'setting': this.goForward({ name: 'manage-' + item.value }); break; + case 'okr': + case 'okrAnalyze': + this.goForward({ + path:'/manage/apps/' + ( item.value == 'okr' ? '/#/list' : '/#/analysis'), + }); + break; case 'report': this.workReportTabs = 'my'; if(area=='badge'){ diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss index 8a35901fe..be5c9f3b6 100644 --- a/resources/assets/sass/pages/page-apply.scss +++ b/resources/assets/sass/pages/page-apply.scss @@ -66,6 +66,14 @@ margin-bottom: 5px; } } + + >p{ + @media (max-width: 510px) { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + } .apply-box-top-report { position: absolute; diff --git a/resources/assets/statics/public/images/apply/okr.svg b/resources/assets/statics/public/images/apply/okr.svg new file mode 100644 index 000000000..dcabcf544 --- /dev/null +++ b/resources/assets/statics/public/images/apply/okr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/assets/statics/public/images/apply/okrAnalyze.svg b/resources/assets/statics/public/images/apply/okrAnalyze.svg new file mode 100644 index 000000000..6270061a6 --- /dev/null +++ b/resources/assets/statics/public/images/apply/okrAnalyze.svg @@ -0,0 +1 @@ + \ No newline at end of file