From 11b152cfbbf9a6ddbad0a03997b463de025211ba Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 20 Jul 2023 16:31:20 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=B8=80=E4=BA=9B=E9=85=8D?=
 =?UTF-8?q?=E5=90=88okr=E5=BE=AE=E5=BA=94=E7=94=A8=E7=9A=84=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/nginx/default.conf            |  5 ++++-
 language/original-web.txt            |  5 ++++-
 language/translate.json              | 22 ++++++++++++++++++++++
 resources/assets/js/pages/manage.vue |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 94e0ecd17..b1269d54a 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -186,7 +186,10 @@ server {
 
     # OKR
     location /manage/microapp/okr/ {
-        proxy_pass http://192.168.100.83:5566/;
+        proxy_pass http://192.168.100.90:5566/;
+    } 
+    location /api/v1/okr/ {
+        proxy_pass http://192.168.100.90:5566/api/v1/okr/;
     } 
 }
 
diff --git a/language/original-web.txt b/language/original-web.txt
index f3d8519f8..ccb183d07 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -1248,4 +1248,7 @@ Markdown 格式发送
 确定要离开会议吗？
 继续
 退出
-会议组件加载失败！
\ No newline at end of file
+会议组件加载失败！
+
+OkR管理
+OkR结果分析
\ No newline at end of file
diff --git a/language/translate.json b/language/translate.json
index bde95bebe..f75e71586 100644
--- a/language/translate.json
+++ b/language/translate.json
@@ -16883,5 +16883,27 @@
         "de": "Geladen mit fallender fracht des meetings!",
         "fr": "Échec du chargement du composant conférence!",
         "id": "Perakitan perakitan gagal!"
+    },
+    {
+        "key": "OkR管理",
+        "zh": "",
+        "zh-CHT": "OkR管理",
+        "en": "OkR management",
+        "ko": "Okr 매니지먼트",
+        "ja": "OkRマネジメントです",
+        "de": "Das ist OkR.",
+        "fr": "Gestion des OkR",
+        "id": "OkR manajemen"
+    },
+    {
+        "key": "OkR结果分析",
+        "zh": "",
+        "zh-CHT": "OkR結果分析",
+        "en": "Analysis of OkR results",
+        "ko": "Okr 결과 분석",
+        "ja": "OkR結果分析です",
+        "de": "Wenn die ergebnisse umgekehrt sind",
+        "fr": "Analyse des résultats OkR",
+        "id": "Analisis hasil OkR"
     }
 ]
\ No newline at end of file
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 1cb9895e1..31d8f3e9b 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -785,7 +785,7 @@ export default {
                     if(path=='okrManage'){
                         this.goForward({  path: '/manage/microapp/', query });
                     }else{
-                        this.goForward({ path: '/manage/microapp/#/main', query });
+                        this.goForward({ path: '/manage/microapp/#/analysis', query });
                     }
                     return;
                 case 'logout':