-
@@ -372,7 +372,7 @@
@@ -493,8 +493,8 @@
//}
}
if(status==="RUNNING"){
- $('#model-debug').removeClass('disabled')
- $('#model-debug').addClass('blue')
+ $('#model-debug-'+jobID).removeClass('disabled')
+ $('#model-debug-'+jobID).addClass('blue')
// let TrainDuration = runtime(time)
// $('#model-duration').text(TrainDuration)
@@ -502,21 +502,21 @@
}
if(status!=="RUNNING"){
- $('#model-debug').removeClass('blue')
- $('#model-debug').addClass('disabled')
+ $('#model-debug-'+jobID).removeClass('blue')
+ $('#model-debug-'+jobID).addClass('disabled')
}
- if(status!=="STOPPED" || status!=="FAILED"){
- $('#stop-model-debug').removeClass('disabled')
- $('#stop-model-debug').addClass('blue')
- $('#model-delete').removeClass('red')
- $('#model-delete').addClass('disabled')
+ if(status!=="KILLED" || status!=="FAILED"){
+ $('#stop-model-debug-'+jobID).removeClass('disabled')
+ $('#stop-model-debug-'+jobID).addClass('blue')
+ $('#model-delete-'+jobID).removeClass('red')
+ $('#model-delete-'+jobID).addClass('disabled')
}
- if(status=="STOPPED" || status=="FAILED"){
- $('#stop-model-debug').removeClass('blue')
- $('#stop-model-debug').addClass('disabled')
- $('#model-delete').removeClass('disabled')
- $('#model-delete').addClass('red')
+ if(status=="KILLED" || status=="FAILED"){
+ $('#stop-model-debug-'+jobID).removeClass('blue')
+ $('#stop-model-debug-'+jobID).addClass('disabled')
+ $('#model-delete-'+jobID).removeClass('disabled')
+ $('#model-delete-'+jobID).addClass('red')
}
}).fail(function(err) {
console.log(err);
diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl
index 310ee56b2..3e852c619 100755
--- a/templates/repo/modelarts/trainjob/new.tmpl
+++ b/templates/repo/modelarts/trainjob/new.tmpl
@@ -49,12 +49,98 @@
text-align: center;
color: #C2C7CC;"
}
+#mask {
+ position: fixed;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
+ filter: alpha(opacity=60);
+ background-color: #777;
+ z-index: 1000;
+ display: none;
+ opacity: 0.8;
+ -moz-opacity: 0.5;
+ padding-top: 100px;
+ color: #000000
+ }
+ /* 加载圈css效果图 */
+
+#loadingPage {
+ margin: 200px auto;
+ width: 50px;
+ height: 40px;
+ text-align: center;
+ font-size: 10px;
+ display: block;
+}
+
+#loadingPage>div {
+ background-color: green;
+ height: 100%;
+ width: 6px;
+ display: inline-block;
+ -webkit-animation: sk-stretchdelay 1.2s infinite ease-in-out;
+ animation: sk-stretchdelay 1.2s infinite ease-in-out;
+ }
+
+ #loadingPage .rect2 {
+ -webkit-animation-delay: -1.1s;
+ animation-delay: -1.1s;
+ }
+
+ #loadingPage .rect3 {
+ -webkit-animation-delay: -1.0s;
+ animation-delay: -1.0s;
+ }
+
+ #loadingPage .rect4 {
+ -webkit-animation-delay: -0.9s;
+ animation-delay: -0.9s;
+ }
+
+ #loadingPage .rect5 {
+ -webkit-animation-delay: -0.8s;
+ animation-delay: -0.8s;
+ }
+
+ @-webkit-keyframes sk-stretchdelay {
+ 0%,
+ 40%,
+ 100% {
+ -webkit-transform: scaleY(0.4)
+ }
+ 20% {
+ -webkit-transform: scaleY(1.0)
+ }
+ }
+
+ @keyframes sk-stretchdelay {
+ 0%,
+ 40%,
+ 100% {
+ transform: scaleY(0.4);
+ -webkit-transform: scaleY(0.4);
+ }
+ 20% {
+ transform: scaleY(1.0);
+ -webkit-transform: scaleY(1.0);
+ }
+}
-
+
+
-
{{template "repo/header" .}}
@@ -412,14 +498,19 @@
}
},
onSuccess: function(){
- $('.ui.page.dimmer').dimmer('show')
+ // $('.ui.page.dimmer').dimmer('show')
+ document.getElementById("mask").style.display = "block"
},
onFailure: function(e){
return false;
}
})
}
-
+ document.onreadystatechange = function() {
+ if (document.readyState === "complete") {
+ document.getElementById("mask").style.display = "none"
+ }
+ }
function send_run_para(){
var run_parameters = []
var msg = {}
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index aa9d31d76..56234586e 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -227,12 +227,12 @@ footer .column{margin-bottom:0!important; padding-bottom:0!important;}
.STOPPED, .KILLED{display:inline-block;width:18px;height:18px;background:url("/img/icons.svg");background-position: -496px -52px;background-position: -459px -52px;}
.RUNNING{display:inline-block;width:18px;height:18px;background:url("/img/icons.svg");background-position: -496px -52px;background-position: -478px -52px;}
.i-bg-orange{background-position: -495px -51px;}
-.FAILED{display:inline-block;width:18px;height:18px;background:url("/img/icons.svg");background-position: -496px -52px;background-position: -532px -52px;}
+.FAILED,.START_FAILED{display:inline-block;width:18px;height:18px;background:url("/img/icons.svg");background-position: -496px -52px;background-position: -532px -52px;}
.i-bg-green{background-position: -441px -52px;}
.i-bg-used{background-position: -514px -52px;}
.icon-bind{background-position: -550px -52px;}
.icon-unbind{background-position: -568px -52px;}
-.CREATING, .STOPPING, .DELETING, .STARTING, .WAITING{display:inline-block;background-image:url('/img/loading.gif');background-repeat:no-repeat;width:16px;height:16px;background-size:16px 16px;margin-right:5px;}
+.CREATING, .STOPPING, .DELETING, .STARTING, .WAITING ,.INIT,.KILLING{display:inline-block;background-image:url('/img/loading.gif');background-repeat:no-repeat;width:16px;height:16px;background-size:16px 16px;margin-right:5px;}
.COMPLETED{display:inline-block;width:18px;height:18px;background:url("/img/icons.svg");background-position: -496px -52px;background-position: -441px -52px;}
.text_over{
{{else}}
@@ -305,17 +305,17 @@
{{end}}