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
fc809f5e
Commit
fc809f5e
authored
Jul 29, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RFIDサービスオプション関連修正
parent
e625e830
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
app/index.html
+2
-2
app/script/check.js
+9
-1
No files found.
app/index.html
View file @
fc809f5e
...
...
@@ -28,8 +28,8 @@
<i
class=
"fa fa-redo fs-12 p-1"
id=
"updateButton"
></i>
<span
class=
"d-none d-md-inline fs-10"
>
更新
</span>
</a>
<a
class=
"navbar-brand lht-0 d-none"
href=
"javascript:CHK.startScan();"
style=
"margin: 0 10px 0 10px;float: right;"
>
<i
class=
"fa fa-wifi fs-12 p-1"
id=
"rfidScanButton"
></i>
<a
class=
"navbar-brand lht-0 d-none"
id=
"rfidScanButton"
href=
"javascript:CHK.startScan();"
style=
"margin: 0 10px 0 10px;float: right;"
>
<i
class=
"fa fa-wifi fs-12 p-1"
></i>
<span
class=
"d-none d-md-inline fs-10"
>
スキャン
</span>
</a>
</nav>
...
...
app/script/check.js
View file @
fc809f5e
...
...
@@ -9,6 +9,7 @@ CHK.isIOS = false;
CHK
.
reportMode
=
"1"
;
//報告モード default1で、定期点検で変更される
CHK
.
debug
;
//1:デバッグモード
CHK
.
isMobile
;
//1:モバイル対応で表示
CHK
.
isRFIDBarcodeScan
;
//1:RFID,バーコードスキャン使用
CHK
.
reportType
;
//0:報告(Type1) 1:定期点検(Type2) 2:報告・回答(Type3) 3:複数工程(Type4)
CHK
.
useKrpano
=
true
;
//true:krpanoを使用 false:krpanoを使用しない
CHK
.
lookHotspot
;
//移動先ホットスポット保持用
...
...
@@ -276,6 +277,7 @@ CHK.initCommon = function() {
CHK
.
isWindows
=
urlParam
.
app
&&
urlParam
.
app
==
"windows"
;
// windowsアプリの対応追加 v1.1.0
CHK
.
isAndroid
=
urlParam
.
app
&&
urlParam
.
app
==
"android"
;
CHK
.
isIOS
=
urlParam
.
app
&&
urlParam
.
app
==
"ios"
;
CHK
.
isRFIDBarcodeScan
=
urlParam
.
isRFIDBarcodeScan
&&
urlParam
.
isRFIDBarcodeScan
==
"1"
;
CHK
.
sortIndex
=
urlParam
.
sortIndex
;
// ウェブの場合、作業一覧の表示広さを変更
if
(
CHK
.
isWeb
)
{
...
...
@@ -283,8 +285,14 @@ CHK.initCommon = function() {
}
// Windowsの場合、RFID未使用
if
(
CHK
.
isWindows
)
{
$
(
"#rfidScanButton"
).
parent
().
hide
();
$
(
"#rfidScanButton"
).
hide
();
}
// アンドロイド・IOSの場合スキャンオプションによってスキャン表示
if
((
CHK
.
isIOS
||
CHK
.
isAndroid
)
&&
CHK
.
isRFIDBarcodeScan
)
{
$
(
"#rfidScanButton"
).
removeClass
(
"d-none"
);
}
CHK
.
debug
=
urlParam
.
debug
;
CHK
.
isMobile
=
urlParam
.
mobile_flg
&&
urlParam
.
mobile_flg
==
"1"
;
if
(
CHK
.
isCms
)
{
...
...
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