Merge pull request '屏蔽智算网络的模型创建及支持MindSpore1.5的模型框架显示。' (#2330) from zouap into V20220616.patch

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2330
Reviewed-by: lewis <747342561@qq.com>

models/cloudbrain.go

@@ -1329,6 +1329,9 @@ func QueryModelTrainJobList(repoId int64) ([]*CloudbrainInfo, int, error) {
 	cond = cond.And(
 		builder.Eq{"job_type": "TRAIN"},
 	)
+	cond = cond.And(
+		builder.In("type", 0, 1),
+	)
 
 	cloudbrains := make([]*CloudbrainInfo, 0)
 	if err := sess.Select("job_id,display_job_name").Table(&Cloudbrain{}).Where(cond).OrderBy("created_unix DESC").

templates/repo/modelarts/trainjob/show.tmpl

@@ -675,7 +675,7 @@
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
                     $('input[name="JobId"]').val(obj.JobID)
                     $('input[name="VersionName"]').val(obj.VersionName).addClass('model_disabled')
-                    if(obj.EngineID ==122){
+                    if(obj.EngineID ==122 || obj.EngineID ==35){
                         $('input[name="Engine_name"]').val("MindSpore").addClass('model_disabled');
                         $('input[name="Engine"]').val(2);
                     }

web_src/js/components/Model.vue

@@ -353,7 +353,7 @@ export default {
             return "Pytorch";
         }else  if(model.Engine == 1 || model.Engine == 121){
             return "TensorFlow";
-        }else  if(model.Engine == 2 || model.Engine == 122){
+        }else  if(model.Engine == 2 || model.Engine == 122 || model.Engine == 35){
             return "MindSpore";
         }else{
             return "Other"