Commit 310fb42a by Takumi Imai

修正

parent 684f3747
......@@ -35,6 +35,13 @@ CONSTANT.REPORT_TYPE = {
WORKFLOW: '3',
};
CONSTANT.REPORT_TYPE_INT = {
REPORT: 0,
ROUTINE: 1,
ANSWER: 2,
WORKFLOW: 3,
};
CONSTANT.ADD_REPORT_FLG = {
UNABLE: '0',
ABLE: '1',
......
......@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/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 src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/validation.js"></script>
<script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script>
......
......@@ -20,11 +20,11 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../js/header/header.js"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
......
......@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
......
......@@ -27,7 +27,6 @@
<script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
......
......@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script>
......
......@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/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 src="../common/js/header.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
......
......@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/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 src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/reportList/reportList.js?__UPDATEID__"></script>
......
......@@ -15,8 +15,6 @@ DASHBOARD.pickupItems = [
DASHBOARD.communicationItems = [
{ id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'messageListTitle' },
{ id: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessageTitle' },
{ id: 'distanceSupport', href: 'javascript:DASHBOARD.goDistanceSupport();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_remote.svg' }, msg: 'distanceSupportTitle' },
{ id: 'chat', href: 'javascript:DASHBOARD.goChat();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_chat.svg' }, msg: 'chatTitle' },
];
/** Default dashboard setting data */
......
......@@ -82,17 +82,15 @@ HEADER.processLogout = function () {
* Go page of operationList
*/
HEADER.goOperationList = function () {
$('#footer').load(CONSTANT.PAGE_NAME.FOOTER, function () {
sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
HEADER.activeInitBottomNav('operationListBottomNav');
TOP.showPage(CONSTANT.PAGE_NAME.OPERATION_LIST);
});
sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
OL.init();
};
/**
* Go page of dashboard
*/
HEADER.goDashboard = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
COMMON.avwScreenMove('dashboard.html');
};
......
......@@ -148,16 +148,16 @@ OL.createOperationList = function (operationList) {
for (let i = 0; i < operationList.length; i++) {
let classIcon;
switch (operationList[i].reportType) {
case OL.REPORT_TYPE.REPORTONLY:
case CONSTANT.REPORT_TYPE_INT.REPORT:
classIcon = 'report';
break;
case OL.REPORT_TYPE.INSPECT:
case CONSTANT.REPORT_TYPE_INT.ROUTINE:
classIcon = 'inspection';
break;
case OL.REPORT_TYPE.WITHREPLY:
case CONSTANT.REPORT_TYPE_INT.ANSWER:
classIcon = 'questionary';
break;
case OL.REPORT_TYPE.WORKFLOW:
case CONSTANT.REPORT_TYPE_INT.WORKFLOW:
classIcon = 'proccess';
break;
}
......
......@@ -15,7 +15,6 @@ RF.init = function () {
RF.loadCommon();
RF.initFormView();
COMMON.closeLoading();
};
/**
......@@ -55,6 +54,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();
COMMON.closeLoading();
});
} else {
COMMON.avwScreenMove('index.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