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
6278daf0
Commit
6278daf0
authored
Dec 22, 2022
by
Kang Donghun
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web'
Feature/1.0 check web dev See merge request
!127
parents
39f76b03
1fa5ad10
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
5 deletions
+17
-5
abweb/common/json/lang/lang-en.json
+1
-0
abweb/common/json/lang/lang-ja.json
+1
-0
abweb/common/json/lang/lang-ko.json
+1
-0
abweb/js/reportList/reportList.js
+14
-5
No files found.
abweb/common/json/lang/lang-en.json
View file @
6278daf0
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
"txtLoginDate"
:
"Login Date"
,
"txtLoginDate"
:
"Login Date"
,
"accountInformation"
:
"Account Information"
,
"accountInformation"
:
"Account Information"
,
"errorOccurred"
:
"Error Occurred"
,
"errorOccurred"
:
"Error Occurred"
,
"onlyPrintCms"
:
"This I/O report can be output from only Administration screens."
,
"msgLogoutConfirm"
:
"Do you want to Logout?"
,
"msgLogoutConfirm"
:
"Do you want to Logout?"
,
"msgEssential"
:
"{0} is required"
,
"msgEssential"
:
"{0} is required"
,
"pdfPrint"
:
"PDF Print"
,
"pdfPrint"
:
"PDF Print"
,
...
...
abweb/common/json/lang/lang-ja.json
View file @
6278daf0
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
"txtLoginDate"
:
"ログイン日時"
,
"txtLoginDate"
:
"ログイン日時"
,
"accountInformation"
:
"アカウント情報"
,
"accountInformation"
:
"アカウント情報"
,
"errorOccurred"
:
"エラーが発生しました"
,
"errorOccurred"
:
"エラーが発生しました"
,
"onlyPrintCms"
:
"この帳票は管理画面からのみ出力できます。"
,
"msgLogoutConfirm"
:
"ログアウトしますか?"
,
"msgLogoutConfirm"
:
"ログアウトしますか?"
,
"msgEssential"
:
"{0}は必須です。"
,
"msgEssential"
:
"{0}は必須です。"
,
"pdfPrint"
:
"PDF出力"
,
"pdfPrint"
:
"PDF出力"
,
...
...
abweb/common/json/lang/lang-ko.json
View file @
6278daf0
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
"txtLoginDate"
:
"로그인 일시"
,
"txtLoginDate"
:
"로그인 일시"
,
"accountInformation"
:
"계정 정보"
,
"accountInformation"
:
"계정 정보"
,
"errorOccurred"
:
"오류가 발생했습니다"
,
"errorOccurred"
:
"오류가 발생했습니다"
,
"onlyPrintCms"
:
"해당 IO장표는 관리화면에서만 출력 가능합니다."
,
"msgLogoutConfirm"
:
"로그아웃 하시겠습니까?"
,
"msgLogoutConfirm"
:
"로그아웃 하시겠습니까?"
,
"pdfPrint"
:
"PDF 출력"
,
"pdfPrint"
:
"PDF 출력"
,
"msgOperationEmpty"
:
"작업 데이터가 없습니다."
,
"msgOperationEmpty"
:
"작업 데이터가 없습니다."
,
...
...
abweb/js/reportList/reportList.js
View file @
6278daf0
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
var
RL
=
{};
var
RL
=
{};
RL
.
isQuickReport
;
RL
.
isQuickReport
;
RL
.
isQRTableInspect
;
/**
/**
* init
* init
...
@@ -16,8 +17,11 @@
...
@@ -16,8 +17,11 @@
COMMON
.
showLoading
();
COMMON
.
showLoading
();
COMMON
.
checkAuth
(
false
);
COMMON
.
checkAuth
(
false
);
COMMON
.
checkQuickReport
(
function
(
result
)
{
COMMON
.
checkQuickReport
(
function
(
result
)
{
if
(
result
)
RL
.
isQuickReport
=
result
.
isQuickReport
;
if
(
result
)
{
}
);
RL
.
isQuickReport
=
result
.
isQuickReport
;
RL
.
isQRTableInspect
=
result
.
isQRTableInspect
;
};
});
RL
.
loadCommon
();
RL
.
loadCommon
();
RL
.
initTaskReportList
();
RL
.
initTaskReportList
();
COMMON
.
closeLoading
();
COMMON
.
closeLoading
();
...
@@ -87,16 +91,21 @@
...
@@ -87,16 +91,21 @@
/**
/**
* load main title callcack
* load main title callcack
*/
*/
RL
.
loadMainTitleCallback
=
function
()
{
RL
.
loadMainTitleCallback
=
function
()
{
//add dashboard setting item
//add dashboard setting item
if
(
RL
.
isQuickReport
)
{
if
(
RL
.
isQuickReport
)
{
var
elmA
=
$
(
'<div id="btnPdfPrint" onclick="RL.goPdfPrint();">'
);
var
elmA
;
if
(
RL
.
isQRTableInspect
)
{
elmA
=
$
(
"<div id=
\"
btnPdfPrint
\"
onclick=
\"
COMMON.showAlert('onlyPrintCms');
\"
>"
);
}
else
{
elmA
=
$
(
'<div id="btnPdfPrint" onclick="RL.goPdfPrint();">'
);
}
let
elmImg
=
$
(
'<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">'
);
let
elmImg
=
$
(
'<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">'
);
elmImg
.
attr
(
'title'
,
I18N
.
i18nText
(
'reportList'
));
elmImg
.
attr
(
'title'
,
I18N
.
i18nText
(
'reportList'
));
elmA
.
append
(
elmImg
);
elmA
.
append
(
elmImg
);
$
(
'#mainTitleHeader'
).
after
(
elmA
);
$
(
'#mainTitleHeader'
).
after
(
elmA
);
}
}
};
};
/**
/**
* go pdf print
* go pdf print
...
...
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