Skip to content

C
check
Commit 953d3ece by Kang Donghun
Options

ローディング表示修正

parent 2fd810a4
Showing with 6 additions and 3 deletions
abweb/html/reportList.html
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</head> </head>
<body> <body>
<div id="loader"></div> <div id="loader" style="display: none;"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
......
abweb/js/reportForm/reportForm.js
...@@ -22,7 +22,7 @@ RF.init = function () { ...@@ -22,7 +22,7 @@ RF.init = function () {
RF.loadCommon = function () { RF.loadCommon = function () {
TEMPLATE.loadHeader('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal'); TEMPLATE.loadConfirmModal('#includedConfirmModal');
RF.initBreadcrumb();
}; };
/** /**
...@@ -79,7 +79,8 @@ RF.initBreadcrumb = function () { ...@@ -79,7 +79,8 @@ RF.initBreadcrumb = function () {
} }
} else { } else {
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType"); if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
if (addReportFlg == "1") { console.log("kdh check addReportFlg = " + addReportFlg);
if (addReportFlg == 1) {
navs = [ navs = [
{ {
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST, titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
...@@ -135,6 +136,7 @@ RF.initFormView = function () { ...@@ -135,6 +136,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; 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 () { $('#report-form').load(url, params, function () {
initPageLoad(); initPageLoad();
RF.initBreadcrumb();
COMMON.closeLoading(); COMMON.closeLoading();
}); });
} else { } else {
......
abweb/js/reportList/reportList.js
...@@ -11,6 +11,7 @@ var RL = {}; ...@@ -11,6 +11,7 @@ var RL = {};
*/ */
RL.init = function () { RL.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.showLoading();
COMMON.checkAuth(false); COMMON.checkAuth(false);
console.log('ReportList init start'); console.log('ReportList init start');
RL.checkQuickReport(); RL.checkQuickReport();
......
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