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
893393f8
Commit
893393f8
authored
Oct 08, 2021
by
Kim Eunchul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#44346 【Check Win 1.4.0_2】縦画面で「カテゴリ」を表示すると、カテゴリ表示が欠ける
parent
9b3a8d07
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
15 deletions
+8
-15
app/script/check.js
+8
-15
No files found.
app/script/check.js
View file @
893393f8
...
...
@@ -45,7 +45,6 @@ CHK.pushMessage; //コミュニケーションデータ
var
scanResultCode
;
//スキャンしたRFID,バーコード
var
pageLang
;
// ページ設定言語
var
isSetCategory
=
true
var
CATEGORY_HEIGHT
;
//カテゴリー描画用固定値(高さ)
var
msgMap
=
{
// velocity?
all
:{
ja
:
"全て"
,
ko
:
"전체"
,
en
:
"All"
},
...
...
@@ -425,14 +424,6 @@ CHK.initReportApp = function (callback) {
//作業一覧描画
CHK
.
createOperationList
(
CHK
.
operation
.
operationList
);
//カテゴリー高さ固定
if
(
isSetCategory
){
CATEGORY_HEIGHT
=
$
(
'footer'
).
offset
().
top
-
$
(
'#category-menu'
).
offset
().
top
;
console
.
log
(
CATEGORY_HEIGHT
);
isSetCategory
=
false
}
$
(
"#category-menu"
).
css
(
"overflow"
,
"scroll"
);
$
(
'#category-menu'
).
height
(
CATEGORY_HEIGHT
-
16
);
$
(
'#overlayDiv'
).
height
(
CATEGORY_HEIGHT
);
});
// カテゴリーJSONデータ
...
...
@@ -451,6 +442,10 @@ CHK.initReportApp = function (callback) {
CHK
.
loadJson
(
CHK
.
jsonPath
.
pushMessageList
,
function
(
json
)
{
});
//カテゴリー高さ固定
setTimeout
(
function
(){
CHK
.
setCategoryHeight
();
},
500
);
}
/**
...
...
@@ -458,12 +453,10 @@ CHK.initReportApp = function (callback) {
*/
CHK
.
setCategoryHeight
=
function
()
{
//カテゴリー高さ固定
if
(
isSetCategory
){
CATEGORY_HEIGHT
=
$
(
'main'
).
height
();
console
.
log
(
CATEGORY_HEIGHT
);
isSetCategory
=
false
}
$
(
'#category-menu'
).
height
(
CATEGORY_HEIGHT
);
CATEGORY_HEIGHT
=
$
(
'footer'
).
offset
().
top
-
$
(
'#category-menu'
).
offset
().
top
;
console
.
log
(
CATEGORY_HEIGHT
);
$
(
"#category-menu"
).
css
(
"overflow"
,
"scroll"
);
$
(
'#category-menu'
).
height
(
CATEGORY_HEIGHT
-
16
);
$
(
'#overlayDiv'
).
height
(
CATEGORY_HEIGHT
);
}
...
...
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