Skip to content

C
check
Commit 99c390bf by Takumi Imai
Options

#49772　デザイン適応(仮)

parent 0d9c2c98
Showing with 118 additions and 2 deletions
abweb/html/index.html
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<script src="../common/js/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script> <script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script> <script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__" defer></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
......
abweb/html/reportForm.html 0 → 100644
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title class="lang" lang="reportList"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/style.css">
<!-- vender css -->
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/fontawesome_relative_path.css">
<script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/web/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript">
</script>
</head>
<body onload="RF.init();">
<!-- header -->
<div id="includedHeader"></div>
<!-- report list -->
<main>
<div class="container">
<!-- breadcrumb -->
<nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0">
<li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>
<li class="breadcrumb-item active" aria-current="page"><span>報告一覧</span></li>
<li class="breadcrumb-item active" aria-current="page"><span>報告</span></li>
</ol>
</nav>
<!-- title -->
<div class="d-flex align-items-center">
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto">報告</h1>
<div style="display: none;">
<div><span style="font-size:18px;">定期点検期間</span></div>
<div><span id="inspectDate"></span></div>
</div>
<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">
</div>
</div>
</div>
</main>
<div class="container-fluid mb-5" id="report-form"></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="../common/js/newdash/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/newdash/common.js?__UPDATEID__"></script>
</body>
</html>
abweb/js/operationList/operationList.js
...@@ -507,8 +507,13 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe ...@@ -507,8 +507,13 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe
//save operation logs. needed for sorting //save operation logs. needed for sorting
OL.saveOperationReadingLog(operationId, operationType, reportType); OL.saveOperationReadingLog(operationId, operationType, reportType);
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
sessionStorage.OL_operationId = operationId; if (enableAddReport == '1' || reportType == CONSTANT.REPORT_TYPE.ROUTINE) {
COMMON.avwScreenMove("reportList.html"); sessionStorage.OL_operationId = operationId;
COMMON.avwScreenMove('reportList.html');
} else {
const url = 'reportForm.html?operationId=' + operationId;
COMMON.avwScreenMove(url);
}
}; };
/** /**
......
abweb/js/reportForm/reportForm.js 0 → 100644
// ReportForm function js
var RF = {};
RF.init = function (operationId, taskKey, replyNo, processKey, phaseNo) {
// COMMON.checkAuth(true);
RF.loadCommon();
RF.initFormView();
};
RF.loadCommon = function () {
$('#includedHeader').load('../html/common/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$('#includedConfirmModal').load('../html/common/confirm-modal.html', function () {
I18N.initi18n();
});
};
RF.initFormView = function () {
const urlParameterList = COMMON.getUrlParameter();
const operationId = urlParameterList['operationId'];
if (operationId) {
let params = {};
params.sid = COMMON.getSid();
params.operationId = operationId;
// params.taskKey = taskKey;
// params.replyNo = replyNo;
// params.processKey = processKey;
// params.phaseNo = phaseNo;
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);
} else {
COMMON.displayAlert('error');
COMMON.avwScreenMove('taskList.html');
}
};
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