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':