Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
design
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
abookCheck
design
Commits
d6a4e8c9
Commit
d6a4e8c9
authored
Aug 11, 2021
by
Lee JaeWon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
43780 カテゴリー一覧が画面上部でしか表示されない
parent
269de07f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
app/index.html
+1
-1
app/script/check.js
+10
-7
No files found.
app/index.html
View file @
d6a4e8c9
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
</header>
</header>
<section
class=
"category-menu"
>
<section
class=
"category-menu"
>
<div
class=
"overlay"
></div>
<div
id=
"overlayDiv"
class=
"overlay"
></div>
<nav
id=
"category-menu"
class=
"drawer-menu"
>
<nav
id=
"category-menu"
class=
"drawer-menu"
>
<div
class=
"d-flex justify-content-between border-bottom"
>
<div
class=
"d-flex justify-content-between border-bottom"
>
<h2
class=
"text-nowrap font-weight-bold fs-13 p-3 mb-0"
>
カテゴリー
</h2>
<h2
class=
"text-nowrap font-weight-bold fs-13 p-3 mb-0"
>
カテゴリー
</h2>
...
...
app/script/check.js
View file @
d6a4e8c9
...
@@ -43,6 +43,8 @@ CHK.operationGroupMasterRelation; //作業・カテゴリー関係データ
...
@@ -43,6 +43,8 @@ CHK.operationGroupMasterRelation; //作業・カテゴリー関係データ
CHK
.
pushMessage
;
//コミュニケーションデータ
CHK
.
pushMessage
;
//コミュニケーションデータ
var
pageLang
;
// ページ設定言語
var
pageLang
;
// ページ設定言語
var
isSetCategory
=
true
var
CATEGORY_HEIGHT
;
//カテゴリー描画用固定値(高さ)
var
msgMap
=
{
// velocity?
var
msgMap
=
{
// velocity?
all
:{
ja
:
"全て"
,
ko
:
"전체"
,
en
:
"All"
},
all
:{
ja
:
"全て"
,
ko
:
"전체"
,
en
:
"All"
},
inputLoginInfo
:
{
ja
:
"ログイン情報を入力してください"
,
ko
:
"로그인 정보를 입력해주세요."
,
en
:
"Please enter your login information"
},
inputLoginInfo
:
{
ja
:
"ログイン情報を入力してください"
,
ko
:
"로그인 정보를 입력해주세요."
,
en
:
"Please enter your login information"
},
...
@@ -410,6 +412,14 @@ CHK.initReportApp = function (callback) {
...
@@ -410,6 +412,14 @@ CHK.initReportApp = function (callback) {
CHK
.
operation
.
searchOperationList
=
json
.
operationList
;
CHK
.
operation
.
searchOperationList
=
json
.
operationList
;
//作業一覧描画
//作業一覧描画
CHK
.
createOperationList
(
CHK
.
operation
.
operationList
);
CHK
.
createOperationList
(
CHK
.
operation
.
operationList
);
//カテゴリー高さ固定
if
(
isSetCategory
){
CATEGORY_HEIGHT
=
$
(
'main'
).
height
();
console
.
log
(
CATEGORY_HEIGHT
);
isSetCategory
=
false
}
$
(
'#category-menu'
).
height
(
CATEGORY_HEIGHT
);
$
(
'#overlayDiv'
).
height
(
CATEGORY_HEIGHT
);
});
});
// カテゴリーJSONデータ
// カテゴリーJSONデータ
...
@@ -2836,7 +2846,6 @@ CHK.changeSortType = function(sortType) {
...
@@ -2836,7 +2846,6 @@ CHK.changeSortType = function(sortType) {
* 作業一覧描画
* 作業一覧描画
*/
*/
CHK
.
createOperationList
=
function
(
operationList
,
isSearched
=
false
)
{
CHK
.
createOperationList
=
function
(
operationList
,
isSearched
=
false
)
{
var
displayHeightForCategry
=
$
(
'#operationTable'
).
height
();
$
(
'#operationTable'
).
empty
();
$
(
'#operationTable'
).
empty
();
if
(
isSearched
)
{
if
(
isSearched
)
{
operationList
=
CHK
.
operation
.
searchOperationList
;
operationList
=
CHK
.
operation
.
searchOperationList
;
...
@@ -2925,12 +2934,6 @@ CHK.createOperationList = function(operationList, isSearched = false) {
...
@@ -2925,12 +2934,6 @@ CHK.createOperationList = function(operationList, isSearched = false) {
$
(
".table tbody"
).
append
(
operationTR
);
$
(
".table tbody"
).
append
(
operationTR
);
}
}
if
(
displayHeightForCategry
==
0
)
{
var
baseHeight
=
window
.
innerHeight
;
$
(
'#operationTable'
).
height
(
baseHeight
-
$
(
"body"
).
height
()
-
$
(
"footer"
).
height
());
}
else
{
$
(
'#operationTable'
).
height
(
displayHeightForCategry
);
}
};
};
/**Oper
/**Oper
...
...
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