diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 29b55b97e..91eaddd09 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -71,6 +71,7 @@ const ( ModelArtsStopping ModelArtsJobStatus = "STOPPING" //停止中 ModelArtsStopped ModelArtsJobStatus = "STOPPED" //停止 ModelArtsUnavailable ModelArtsJobStatus = "UNAVAILABLE" //故障 + ModelArtsDeleting ModelArtsJobStatus = "DELETING" //删除中 ModelArtsDeleted ModelArtsJobStatus = "DELETED" //已删除 ModelArtsResizing ModelArtsJobStatus = "RESIZING" //规格变更中 ModelArtsResizFailed ModelArtsJobStatus = "RESIZE_FAILED" //规格变更失败 @@ -1934,9 +1935,9 @@ func GetCloudbrainCountByUserID(userID int64, jobType string) (int, error) { func GetCloudbrainRunCountByRepoID(repoID int64) (int, error) { count, err := x.In("status", JobWaiting, JobRunning, ModelArtsCreateQueue, ModelArtsCreating, ModelArtsStarting, - ModelArtsReadyToStart, ModelArtsResizing, ModelArtsStartQueuing, ModelArtsRunning, ModelArtsRestarting, ModelArtsTrainJobInit, + ModelArtsReadyToStart, ModelArtsResizing, ModelArtsStartQueuing, ModelArtsRunning, ModelArtsDeleting, ModelArtsRestarting, ModelArtsTrainJobInit, ModelArtsTrainJobImageCreating, ModelArtsTrainJobSubmitTrying, ModelArtsTrainJobWaiting, ModelArtsTrainJobRunning, ModelArtsStopping, ModelArtsResizing, - ModelArtsTrainJobScaling, ModelArtsTrainJobCheckInit, ModelArtsTrainJobCheckRunning, ModelArtsTrainJobCheckRunningCompleted).And("repo_id = ?", repoID).Count(new(Cloudbrain)) + ModelArtsTrainJobScaling, ModelArtsTrainJobCheckInit, ModelArtsTrainJobCheckRunning, ModelArtsTrainJobKilling, ModelArtsTrainJobCheckRunningCompleted).And("repo_id = ?", repoID).Count(new(Cloudbrain)) return int(count), err } diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl index c135bcd44..7343245df 100644 --- a/templates/repo/modelarts/trainjob/version_new.tmpl +++ b/templates/repo/modelarts/trainjob/version_new.tmpl @@ -73,12 +73,50 @@ - {{template "custom/wait_count_train" Dict "ctx" $}} -
+ +

{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:

+
+ + +
+
+ + +
+
+ {{template "custom/wait_count_train" Dict "ctx" $}} +
+
{{.i18n.Tr "cloudbrain.train_dataset_path_rule" | Safe}}
-

{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:

diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index ecce6b02f..d411fd237 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -985,7 +985,10 @@ export default { let hasSelectDatasetName = $(".cloudbrain-type") .data("dataset-name") .split(";"); - if (this.hasSelectDatasetList.length !== 0) { + if ( + this.hasSelectDatasetList.length !== 0 && + hasSelectDatasetName[0] !== "" + ) { this.saveStatusList = this.hasSelectDatasetList; this.checkList = hasSelectDatasetName; this.hasSelectDatasetList.forEach((item, index) => {