+
+
{{.i18n.Tr "admin.cloudbrain.all_task_types"}}
{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}
{{.i18n.Tr "admin.cloudbrain.all_status"}}
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl
index 910531549..6e9a315da 100755
--- a/templates/user/dashboard/cloudbrains.tmpl
+++ b/templates/user/dashboard/cloudbrains.tmpl
@@ -6,6 +6,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 892d2ab41..62d5438ee 100644
--- a/web_src/js/features/cloudrbanin.js
+++ b/web_src/js/features/cloudrbanin.js
@@ -499,6 +499,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")) {
@@ -515,13 +527,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]);
});
@@ -532,6 +547,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");
@@ -541,7 +571,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]);
});