From c9fc9916b2beb71ef2d641c124d77083709587f8 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 17 Aug 2023 09:56:47 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=9E=8D=E5=90=88okr=E5=88=B0?=
=?UTF-8?q?=E5=BA=94=E7=94=A8=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/images/apply/okr.svg | 1 +
public/images/apply/okrAnalyze.svg | 1 +
resources/assets/js/pages/manage/apply.vue | 8 ++++++++
resources/assets/sass/pages/page-apply.scss | 8 ++++++++
resources/assets/statics/public/images/apply/okr.svg | 1 +
.../assets/statics/public/images/apply/okrAnalyze.svg | 1 +
6 files changed, 20 insertions(+)
create mode 100644 public/images/apply/okr.svg
create mode 100644 public/images/apply/okrAnalyze.svg
create mode 100644 resources/assets/statics/public/images/apply/okr.svg
create mode 100644 resources/assets/statics/public/images/apply/okrAnalyze.svg
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