Skip to content

C
check
Commit f7ba2d01 by Takumi Imai
Options

Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web' 

#50850　Edgeだと作業が開かない

See merge request !96
parents d2f8abf8 e26349c7
Showing with 13 additions and 10 deletions
abweb/html/reportForm.html
......@@ -26,12 +26,6 @@
<script type="text/javascript" src="../js/template/template.js"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
<script type="text/javascript">
$(document).ready(function () {
RF.init();
COMMON.closeLoading();
});
</script>
</head>
<body>
......
abweb/js/reportForm/reportForm.js
......@@ -6,17 +6,26 @@
var RF = {};
RF.addReportFlg;
RF.interval = setInterval(RF.init(), 500);
/**
* init
*/
RF.init = function () {
COMMON.showLoading();
let count = 0;
if (new COMMON.sysSetting() != null) {
clearInterval(set_interval_id);
} else {
count++;
if (count >= 5) {
clearInterval(set_interval_id);
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
}
return;
}
//Check if user is logged in
// for COMMON.sysSetting()
setTimeout(function () {
COMMON.checkAuth(false);
}, 1000);
COMMON.checkAuth(false);
COMMON.checkQuickReport(function (result) {
if (result) {
RF.addReportFlg = result.addReportFlg;
......
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