Skip to content

C
check
Commit 79ca3bbd by Kang Donghun
Options

ローディング修正

parent f0c78053
Showing with 55 additions and 81 deletions
abweb/common/css/loading.css 0 → 100644
#loader {
position: fixed;
top: 0;
z-index: 999;
height: 100vh;
width: 100vw;
display: block;
background: rgb(255,255,255,.5);
background-position: center;
background-image: url("../img/loading.gif");
background-repeat: no-repeat;
background-size:200px;
display: none;
}
\ No newline at end of file
abweb/common/js/common.js
......@@ -20,7 +20,7 @@ COMMON.hasErrorKey = 'AVW_HASERR';
* @param {*} url
*/
COMMON.avwScreenMove = function (url) {
// COMMON.showLoading();
COMMON.showLoading();
window.onbeforeunload = null;
window.location = url;
};
......@@ -32,19 +32,16 @@ COMMON.avwScreenMove = function (url) {
* @param {String} key
*/
COMMON.showLoading = function () {
// $.LoadingOverlay('show', {
// image: '../common/img/loading.gif',
// });
document.getElementById('loader').style.display = 'block';
};
/**
* close loading
*/
COMMON.closeLoading = function () {
setTimeout(function () {
$('#contentFieldOrverlay').show();
// $.LoadingOverlay('hide');
}, 500);
setTimeout(function(){
document.getElementById('loader').style.display = 'none';
}, 1000);
};
/**
......@@ -167,10 +164,10 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
} else if (result.httpStatus == '401') {
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
} else if (result.httpStatus == '403') {
// COMMON.closeLoading();
COMMON.closeLoading();
COMMON.displayAlert('errorOccurred');
} else {
// COMMON.closeLoading();
COMMON.closeLoading();
COMMON.displayAlert(result.message);
}
},
......@@ -178,7 +175,7 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
if (errorCallback) {
errorCallback(XMLHttpRequest, textStatus, errorThrown);
} else {
// COMMON.closeLoading();
COMMON.closeLoading();
COMMON.displayAlert('errorCommunicationFailed');
}
},
......@@ -187,7 +184,7 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
if (errorCallback) {
errorCallback();
} else {
// COMMON.closeLoading();
COMMON.closeLoading();
COMMON.displayAlert('errorOccurred');
}
}
......@@ -965,25 +962,6 @@ COMMON.currentTime = function () {
return Date.now();
};
/**
* create UUID For token
*
*/
COMMON.generateUuid = function() {
var chars = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split("");
for (var i = 0, len = chars.length; i < len; i++) {
switch (chars[i]) {
case "x":
chars[i] = Math.floor(Math.random() * 16).toString(16);
break;
case "y":
chars[i] = (Math.floor(Math.random() * 4) + 8).toString(16);
break;
}
}
return chars.join("");
}
/*
* Operations for session storage [ end ]
*/
......
abweb/html/accountSetting.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -29,7 +30,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<!-- account setting -->
......@@ -98,7 +99,6 @@
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
abweb/html/dashboard.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -37,7 +38,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<!-- dashboard -->
......@@ -68,6 +69,5 @@
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/index.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -31,7 +32,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<!-- task list -->
......@@ -130,20 +131,6 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
<!--alert-->
<div class="alert-overlay d-none"></div>
<div class="alert-area d-none">
<i class="text-right fas fa-times fa-2x loading-close" onclick="COMMON.alertClose();"></i>
<div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div>
</div>
<!--loading-->
<div id="check_loading" style="display:none; position: relative; overflow:hidden;">
<p id="checkLoadingMessage"></p>
<div id="checkLoadingImage"><img src='######' /></div>
</div>
</div>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/login.html
......@@ -15,6 +15,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<link rel="stylesheet" type="text/css" href="../css/login/login.css">
......@@ -43,6 +44,7 @@
</head>
<body>
<div id="loader"></div>
<form class="form-login card">
<img class="mb-4 w-100 text-center" src="../common/img/logo.svg" alt="" height="60">
<div class="form-group mb-2">
......
abweb/html/pdfPrint.html
......@@ -10,6 +10,7 @@
<link href="../img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -36,7 +37,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
......@@ -63,7 +64,6 @@
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/pickup.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -41,7 +42,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<div id="includedHeader"></div>
<!-- pickup -->
<main>
......@@ -140,7 +141,6 @@
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/pushMessageDetail.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -33,7 +34,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<!-- message detail -->
......@@ -73,7 +74,6 @@
</main>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/pushMessageList.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -34,7 +35,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<div id="includedHeader"></div>
<!-- message list -->
<main>
......@@ -54,6 +55,5 @@
</main>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/reportForm.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -28,7 +29,7 @@
</head>
<body onload="RF.init();">
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
......@@ -41,6 +42,5 @@
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/reportList.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -35,7 +36,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
......@@ -47,7 +48,6 @@
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
abweb/html/sendMessage.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
......@@ -37,7 +38,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<div id="includedHeader"></div>
<!-- send message -->
<main>
......@@ -92,7 +93,6 @@
<div id="includeTemplateModal"></div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/js/login/login.js
......@@ -390,11 +390,11 @@ LOGIN.changeLanguage = function (lang) {
// Login click function
LOGIN.loginFunction = function () {
// COMMON.showLoading();
COMMON.showLoading();
if (LOGIN.checkValidation()) {
LOGIN.processLogin();
} else {
// COMMON.closeLoading();
COMMON.closeLoading();
}
};
......@@ -424,14 +424,14 @@ LOGIN.skipPassFunction = function () {
// Open Change Password Dialog
LOGIN.OpenChangePasswordDialog = function () {
$('#password-reset-modal').show();
// COMMON.showLoading();
COMMON.showLoading();
console.log('password open');
};
// Close Chnage Password Dialog
LOGIN.CloseChangePasswordDialog = function () {
$('#main-password-change').hide();
// COMMON.closeLoading();
COMMON.closeLoading();
};
// Save Service Option
......
abweb/js/operationList/operationList.js
......@@ -449,7 +449,7 @@ OL.sortOperationList = function (sortNumber) {
* search operarionList
*/
OL.search = function () {
// COMMON.showLoading();
COMMON.showLoading();
const searchKeyword = $('#searchTaskName').val();
const searchStartDate = $('#searchStartDate').val();
const searchEndDate = $('#searchEndDate').val();
......
abweb/js/reportForm/reportForm.js
......@@ -134,8 +134,7 @@ RF.initFormView = function () {
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
$('#report-form').load(url, params, function () {
initPageLoad();
$('#contentFieldOrverlay').show();
//COMMON.closeLoading();
COMMON.closeLoading();
});
} else {
COMMON.avwScreenMove('index.html');
......
abweb/js/reportList/reportList.js
......@@ -16,7 +16,7 @@ RL.init = function () {
RL.checkQuickReport();
RL.loadCommon();
RL.initTaskReportList();
// COMMON.closeLoading();
COMMON.closeLoading();
};
/**
......
abweb/js/setting/settings.js
......@@ -12,7 +12,7 @@ $(document).ready(function () {
SETTINGS.getToken();
SETTINGS.initScreen();
$('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
// COMMON.closeLoading();
COMMON.closeLoading();
});
SETTINGS.getToken = function () {
......
abweb/js/template/template.js
......@@ -6,7 +6,7 @@ var TEMPLATE = {};
/** template load header */
TEMPLATE.loadHeader = function (elmentId) {
// COMMON.showLoading();
COMMON.showLoading();
$(elmentId).load('../common/html/header.html', function () {
$('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment