From 5dd98ce8170cc0edc08ebaed642ed2f911724b7b Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 9 Aug 2022 18:02:24 +0800 Subject: [PATCH] fix issue --- templates/admin/cloudbrain/list.tmpl | 4 ++ templates/admin/cloudbrain/search.tmpl | 68 +++++++++++++------ .../admin/cloudbrain/search_dashboard.tmpl | 68 +++++++++++++------ templates/user/dashboard/cloudbrains.tmpl | 4 ++ web_src/js/features/cloudrbanin.js | 34 +++++++++- 5 files changed, 132 insertions(+), 46 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index cd5913c40..85f6acb0c 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -14,6 +14,10 @@
diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl index ddd616eb4..bbfeb811c 100644 --- a/templates/admin/cloudbrain/search.tmpl +++ b/templates/admin/cloudbrain/search.tmpl @@ -7,44 +7,68 @@
+
+
全部集群
+ +
+ 全部集群 + 启智集群 + 智算集群 +
+
+
+
全部智算中心
+ +
+ 全部智算中心 + 鹏城云计算所 + 成都智算 + 合肥类脑 + octopus + 武汉智算 + 西安智算 + 中原智算 + 许昌AI中心 +
+
{{.i18n.Tr "admin.cloudbrain.all_task_types"}}
- {{.i18n.Tr "admin.cloudbrain.all_task_types"}} - DEBUG - TRAIN - INFERENCE - BENCHMARK - SNN4IMAGENET - BRAINSCORE + {{.i18n.Tr "admin.cloudbrain.all_task_types"}} + DEBUG + TRAIN + INFERENCE + BENCHMARK + SNN4IMAGENET + BRAINSCORE
{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}
- {{.i18n.Tr "admin.cloudbrain.all_computing_resources"}} - CPU/GPU - NPU + {{.i18n.Tr "admin.cloudbrain.all_computing_resources"}} + CPU/GPU + NPU
{{.i18n.Tr "admin.cloudbrain.all_status"}}
- {{.i18n.Tr "admin.cloudbrain.all_status"}} - STARTING - RUNNING - RESTARTING - START_FAILED - STOPPING - STOPPED - WAITING - COMPLETED - SUCCEEDED - FAILED - OTHER + {{.i18n.Tr "admin.cloudbrain.all_status"}} + STARTING + RUNNING + RESTARTING + START_FAILED + STOPPING + STOPPED + WAITING + COMPLETED + SUCCEEDED + FAILED + OTHER
diff --git a/templates/admin/cloudbrain/search_dashboard.tmpl b/templates/admin/cloudbrain/search_dashboard.tmpl index e4d74836d..83c9c5ec6 100644 --- a/templates/admin/cloudbrain/search_dashboard.tmpl +++ b/templates/admin/cloudbrain/search_dashboard.tmpl @@ -19,44 +19,68 @@
+
+
全部集群
+ +
+ 全部集群 + 启智集群 + 智算集群 +
+
+
+
全部智算中心
+ +
+ 全部智算中心 + 鹏城云计算所 + 成都智算 + 合肥类脑 + octopus + 武汉智算 + 西安智算 + 中原智算 + 许昌AI中心 +
+
{{.i18n.Tr "admin.cloudbrain.all_task_types"}}
- {{.i18n.Tr "admin.cloudbrain.all_task_types"}} - {{.i18n.Tr "cloudbrain.DEBUG"}} - {{.i18n.Tr "cloudbrain.TRAIN"}} - {{.i18n.Tr "cloudbrain.INFERENCE"}} - {{.i18n.Tr "cloudbrain.BENCHMARK"}} - + {{.i18n.Tr "admin.cloudbrain.all_task_types"}} + {{.i18n.Tr "cloudbrain.DEBUG"}} + {{.i18n.Tr "cloudbrain.TRAIN"}} + {{.i18n.Tr "cloudbrain.INFERENCE"}} + {{.i18n.Tr "cloudbrain.BENCHMARK"}} +
{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}
- {{.i18n.Tr "admin.cloudbrain.all_computing_resources"}} - CPU/GPU - NPU + {{.i18n.Tr "admin.cloudbrain.all_computing_resources"}} + CPU/GPU + NPU
{{.i18n.Tr "admin.cloudbrain.all_status"}}
- {{.i18n.Tr "admin.cloudbrain.all_status"}} - STARTING - RUNNING - RESTARTING - START_FAILED - STOPPING - STOPPED - WAITING - COMPLETED - SUCCEEDED - FAILED - OTHER + {{.i18n.Tr "admin.cloudbrain.all_status"}} + STARTING + RUNNING + RESTARTING + START_FAILED + STOPPING + STOPPED + WAITING + COMPLETED + SUCCEEDED + FAILED + OTHER
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index 8019bc51d..f5aee09a2 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -16,6 +16,10 @@ data-debug-again="{{$.i18n.Tr "repo.debug_again"}}" data-debug-task="{{$.i18n.Tr "cloudbrain.DEBUG"}}" data-train-task="{{$.i18n.Tr "cloudbrain.TRAIN"}}" data-inference-task="{{$.i18n.Tr "cloudbrain.INFERENCE"}}" data-benchmark-task="{{$.i18n.Tr "cloudbrain.BENCHMARK"}}" + data-all-cluster="全部集群" + data-all-aiCenter="全部智算中心" + data-cluster-c2net="{{.i18n.Tr "cloudbrain.resource_cluster_c2net"}}" + data-cluster-openi="{{.i18n.Tr "cloudbrain.resource_cluster_openi"}}" data-all-task="{{.i18n.Tr "admin.cloudbrain.all_task_types"}}" data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}" data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}">
diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 172e6b0bd..f19701e8a 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -526,6 +526,18 @@ function userSearchControll() { return; } const params = new URLSearchParams(window.location.search); + let cluster; + if ($(".cloudbrain_debug").length === 1) { + if (!params.get("cluster")) { + cluster = $(".cloudbrain_debug").data("all-cluster"); + } else { + if (params.get("cluster") === "resource_cluster_c2net") { + cluster = $(".cloudbrain_debug").data("cluster-c2net"); + } else { + cluster = $(".cloudbrain_debug").data("cluster-openi"); + } + } + } let jobType; if ($(".cloudbrain_debug").length === 1) { if (!params.get("jobType")) { @@ -542,13 +554,16 @@ function userSearchControll() { } } } + let aiCenter = !params.get("aiCenter") + ? $(".cloudbrain_debug").data("all-aiCenter") + : params.get("aiCenter"); let listType = !params.get("listType") ? $(".cloudbrain_debug").data("all-compute") : params.get("listType"); let jobStatus = !params.get("jobStatus") ? $(".cloudbrain_debug").data("all-status") : params.get("jobStatus").toUpperCase(); - const dropdownValueArray = [jobType, listType, jobStatus]; + const dropdownValueArray = [cluster, aiCenter, jobType, listType, jobStatus]; $("#userCloud .default.text ").each(function (index, e) { $(e).text(dropdownValueArray[index]); }); @@ -559,6 +574,21 @@ function AdaminSearchControll() { return; } const params = new URLSearchParams(window.location.search); + let cluster; + if ($(".cloudbrain_debug").length === 1) { + if (!params.get("cluster")) { + cluster = $(".cloudbrain_debug").data("all-cluster"); + } else { + if (params.get("cluster") === "resource_cluster_c2net") { + cluster = $(".cloudbrain_debug").data("cluster-c2net"); + } else { + cluster = $(".cloudbrain_debug").data("cluster-openi"); + } + } + } + let aiCenter = !params.get("aiCenter") + ? $(".cloudbrain_debug").data("all-aiCenter") + : params.get("aiCenter"); let jobType = !params.get("jobType") ? $(".cloudbrain_debug").data("all-task") : params.get("jobType"); @@ -568,7 +598,7 @@ function AdaminSearchControll() { let jobStatus = !params.get("jobStatus") ? $(".cloudbrain_debug").data("all-status") : params.get("jobStatus").toUpperCase(); - const dropdownValueArray = [jobType, listType, jobStatus]; + const dropdownValueArray = [cluster, aiCenter, jobType, listType, jobStatus]; $("#adminCloud .default.text ").each(function (index, e) { $(e).text(dropdownValueArray[index]); });