#49471 ファイル編集

abvw/common/js/common.js

@@ -173,7 +173,7 @@ COMMON.alertClose = function () {
  */
  */
 COMMON.goUrlWithCurrentParams = function (url, params) {
 COMMON.goUrlWithCurrentParams = function (url, params) {
     if (!params) {
     if (!params) {
-        location.href = CONSTANT.URL.BASE_WEB + url;
+        location.href = CONSTANT.URL.WEB.BASE + url;
     }
     }
 
 
     const mixParams = Object.assign(COMMON.getUrlParameter(), params);
     const mixParams = Object.assign(COMMON.getUrlParameter(), params);
@@ -310,7 +310,7 @@ COMMON.checkAuth = function (async = true) {
     let params = {};
     let params = {};
     params.sid = COMMON.getSid;
     params.sid = COMMON.getSid;
     var urlPath = ClientData.userInfo_accountPath();
     var urlPath = ClientData.userInfo_accountPath();
-    const url = CONSTANT.URL.BASE_CMS + urlPath + CONSTANT.URL.BASE_CHECKAPI + CONSTANT.URL.AUTH_SESSION;
+    const url = CONSTANT.URL.CMS.BASE + urlPath + CONSTANT.URL.CMS.API.BASE + CONSTANT.URL.CMS.API.AUTH_SESSION;
     COMMON.cmsAjax(url, params, async, null, function () {
     COMMON.cmsAjax(url, params, async, null, function () {
         COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
         COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
     });
     });

abvw/common/js/constant.js

@@ -42,16 +42,24 @@ CONSTANT.ADD_REPORT_FLG = {
 };
 };
 
 
 CONSTANT.URL = {
 CONSTANT.URL = {
-    // BASE_CMS: 'https://' + location.host + '/checkapi/web/',
-    BASE_CMS: 'http://localhost:8080/acms/',
-    BASE_CHECKAPI: '/checkapi/web/',
-    BASE_HTML: '/checkapi/web/html/',
-    BASE_WEB: 'abvw/html/',
-    ALL_OPERATION_LIST: 'operationListWeb/getOperationList',
-    AUTH_SESSION: 'getSession/checkAuthUser',
-    TASK_REPORT_LIST: 'getTaskReport/index',
-    ENTRY_REPORT: 'getReport???', //未定
-    OPERATION_VIEW_LOG: 'operationViewLog/saveLog',
+    CMS: {
+        // BASE_CMS: 'https://' + location.host + '/checkapi/web/',
+        BASE: 'http://localhost:8080/acms/',
+        API: {
+            BASE: '/checkapi/web/',
+            ALL_OPERATION_LIST: 'operationListWeb/getOperationList',
+            AUTH_SESSION: 'getSession/checkAuthUser',
+            OPERATION_VIEW_LOG: 'operationViewLog/saveLog',
+        },
+        HTML: {
+            BASE: '/checkapi/web/html/',
+            TASK_REPORT_LIST: 'getTaskReport/index',
+            ENTRY_REPORT: 'getReport???', //未定
+        },
+    },
+    WEB: {
+        BASE: 'abvw/html/',
+    },
 };
 };
 
 
 CONSTANT.LANG = {
 CONSTANT.LANG = {

abvw/js/operationList/operationList.js

@@ -53,7 +53,7 @@ OL.getAllDataWeb = function (searchKeyword, sortIndex, searchStartDate, searchEn
     param.startDate = searchStartDate;
     param.startDate = searchStartDate;
     param.endDate = searchEndDate;
     param.endDate = searchEndDate;
     param.operationGroupMasterId = operationGroupMasterId;
     param.operationGroupMasterId = operationGroupMasterId;
-    const url = CONSTANT.URL.BASE_CMS + ClientData.userInfo_accountPath() + CONSTANT.URL.BASE_CHECKAPI + CONSTANT.URL.ALL_OPERATION_LIST;
+    const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + CONSTANT.URL.CMS.API.ALL_OPERATION_LIST;
 
 
     COMMON.cmsAjax(url, param, false, function (json) {
     COMMON.cmsAjax(url, param, false, function (json) {
         OL.operationList = json.operationList;
         OL.operationList = json.operationList;
@@ -481,7 +481,7 @@ OL.saveOperationReadingLog = function (operationId, operationType, reportType) {
     params.operationType = operationType;
     params.operationType = operationType;
     params.reportType = reportType;
     params.reportType = reportType;
     params.viewingStartDate = COMMON.currentTime();
     params.viewingStartDate = COMMON.currentTime();
-    const url = CONSTANT.URL.BASE_CMS + ClientData.userInfo_accountPath() + CONSTANT.URL.BASE_CHECKAPI + CONSTANT.URL.OPERATION_VIEW_LOG;
+    const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + CONSTANT.URL.CMS.API.OPERATION_VIEW_LOG;
     COMMON.cmsAjax(url, params, false);
     COMMON.cmsAjax(url, params, false);
 };
 };
 
 
@@ -493,10 +493,10 @@ OL.saveOperationReadingLog = function (operationId, operationType, reportType) {
  * @returns url
  * @returns url
  */
  */
 OL.createUrlOfOperation = function (enableAddReport, reportType) {
 OL.createUrlOfOperation = function (enableAddReport, reportType) {
-    let baseUrl = CONSTANT.URL.BASE_CMS + ClientData.userInfo_accountPath() + CONSTANT.URL.BASE_HTML;
+    let baseUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE;
     if (reportType == CONSTANT.REPORT_TYPE.ROUTINE || enableAddReport == '1') {
     if (reportType == CONSTANT.REPORT_TYPE.ROUTINE || enableAddReport == '1') {
-        return baseUrl + CONSTANT.URL.TASK_REPORT_LIST;
+        return baseUrl + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
     } else {
     } else {
-        return baseUrl + CONSTANT.URL.ENTRY_REPORT;
+        return baseUrl + CONSTANT.URL.CMS.HTML.ENTRY_REPORT;
     }
     }
 };
 };