Commit 9d257da9 by Lee Munkyeong

RFID関連修正

parent 77868961
...@@ -247,7 +247,6 @@ CHK_L.sendAppCommand = function (command, operationId, contentId, operationGroup ...@@ -247,7 +247,6 @@ CHK_L.sendAppCommand = function (command, operationId, contentId, operationGroup
param.operationGroupMasterId = operationGroupMasterId; param.operationGroupMasterId = operationGroupMasterId;
CHK.sendABookCheckApi(param); CHK.sendABookCheckApi(param);
} }
/** /**
* 定期点検リストを更新 * 定期点検リストを更新
* *
......
...@@ -2390,6 +2390,7 @@ CHK.showRelatedContent = function(urlPath, contentId, pageNum) { ...@@ -2390,6 +2390,7 @@ CHK.showRelatedContent = function(urlPath, contentId, pageNum) {
} }
} }
CHK.getOneTimeKey = function(url, callback) { CHK.getOneTimeKey = function(url, callback) {
$.ajax({ $.ajax({
type: "GET", type: "GET",
...@@ -2987,19 +2988,29 @@ CHK.scanClose = function() { ...@@ -2987,19 +2988,29 @@ CHK.scanClose = function() {
$(".scan-area").addClass("d-none"); $(".scan-area").addClass("d-none");
} }
CHK.scanResult = function(scannedCode) { CHK.scanResult = function(scannedCode, scanType) {
CHK.scanClose(); CHK.scanClose();
var operationList = CHK.operation.searchOperationList; var operationList = CHK.operation.searchOperationList;
var scannedOperation = operationList.filter(function(operation) { var scannedOperation = operationList.filter(function(operation) {
return operation.permitCode == scannedCode; return operation.permitCode == scannedCode;
})[0]; })[0];
if (scannedOperation != null) { if (scannedOperation != null) {
CHK_L.sendAppCommand('goOperation', scannedOperation.operationId, scannedOperation.contentId); CHK.sendScanResult('goOperation', scannedOperation.operationId, scannedOperation.contentId, scanType);
} else { } else {
CHK.displayAlert("notExistCode"); CHK.displayAlert("notExistCode");
} }
} }
CHK.sendScanResult = function (command, operationId, contentId, scanType) {
var param = {};
param.cmd = CHK.getCommand(command);
param.operationId = operationId;
param.contentId = contentId;
param.scanType = scanType;
CHK.sendABookCheckApi(param);
}
CHK.alertClose = function() { CHK.alertClose = function() {
$(".alert-overlay").addClass("d-none"); $(".alert-overlay").addClass("d-none");
$(".alert-area").addClass("d-none"); $(".alert-area").addClass("d-none");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment