From 3670666b3e62e8231fc36ff85a4b374d533d0f72 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 19 Apr 2022 15:19:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix-1931=20=E8=AE=A1=E7=AE=97=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=95=B0=E6=8D=AE=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/repo/modelarts/trainjob/new.tmpl | 42 +++++++++++++---------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl
index 963250bcb4..f3e2d5a758 100755
--- a/templates/repo/modelarts/trainjob/new.tmpl
+++ b/templates/repo/modelarts/trainjob/new.tmpl
@@ -244,8 +244,13 @@
 
                     <div class="ui labeled input" style="width: 5%;">
 
-                            <input style="border-radius: 0;text-align: center;" name="work_server_number" id="trainjob_work_server_num" tabindex="3" autofocus required maxlength="255" value="1" readonly>
-
+                            <input style="border-radius: 0;text-align: center;"type="hidden" name="work_server_number" id="trainjob_work_server_num" tabindex="3" autofocus required maxlength="255" value="1" readonly>
+                            <div class="field"  id="trainjob_work_server_num_select" name="work_server_number_select">
+                                <select class="ui dropdown width"  style='width: 100%;' name="work_server_id">
+                                    <option name="server_id" value="1">1</option>
+                                    <option name="server_id" value="2">2</option> 
+                                </select>
+                            </div>
 
                     </div>
                 </div>
@@ -274,19 +279,20 @@
     $('.menu .item')
         .tab();
 
-    let sever_num = $('#trainjob_work_server_num')
-    $('.add').click(function(){
-        sever_num.val(parseInt(sever_num.val())+1)
-        if(sever_num.val()>=26){
-            sever_num.val(parseInt(sever_num.val())-1)
-        }
-    })
-    $('.min').click(function(){
-        sever_num.val(parseInt(sever_num.val())-1)
-        if(sever_num.val()<=0){
-            sever_num.val(parseInt(sever_num.val())+1)
-        }
-    })
+    // let sever_num = $("#trainjob_work_server_num_select .text").text() //$('#trainjob_work_server_num')
+    // console.log("sever_num:",sever_num)
+    // $('.add').click(function(){
+    //     sever_num.val(parseInt(sever_num.val())+1)
+    //     if(sever_num.val()>=26){
+    //         sever_num.val(parseInt(sever_num.val())-1)
+    //     }
+    // })
+    // $('.min').click(function(){
+    //     sever_num.val(parseInt(sever_num.val())-1)
+    //     if(sever_num.val()<=0){
+    //         sever_num.val(parseInt(sever_num.val())+1)
+    //     }
+    // })
     // 参数增加、删除、修改、保存
     function Add_parameter(i){
         value = '<div class="two fields width85" id= "para'+ i +'">' +
@@ -360,7 +366,7 @@
                     //     $("select[name='pool_id']").val(parameters[i]);
                     //     break;
                     case (6):
-                        $("input[name='work_server_number']").val(parameters[i]);
+                        // $("input[name='work_server_number']").val(parameters[i]);
                         break;
                 }
         }
@@ -467,6 +473,10 @@
         $("input#ai_engine_name").val(name1)
         $("input#ai_flaver_name").val(name2)
 
+        let val_server_num_select = $("#trainjob_work_server_num_select .text").text()
+        // console.log("val_server_num_select:",val_server_num_select)
+        $("input#trainjob_work_server_num").val(val_server_num_select)
+
     }
     $('.ui.create_train_job.green.button').click(function(e) {
         get_name()
-- 
2.34.1


From 96ddf38afd49150454fc6306cbe6884003dd2175 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Fri, 22 Apr 2022 09:57:13 +0800
Subject: [PATCH 2/2] fix-1931

---
 routers/repo/modelarts.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 318726e8ec..33e380fecb 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -1475,9 +1475,9 @@ func paramCheckCreateTrainJob(form auth.CreateModelArtsTrainJobForm) error {
 		return errors.New("启动文件必须是python文件")
 	}
 
-	if form.WorkServerNumber > 25 || form.WorkServerNumber < 1 {
-		log.Error("the WorkServerNumber(%d) must be in (1,25)", form.WorkServerNumber)
-		return errors.New("计算节点数必须在1-25之间")
+	if form.WorkServerNumber > 2 || form.WorkServerNumber < 1 {
+		log.Error("the WorkServerNumber(%d) must be in (1,2)", form.WorkServerNumber)
+		return errors.New("计算节点数必须在1-2之间")
 	}
 	if form.BranchName == "" {
 		log.Error("the branch must not be null!", form.BranchName)
@@ -1493,9 +1493,9 @@ func paramCheckCreateInferenceJob(form auth.CreateModelArtsInferenceJobForm) err
 		return errors.New("启动文件必须是python文件")
 	}
 
-	if form.WorkServerNumber > 25 || form.WorkServerNumber < 1 {
-		log.Error("the WorkServerNumber(%d) must be in (1,25)", form.WorkServerNumber)
-		return errors.New("计算节点数必须在1-25之间")
+	if form.WorkServerNumber > 2 || form.WorkServerNumber < 1 {
+		log.Error("the WorkServerNumber(%d) must be in (1,2)", form.WorkServerNumber)
+		return errors.New("计算节点数必须在1-2之间")
 	}
 
 	if form.ModelName == "" {
-- 
2.34.1