modules/convert/finetune.go

@@ -19,5 +19,6 @@ func ToFineTuneJobShow(cloudbrain *models.Cloudbrain) *api.FinetuneJobShow {
 		CreatedUnix:    int64(cloudbrain.CreatedUnix),
 		JobCategory:    cloudbrain.FineTuneCategory,
 		DeployStatus:   deployStatus,
+		Cleared:        cloudbrain.Cleared,
 	}
 }

modules/structs/finetune.go

@@ -10,4 +10,5 @@ type FinetuneJobShow struct {
 	CreatedUnix    int64  `json:"created_unix"`
 	JobCategory    int    `json:"job_category"`
 	DeployStatus   string `json:"deploy_status"`
+	Cleared        bool   `json:"cleared"`
 }

web_src/vuepages/pages/modelbase/create/index.vue

@@ -52,7 +52,7 @@
               <div class="row-title"></div>
               <div class="row-content" style="padding-top:6px;">
                 <el-button type="primary" class="btn confirm-btn" size="default" :disabled="alreadyMsgBoxShow"
-                  @click="submitClick" :loading="loading">
+                  @click="repoCheck" :loading="loading">
                   提 交</el-button>
                 <el-button @click="cancel" class="btn" size="default">取 消</el-button>
               </div>
@@ -108,7 +108,26 @@ export default {
   },
   components: { TaskName, ModelBaseDatasetSelect, ResourceSpecification, RunParameters, LoadingMask },
   methods: {
-    submitClick() {
+    repoCheck() {
+      this.loading = true;
+      getCheckRepo().then(res => {
+        this.loading = false;
+        res = res.data;
+        if (res.code == 0) {
+          this.datasetId = res.message;
+          this.submitCheck();
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.message,
+          });
+        }
+      }).catch(err => {
+        this.loading = false;
+        console.log(err);
+      });
+    },
+    submitCheck() {
       const r1 = this.$refs.taskNameRef.check();
       const r2 = this.$refs.modelBaseDatasetSelectRef.check();
       const r3 = this.$refs.resourceSpecificationRef.check();
@@ -135,7 +154,6 @@ export default {
         if (datasetTab == 1) { // 本地上传
           this.loading = true;
           this.$refs.modelBaseDatasetSelectRef.localUpload().then(res => {
-            console.log(res);
             if (res) {
               if (res.status == '1') {
                 this.loading = false;
@@ -243,19 +261,6 @@ export default {
       const uname = metaEl[0].getAttribute('content-ext');
       this.userName = uname;
     }
-    getCheckRepo().then(res => {
-      res = res.data;
-      if (res.code == 0) {
-        this.datasetId = res.message;
-      } else {
-        this.$message({
-          type: 'error',
-          message: res.message,
-        });
-      }
-    }).catch(err => {
-      console.log(err);
-    });
     getPointAccountInfo().then(res => {
       const data = res.data;
       this.pointShow = data.cloudBrainPaySwitch ? true : false;

web_src/vuepages/pages/modelbase/model/index.vue

@@ -177,8 +177,8 @@ export default {
       taskJob.canStopTrain = ['RUNNING', 'WAITING'].includes(taskJob.status);
       taskJob.canDelete = ['STOPPED', 'FAILED', 'START_FAILED', 'KILLED', 'COMPLETED', 'SUCCEEDED', 'CREATE_FAILED'].includes(taskJob.status)
         && ['', 'STOP', 'FAILED'].includes(taskJob.deploy_status);
-      taskJob.canDeploy = ['SUCCEEDED', 'COMPLETED'].includes(taskJob.status) && !['BUILDING', 'WAITING', 'DEPLOYING', 'SUCCEEDED', 'STOP', 'FAILED'].includes(taskJob.deploy_status);
-      taskJob.canReDeploy = ['SUCCEEDED', 'COMPLETED'].includes(taskJob.status) && ['STOP'].includes(taskJob.deploy_status);
+      taskJob.canDeploy = !taskJob.cleared && ['SUCCEEDED', 'COMPLETED'].includes(taskJob.status) && !['BUILDING', 'WAITING', 'DEPLOYING', 'SUCCEEDED', 'STOP', 'FAILED'].includes(taskJob.deploy_status);
+      taskJob.canReDeploy = !taskJob.cleared && ['SUCCEEDED', 'COMPLETED'].includes(taskJob.status) && ['STOP'].includes(taskJob.deploy_status);
       taskJob.canStopDeploy = ['SUCCEEDED', 'COMPLETED'].includes(taskJob.status) && ['DEPLOYING', 'SUCCEEDED'].includes(taskJob.deploy_status);
       taskJob.canInference = ['SUCCEEDED', 'COMPLETED'].includes(taskJob.status) && ['SUCCEEDED'].includes(taskJob.deploy_status);
     },
@@ -269,7 +269,7 @@ export default {
             type: 'error',
             message: '操作失败',
           });
-        })       
+        })
       }).catch(() => { });
     },
     deploy(taskJob) {