github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 修改列表日期

pull/2995/head
BaiJiangJie 2019-07-19 12:55:43 +08:00
parent d93fe11373
commit 63c2343d2c
7 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/assets/templates/assets/_asset_user_list.html
View File

@ -51,8 +51,7 @@ function initAssetUserTable() {
} else {
innerHtml = '<i class="fa fa-circle text-warning"></i>'
}
var date = new Date(cellData.datetime);
var dateManual = date.toLocaleString();
var dateManual = formatDateAsCN(cellData.datetime);
var dataContent = testDatetime + dateManual;
innerHtml = "<a data-toggle='popover' data-content='" + dataContent + "'" + 'data-placement="auto bottom"' + ">" + innerHtml + "</a>";
$(td).html(innerHtml);

3
apps/assets/templates/assets/asset_list.html
View File

@ -159,8 +159,7 @@ function initTable() {
} else {
innerHtml = '<i class="fa fa-circle text-warning"></i>'
}
var date = new Date(cellData.datetime);
var dateManual = date.toLocaleString();
var dateManual = formatDateAsCN(cellData.datetime);
var dataContent = testDatetime + dateManual;
innerHtml = "<a data-toggle='popover' data-content='" + dataContent + "'" + 'data-placement="auto bottom"' + ">" + innerHtml + "</a>";
$(td).html(innerHtml);

2
apps/ops/templates/ops/adhoc_history.html
View File

@ -82,7 +82,7 @@ function initTable() {
select: [],
columnDefs: [
{targets: 1, createdCell: function (td, cellData, rowData) {
var d = new Date(cellData);
var d = formatDateAsCN(cellData);
$(td).html(d);
}},
{targets: 2, createdCell: function (td, cellData) {

4
apps/ops/templates/ops/task_adhoc.html
View File

@ -109,8 +109,8 @@ $(document).ready(function () {
}
}},
{targets: 6, createdCell: function (td, cellData) {
var d = new Date(cellData);
$(td).html(d.toLocaleString())
var d = formatDateAsCN(cellData);
$(td).html(d)
}},
{targets: 7, createdCell: function (td, cellData, rowData) {
var detail_btn = '<a class="btn btn-xs btn-primary m-l-xs btn-run" href="{% url 'ops:adhoc-detail' pk=DEFAULT_PK %}">{% trans "Detail" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);

5
apps/ops/templates/ops/task_history.html
View File

@ -88,8 +88,9 @@ function initTable() {
select: [],
columnDefs: [
{targets: 1, createdCell: function (td, cellData, rowData) {
var d = new Date(cellData);
$(td).html(d.toLocaleString());
var d = formatDateAsCN(cellData);
$(td).html(d);
}},
{targets: 2, createdCell: function (td, cellData) {
var total = "<span>" + cellData.total + "</span>";

6
apps/terminal/templates/terminal/command_list.html
View File

@ -89,14 +89,16 @@ $(document).ready(function () {
language: navigator.language || "en",
};
dateFromRef.datepicker(options).on("changeDate", function () {
var date = new Date($(this).val() + ' 0:0:0');
var value = $(this).val() + ' 0:0:0';
var date = safeDate(value);
var url = table.ajax.url();
url = setUrlParam(url, "date_from", date.getTime()/1000);
table.ajax.url(url);
table.ajax.reload();
});
dateToRef.datepicker(options).on("changeDate", function () {
var date = new Date($(this).val() + ' 23:59:59');
var value = $(this).val() + ' 23:59:59';
var date = safeDate(value);
var url = table.ajax.url();
url = setUrlParam(url, "date_to", date.getTime()/1000);
table.ajax.url(url);

12
apps/terminal/templates/terminal/session_list.html
View File

@ -104,8 +104,8 @@ var dateFrom = "{{ date_from.timestamp }}";
var dateTo = "{{ date_to.timestamp }}";
function initTable() {
dateFrom = new Date(dateFrom * 1000).toISOString();
dateTo = new Date(dateTo * 1000).toISOString();
dateFrom = formatDateAsCN(dateFrom * 1000);
dateTo = formatDateAsCN(dateTo * 1000);
sessionListUrl = setUrlParam(sessionListUrl, "date_from", dateFrom);
sessionListUrl = setUrlParam(sessionListUrl, "date_to", dateTo);
var options = {
@ -201,9 +201,9 @@ $(document).ready(function() {
return
}
var value = $(this).val() + ' 0:0:0';
var date = new Date(value);
var date = formatDateAsCN(value);
var url = table.ajax.url();
url = setUrlParam(url, "date_from", date.toISOString());
url = setUrlParam(url, "date_from", date);
table.ajax.url(url);
table.ajax.reload();
});
@ -212,9 +212,9 @@ $(document).ready(function() {
return
}
var value = $(this).val() + ' 23:59:59';
var date = new Date(value);
var date = formatDateAsCN(value);
var url = table.ajax.url();
url = setUrlParam(url, "date_to", date.toISOString());
url = setUrlParam(url, "date_to", date);
table.ajax.url(url);
table.ajax.reload();
});