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

Merge pull request #2910 from jumpserver/bugfix 

[Update] 修改日期显示差8小时
pull/2926/head
老广 2019-07-09 12:06:18 +08:00 committed by GitHub
parent c0cff6d1fe 05438baad9
commit cedf0e4532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/assets/templates/assets/asset_create.html
View File

@ -137,7 +137,6 @@ $(document).ready(function () {
protocolRef.val(protocolShould); protocolRef.val(protocolShould);
protocolRef.trigger("change") protocolRef.trigger("change")
} }
}) })
.on("click", ".btn-protocol.btn-del", function () { .on("click", ".btn-protocol.btn-del", function () {
$(this).parent().parent().remove(); $(this).parent().parent().remove();

3
apps/static/js/jumpserver.js
View File

@ -1111,7 +1111,8 @@ function objectAttrsIsBool(obj, attrs) {
function formatDateAsCN(d) { function formatDateAsCN(d) {
var date = new Date(d); var date = new Date(d);
return date.toISOString().replace("T", " ").replace(/\..*/, ""); var date_s = date.toLocaleString(navigator.language, {hour12: false});
return date_s.split("/").join('-')
} }
function getUrlParams(url) { function getUrlParams(url) {