YAO/YAO-portal
1
0
Fork 0
mirror of https://github.com/newnius/YAO-portal.git synced 2025-06-07 07:31:56 +00:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Newnius 2020-06-08 20:24:41 +08:00
parent 44302c9c12
commit 20b92071e1
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modals.php
View File

@ -82,20 +82,21 @@
<input type="text" id="form-job-name" class="form-control" maxlength="64" <input type="text" id="form-job-name" class="form-control" maxlength="64"
placeholder="A readable job name" required/> placeholder="A readable job name" required/>
</div> </div>
<label>Workspace</label> <label>Input Dir</label>
<div class="form-group form-group-lg"> <div class="form-group form-group-lg">
<label for="form-job-workspace" class="sr-only">Workspace</label> <label for="form-job-workspace" class="sr-only">Workspace</label>
<select id="form-job-workspace" class="form-control"> <select id="form-job-workspace" class="form-control">
<option value="">None</option> <option value="">None</option>
</select> </select>
</div> </div>
<label>Virtual Cluster</label> <label>Queue</label>
<div class="form-group form-group-lg"> <div class="form-group form-group-lg">
<label for="form-job-cluster" class="sr-only">Virtual Cluster</label> <label for="form-job-cluster" class="sr-only">Virtual Cluster</label>
<select id="form-job-cluster" class="form-control"> <select id="form-job-cluster" class="form-control">
<option value="1">default</option> <option value="1">default</option>
</select> </select>
</div> </div>
<label>Priority</label> <label>Priority</label>
<div class="form-group form-group-lg"> <div class="form-group form-group-lg">
<label for="form-job-priority" class="sr-only">Job Priority</label> <label for="form-job-priority" class="sr-only">Job Priority</label>
@ -106,6 +107,7 @@
<option value="1">Low</option> <option value="1">Low</option>
</select> </select>
</div> </div>
<!--
<label>Locality</label> <label>Locality</label>
<div class="form-group form-group-lg"> <div class="form-group form-group-lg">
<label for="form-job-locality" class="sr-only">Locality</label> <label for="form-job-locality" class="sr-only">Locality</label>
@ -115,6 +117,7 @@
<option value="-1">Negative</option> <option value="-1">Negative</option>
</select> </select>
</div> </div>
-->
<label class="hidden">Run Before</label> <label class="hidden">Run Before</label>
<div class="form-group form-group-lg hidden"> <div class="form-group form-group-lg hidden">
<div class='input-group date date-picker'> <div class='input-group date date-picker'>
@ -169,7 +172,7 @@
<option value="0" selected>Worker</option> <option value="0" selected>Worker</option>
</select> </select>
</div> </div>
<div class="col-md-1"> <div class="col-md-2">
<label>CPU</label> <label>CPU</label>
<div class="form-group"> <div class="form-group">
<input type="number" class="form-control task-cpu" step="1" min="1" value="1" <input type="number" class="form-control task-cpu" step="1" min="1" value="1"
@ -183,7 +186,7 @@
value="4096" placeholder="MB" required/> value="4096" placeholder="MB" required/>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2 hidden">
<label>GPU Model<abbr title="preferred GPU model">?</abbr></label> <label>GPU Model<abbr title="preferred GPU model">?</abbr></label>
<select class="form-control form-control task-gpu-model" required> <select class="form-control form-control task-gpu-model" required>
<option value="k40">K40</option> <option value="k40">K40</option>
@ -191,7 +194,7 @@
<option value="P100">P100</option> <option value="P100">P100</option>
</select> </select>
</div> </div>
<div class="col-md-1"> <div class="col-md-2">
<label>GPU</label> <label>GPU</label>
<div class="form-group"> <div class="form-group">
<input type="number" class="form-control task-gpu-num" step="1" min="1" value="1" <input type="number" class="form-control task-gpu-num" step="1" min="1" value="1"

7
static/job.js
View File

@ -150,7 +150,7 @@ function load_jobs(scope) {
formatter: workspaceFormatter formatter: workspaceFormatter
}, { }, {
field: 'group', field: 'group',
title: 'Virtual Cluster', title: 'Group',
align: 'center', align: 'center',
valign: 'middle', valign: 'middle',
formatter: clusterFormatter formatter: clusterFormatter
@ -431,7 +431,7 @@ window.jobStatusOperateEvents = {
}, },
'click .download': function (e, value, row, index) { 'click .download': function (e, value, row, index) {
var job = getParameterByName('name'); var job = getParameterByName('name');
var task = row.id; var task = row.hostname;
var ajax = $.ajax({ var ajax = $.ajax({
url: "service?action=task_logs", url: "service?action=task_logs",
@ -445,8 +445,9 @@ window.jobStatusOperateEvents = {
if (res["errno"] !== 0) { if (res["errno"] !== 0) {
$("#modal-msg-content").html(res["msg"]); $("#modal-msg-content").html(res["msg"]);
$("#modal-msg").modal('show'); $("#modal-msg").modal('show');
} else {
download(res['logs'], job + '_' + task + '.txt', "text/plain");
} }
download(res['logs'], job + '_' + task + '.txt', "text/plain");
}); });
ajax.fail(function (jqXHR, textStatus) { ajax.fail(function (jqXHR, textStatus) {
$("#modal-msg-content").html("Request failed : " + jqXHR.statusText); $("#modal-msg-content").html("Request failed : " + jqXHR.statusText);