Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
365ea7ea
Commit
365ea7ea
authored
Oct 05, 2022
by
Takumi Imai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/1.0_check_web_imai' into 'feature/1.0_check_web_dev'
#49471 url変更 See merge request
!2
parents
e8e605b5
68a90cd7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
abvw/common/js/appCommon/check-common.js
+2
-2
abvw/common/js/appCommon/constant.js
+1
-0
abvw/js/operationList/operationList.js
+1
-2
No files found.
abvw/common/js/appCommon/check-common.js
View file @
365ea7ea
...
@@ -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
);
});
});
};
};
abvw/common/js/appCommon/constant.js
View file @
365ea7ea
...
@@ -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
=
{
...
...
abvw/js/operationList/operationList.js
View file @
365ea7ea
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment