Commit 365ea7ea by Takumi Imai

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

#49471 url変更

See merge request !2
parents e8e605b5 68a90cd7
...@@ -290,8 +290,8 @@ CHK_Common.postCommunication = function (url, params, method = 'post') { ...@@ -290,8 +290,8 @@ CHK_Common.postCommunication = function (url, params, method = 'post') {
CHK_Common.checkAuth = function (async = true) { CHK_Common.checkAuth = function (async = true) {
let params = {}; let params = {};
params.sid = CHK_Common.getSid; params.sid = CHK_Common.getSid;
params.cmd = CHK_CONSTANT.ACT_CMD.checkSession; const url = CHK_CONSTANT.URL.BASE_CMS + CHK_CONSTANT.URL.AUTH_SESSION;
CHK_Common.sendABookCheckApi(params, async, null, function () { CHK_Common.cmsAjax(url, params, async, null, function () {
CHK_Common.goUrlWithCurrentParams(CHK_CONSTANT.PAGE_NAME.LOGIN); CHK_Common.goUrlWithCurrentParams(CHK_CONSTANT.PAGE_NAME.LOGIN);
}); });
}; };
...@@ -49,6 +49,7 @@ CHK_CONSTANT.URL = { ...@@ -49,6 +49,7 @@ CHK_CONSTANT.URL = {
BASE_CMS: 'https://' + location.host + '/checkapi/web/', BASE_CMS: 'https://' + location.host + '/checkapi/web/',
BASE_WEB: 'abvw/html/', BASE_WEB: 'abvw/html/',
ALL_OPERATION_LIST: 'operationLIstWeb/getOperationList', ALL_OPERATION_LIST: 'operationLIstWeb/getOperationList',
AUTH_SESSION: 'getsession/checkAuthUser',
}; };
CHK_CONSTANT.LANG = { CHK_CONSTANT.LANG = {
......
...@@ -47,7 +47,6 @@ CHK_OL.init = function () { ...@@ -47,7 +47,6 @@ CHK_OL.init = function () {
*/ */
CHK_OL.getAllDataWeb = function (searchKeyword, sortIndex, searchStartDate, searchEndDate, operationGroupMasterId) { CHK_OL.getAllDataWeb = function (searchKeyword, sortIndex, searchStartDate, searchEndDate, operationGroupMasterId) {
let param = {}; let param = {};
param.cmd = CHK_CONSTANT.ACT_CMD.getOperationList;
param.sid = CHK_Common.getSid(); param.sid = CHK_Common.getSid();
param.operationGroupMasterId = searchKeyword; param.operationGroupMasterId = searchKeyword;
param.sort = sortIndex; param.sort = sortIndex;
...@@ -55,7 +54,7 @@ CHK_OL.getAllDataWeb = function (searchKeyword, sortIndex, searchStartDate, sear ...@@ -55,7 +54,7 @@ CHK_OL.getAllDataWeb = function (searchKeyword, sortIndex, searchStartDate, sear
param.endDate = searchEndDate; param.endDate = searchEndDate;
param.operationGroupMasterId = operationGroupMasterId; param.operationGroupMasterId = operationGroupMasterId;
const url = CHK_CONSTANT.URL.BASE_CMS + ALL_OPERATION_LIST; const url = CHK_CONSTANT.URL.BASE_CMS + CHK_CONSTANT.URL.ALL_OPERATION_LIST;
CHK_Common.cmsAjax(url, param, false, function (json) { CHK_Common.cmsAjax(url, param, false, function (json) {
CHK_OL.operationList = json.operationList; CHK_OL.operationList = json.operationList;
......
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