Skip to content

D
design
Commit ac252bae by NGO THI HONG
Options

#49125 update sample operationList

parent e3bf392f
Showing with 351 additions and 318 deletions
app/operationList.json
{ {
"httpStatus": 200, "httpStatus": 200,
"presentTime": "2022-08-22 19:53:21", "presentTime": "2022-08-24 11:39:23",
"presentTimeUTC": "2022-08-22T10:53:21Z", "presentTimeUTC": "2022-08-24T02:39:23Z",
"operationList": [ "operationList": [
{ {
"operationId": 5492, "operationId": 5492,
"operationType": 0, "operationType": 0,
"reportType": 0, "reportType": 0,
"operationName": "Hong1", "operationName": "Hong1",
"operationDescriptions": "", "operationDescriptions": "",
"operationStartDate": "2022-08-22", "operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22", "operationEndDate": "2022-08-22",
"operationStatus": 1, "operationStatus": 1,
"operationLastEditDate": "2022-08-22 13:42:41", "operationLastEditDate": "2022-08-22 13:42:41",
"enableReportHistory": 0, "enableReportHistory": 0,
"enableAddReport": 1, "enableAddReport": 1,
"quickReport": 0, "quickReport": 0,
"permitCode": "", "permitCode": "",
"permitCodeRequiredFlg": 0, "permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0, "displayPermissionFlg": 0,
"enableReportEdit": 1, "enableReportEdit": 1,
"process_list": [], "processList": [],
"warningReportList": [ "warningReportList": [
{ {
"task_name": "??0002", "taskName": "??0002",
"task_code": "0002", "taskCode": "0002",
"task_id": 7079, "taskId": 7079,
"task_key": "ef5ea05d-73ed-4d6c-a789-c2e980e8585e", "taskKey": "ef5ea05d-73ed-4d6c-a789-c2e980e8585e",
"task_report_id": 7155, "taskReportId": 7155,
"task_report_info_id": 7032 "taskReportInfoId": 7032
}, },
{ {
"task_name": "??0001", "taskName": "??0001",
"task_code": "0001", "taskCode": "0001",
"task_id": 7078, "taskId": 7078,
"task_key": "981c17eb-f166-4c3d-b998-c93809bf7d52", "taskKey": "981c17eb-f166-4c3d-b998-c93809bf7d52",
"task_report_id": 7154, "taskReportId": 7154,
"task_report_info_id": 7031 "taskReportInfoId": 7031
} }
], ],
"contentId": 6343, "contentId": 6343,
"relatedContentList": [], "relatedContentList": [],
"pushMessageList": [], "pushMessageList": [],
"operationGroupMasterIdList": [] "operationGroupMasterIdList": []
}, },
{ {
"operationId": 5493, "operationId": 5493,
"operationType": 0, "operationType": 0,
"reportType": 0, "reportType": 0,
"operationName": "Hong2", "operationName": "Hong2",
"operationDescriptions": "", "operationDescriptions": "",
"operationStartDate": "2022-08-22", "operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22", "operationEndDate": "2022-08-22",
"operationStatus": 1, "operationStatus": 1,
"operationLastEditDate": "2022-08-23 16:43:40", "operationLastEditDate": "2022-08-22 16:43:40",
"enableReportHistory": 0, "enableReportHistory": 0,
"enableAddReport": 1, "enableAddReport": 1,
"quickReport": 0, "quickReport": 0,
"permitCode": "", "permitCode": "",
"permitCodeRequiredFlg": 0, "permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0, "displayPermissionFlg": 0,
"enableReportEdit": 1, "enableReportEdit": 1,
"process_list": [], "processList": [],
"warningReportList": [], "warningReportList": [],
"contentId": 6344, "contentId": 6344,
"relatedContentList": [], "relatedContentList": [],
"pushMessageList": [], "pushMessageList": [],
"operationGroupMasterIdList": [] "operationGroupMasterIdList": []
}, },
{ {
"operationId": 5494, "operationId": 5495,
"operationType": 0, "operationType": 0,
"reportType": 1, "reportType": 2,
"operationName": "Hong3", "operationName": "Hong4",
"operationDescriptions": "", "operationDescriptions": "",
"operationStartDate": "2022-08-22", "operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22", "operationEndDate": "2022-08-22",
"operationStatus": 1, "operationStatus": 1,
"operationLastEditDate": "2022-08-24 16:44:20", "operationLastEditDate": "2022-08-22 16:46:13",
"reportCycle": 0, "enableReportHistory": 0,
"enableReportUpdate": 1, "enableAddReport": 1,
"enableReportHistory": 0, "quickReport": 0,
"enableAddReport": 0, "permitCode": "",
"quickReport": 0, "permitCodeRequiredFlg": 0,
"permitCode": "", "displayPermissionFlg": 0,
"permitCodeRequiredFlg": 0, "enableReportEdit": 1,
"displayPermissionFlg": 0, "workingGroupList": [
"enableReportEdit": 1, {
"process_list": [], "reportLevel": 0,
"warningReportList": [], "groupList": [
"contentId": 6345, {
"relatedContentList": [], "groupId": 8425
"pushMessageList": [], }
"operationGroupMasterIdList": [] ]
}, }
{ ],
"operationId": 5495, "warningReportList": [],
"operationType": 0, "contentId": 6346,
"reportType": 2, "relatedContentList": [],
"operationName": "Hong4", "pushMessageList": [],
"operationDescriptions": "", "operationGroupMasterIdList": []
"operationStartDate": "2022-08-22", },
"operationEndDate": "2022-08-22", {
"operationStatus": 1, "operationId": 5496,
"operationLastEditDate": "2022-08-25 16:46:13", "operationType": 0,
"enableReportHistory": 0, "reportType": 2,
"enableAddReport": 1, "operationName": "Hong5",
"quickReport": 0, "operationDescriptions": "",
"permitCode": "", "operationStartDate": "2022-08-22",
"permitCodeRequiredFlg": 0, "operationEndDate": "2022-08-22",
"displayPermissionFlg": 0, "operationStatus": 1,
"enableReportEdit": 1, "operationLastEditDate": "2022-08-24 03:12:46",
"workingGroupList": [ "enableReportHistory": 0,
{ "enableAddReport": 1,
"reportLevel": 0, "quickReport": 0,
"groupList": [ "permitCode": "",
{ "permitCodeRequiredFlg": 0,
"groupId": 8425 "displayPermissionFlg": 0,
} "enableReportEdit": 1,
] "workingGroupList": [
} {
], "reportLevel": 0,
"warningReportList": [], "groupList": [
"contentId": 6346, {
"relatedContentList": [], "groupId": 8425
"pushMessageList": [], }
"operationGroupMasterIdList": [] ]
}, }
{ ],
"operationId": 5496, "warningReportList": [],
"operationType": 0, "contentId": 6347,
"reportType": 2, "relatedContentList": [],
"operationName": "Hong5", "pushMessageList": [],
"operationDescriptions": "", "operationGroupMasterIdList": []
"operationStartDate": "2022-08-22", },
"operationEndDate": "2022-08-22", {
"operationStatus": 1, "operationId": 5497,
"operationLastEditDate": "2022-08-26 16:46:26", "operationType": 0,
"enableReportHistory": 0, "reportType": 3,
"enableAddReport": 1, "operationName": "Hong6",
"quickReport": 0, "operationDescriptions": "",
"permitCode": "", "operationStartDate": "2022-08-22",
"permitCodeRequiredFlg": 0, "operationEndDate": "2022-08-22",
"displayPermissionFlg": 0, "operationStatus": 1,
"enableReportEdit": 1, "operationLastEditDate": "2022-08-23 01:07:51",
"workingGroupList": [ "enableReportHistory": 0,
{ "enableAddReport": 1,
"reportLevel": 0, "quickReport": 0,
"groupList": [ "permitCode": "",
{ "permitCodeRequiredFlg": 0,
"groupId": 8425 "displayPermissionFlg": 0,
} "enableReportEdit": 1,
] "processList": [
} {
], "code": "9999",
"warningReportList": [], "reportName": "9999",
"contentId": 6347, "processName": "process1",
"relatedContentList": [], "processId": 1
"pushMessageList": [], },
"operationGroupMasterIdList": [] {
}, "code": "9999",
{ "reportName": "9999",
"operationId": 5497, "processName": "process2",
"operationType": 0, "processId": 2
"reportType": 3, }
"operationName": "Hong6", ],
"operationDescriptions": "", "warningReportList": [
"operationStartDate": "2022-08-22", {
"operationEndDate": "2022-08-22", "taskName": "??0010",
"operationStatus": 1, "taskCode": "0010",
"operationLastEditDate": "2022-08-27 19:05:48", "taskId": 7085,
"enableReportHistory": 0, "taskKey": "cf9c3410-73ff-4b52-a3d5-e2f198f11e8e",
"enableAddReport": 1, "taskReportId": 7161,
"quickReport": 0, "taskReportInfoId": 7037
"permitCode": "", },
"permitCodeRequiredFlg": 0, {
"displayPermissionFlg": 0, "taskName": "??0002",
"enableReportEdit": 1, "taskCode": "0002",
"process_list": [ "taskId": 7084,
{ "taskKey": "fa71aa6d-f8da-497f-ae56-62722202cf68",
"code": "9999", "taskReportId": 7160,
"report_name": "9999", "taskReportInfoId": 7036
"process_name": "process1", },
"process_id": 1 {
}, "taskName": "??0001",
{ "taskCode": "0001",
"code": "9999", "taskId": 7082,
"report_name": "9999", "taskKey": "76037491-c397-41f2-8e7a-15b63bd8968d",
"process_name": "process2", "taskReportId": 7158,
"process_id": 2 "taskReportInfoId": 7034
} }
], ],
"warningReportList": [ "contentId": 6348,
{ "relatedContentList": [],
"task_name": "??0002", "pushMessageList": [],
"task_code": "0002", "operationGroupMasterIdList": []
"task_id": 7084, },
"task_key": "fa71aa6d-f8da-497f-ae56-62722202cf68", {
"task_report_id": 7160, "operationId": 5498,
"task_report_info_id": 7036 "operationType": 0,
}, "reportType": 3,
{ "operationName": "Hong7",
"task_name": "??0001", "operationDescriptions": "",
"task_code": "0001", "operationStartDate": "2022-08-22",
"task_id": 7082, "operationEndDate": "2022-08-22",
"task_key": "76037491-c397-41f2-8e7a-15b63bd8968d", "operationStatus": 1,
"task_report_id": 7158, "operationLastEditDate": "2022-08-22 16:52:15",
"task_report_info_id": 7034 "enableReportHistory": 0,
} "enableAddReport": 1,
], "quickReport": 0,
"contentId": 6348, "permitCode": "",
"relatedContentList": [], "permitCodeRequiredFlg": 0,
"pushMessageList": [], "displayPermissionFlg": 0,
"operationGroupMasterIdList": [] "enableReportEdit": 1,
}, "processList": [
{ {
"operationId": 5498, "code": "9999",
"operationType": 0, "reportName": "9999",
"reportType": 3, "processName": "process3",
"operationName": "Hong7", "processId": 1
"operationDescriptions": "", },
"operationStartDate": "2022-08-22", {
"operationEndDate": "2022-08-22", "code": "9999",
"operationStatus": 1, "reportName": "9999",
"operationLastEditDate": "2022-08-28 16:52:15", "processName": "process4",
"enableReportHistory": 0, "processId": 2
"enableAddReport": 1, }
"quickReport": 0, ],
"permitCode": "", "warningReportList": [],
"permitCodeRequiredFlg": 0, "contentId": 6349,
"displayPermissionFlg": 0, "relatedContentList": [],
"enableReportEdit": 1, "pushMessageList": [],
"process_list": [ "operationGroupMasterIdList": []
{ },
"code": "9999", {
"report_name": "9999", "operationId": 5499,
"process_name": "process3", "operationType": 0,
"process_id": 1 "reportType": 3,
}, "operationName": "Hong8",
{ "operationDescriptions": "",
"code": "9999", "operationStartDate": "2022-08-23",
"report_name": "9999", "operationEndDate": "2022-08-23",
"process_name": "process4", "operationStatus": 1,
"process_id": 2 "operationLastEditDate": "2022-08-23 21:49:48",
} "enableReportHistory": 0,
], "enableAddReport": 1,
"warningReportList": [], "quickReport": 0,
"contentId": 6349, "permitCode": "",
"relatedContentList": [], "permitCodeRequiredFlg": 0,
"pushMessageList": [], "displayPermissionFlg": 0,
"operationGroupMasterIdList": [] "enableReportEdit": 1,
} "processList": [
{
"code": "9999",
"reportName": "9999",
"processName": "process3",
"processId": 1
},
{
"code": "9999",
"reportName": "9999",
"processName": "process4",
"processId": 2
}
],
"warningReportList": [],
"contentId": 6350,
"relatedContentList": [],
"pushMessageList": [],
"operationGroupMasterIdList": []
}
] ]
} }
\ No newline at end of file \ No newline at end of file
app/pickup.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<script src="script/check-list.js?__UPDATEID__"></script> <script src="script/check-list.js?__UPDATEID__"></script>
<script src="script/check-foriOS.js"></script> <script src="script/check-foriOS.js"></script>
<script src="script/constant.js?__UPDATEID__"></script> <script src="script/constant.js?__UPDATEID__"></script>
<script src="script/check_PU.js?__UPDATEID__"></script> <script src="script/check_pu.js?__UPDATEID__"></script>
</head> </head>
<body onload="CHK_pu.init();"> <body onload="CHK_pu.init();">
......
app/script/check-list.js
...@@ -6,6 +6,7 @@ var CHK_L = {}; ...@@ -6,6 +6,7 @@ var CHK_L = {};
* *
*/ */
CHK_L.init = function() { CHK_L.init = function() {
console.log("CHK_L.init design");
CHK.useKrpano = false; CHK.useKrpano = false;
CHK.operationType = CHK.OPERATION_TYPE.LIST; CHK.operationType = CHK.OPERATION_TYPE.LIST;
......
app/script/check.js
...@@ -550,9 +550,9 @@ CHK.initOperationList = function() { ...@@ -550,9 +550,9 @@ CHK.initOperationList = function() {
$('#operationTable').empty(); $('#operationTable').empty();
CHK.operation.searchOperationList = json.operationList; CHK.operation.searchOperationList = json.operationList;
//作業一覧描画 //作業一覧描画
console.log("json.operationList",JSON.stringify( json.operationList) )
CHK.createOperationList(CHK.operation.operationList); CHK.createOperationList(CHK.operation.operationList);
CHK_pu.createNewReportList(CHK.operation.operationList);
CHK_pu.createContinueWorkList(CHK.operation.operationList);
}); });
} }
...@@ -656,7 +656,7 @@ CHK.loadJson = function(fileName, callback) { ...@@ -656,7 +656,7 @@ CHK.loadJson = function(fileName, callback) {
json = CHK_iOS.getOperationListJson(); json = CHK_iOS.getOperationListJson();
callback(json); callback(json);
} else if (fileName == CHK.jsonPath.operationGroupMasterList) { } else if (fileName == CHK.jsonPath.operationGroupMasterList) {
json = CHK_iOS.getOperationGroupMasterListJson(); json = CHK_iOS.getOperationGroupMasterListJson();
callback(json); callback(json);
} else if (fileName == CHK.jsonPath.operationGroupMasterRelationList) { } else if (fileName == CHK.jsonPath.operationGroupMasterRelationList) {
json = CHK_iOS.getOperationGroupMasterRelationListJson(); json = CHK_iOS.getOperationGroupMasterRelationListJson();
......
app/script/check_pu.js
...@@ -20,25 +20,26 @@ CHK_pu.initCommon = function() { ...@@ -20,25 +20,26 @@ CHK_pu.initCommon = function() {
} }
CHK_pu.init = function() { CHK_pu.init = function() {
CHK.initCommon();
// 作業一覧JSONデータ // 作業一覧JSONデータ
CHK.loadJson(CHK.jsonPath.operationList, function (json) { CHK.loadJson(CHK.jsonPath.operationList, function (json) {
CHK.operation = json; CHK_pu.operation = json;
CHK.operation.operationList = CHK.operation.operationList.sort(function(a,b) { CHK_pu.operation.operationList = CHK_pu.operation.operationList.sort(function(a,b) {
if (!a.operationLastEditDate) { if (!a.operationLastEditDate) {
a.operationLastEditDate = "1900-01-01 09:00:00"; a.operationLastEditDate = "1900-01-01 09:00:00";
} }
if (!b.operationLastEditDate) { if (!b.operationLastEditDate) {
b.operationLastEditDate = "1900-01-01 09:00:00"; b.operationLastEditDate = "1900-01-01 09:00:00";
} }
if (a.operationLastEditDate < b.operationLastEditDate) return 1; if (a.operationLastEditDate < b.operationLastEditDate) return 1;
if (a.operationLastEditDate > b.operationLastEditDate) return -1; if (a.operationLastEditDate > b.operationLastEditDate) return -1;
return 0; return 0;
}); });
CHK_pu.createNewReportList(CHK.operation.operationList); CHK_pu.createNewReportList(CHK_pu.operation.operationList);
CHK_pu.createContinueWorkList(CHK.operation.operationList); CHK_pu.createContinueWorkList(CHK_pu.operation.operationList);
CHK_pu.createReportWithWarning(CHK.operation.operationList); CHK_pu.createReportWithWarning(CHK_pu.operation.operationList);
CHK_pu.setCountElementInPickup(); CHK_pu.setCountElementInPickup();
}); });
} }
...@@ -50,24 +51,29 @@ CHK_pu.setCountElementInPickup = function() { ...@@ -50,24 +51,29 @@ CHK_pu.setCountElementInPickup = function() {
CHK_pu.createNewReportList = function(operationList, isSearched = false) { CHK_pu.createNewReportList = function(operationList, isSearched = false) {
console.log("createNewReportList" , operationList ); console.log("createNewReportList" , operationList );
for (var i = 0; i < operationList.length; i++) { for (var i = 0; i < operationList.length; i++) {
//TODO aタグlist.html 転移処理 //TODO aタグlist.html 転移処理
var operationNameLi; var messageli = $("<li class='item list-unstyled rounded border mb-2'name = 'operationId_" + operationList[i].operationId + "' ></li>");
if (operationList[i].permitCodeRequiredFlg == 1) { var ahrefRequiredFlg ;
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId if (operationList[i].permitCodeRequiredFlg == 1)
+ "'><a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-3 text-decoration-none text-dark'><div class='title'>" + operationList[i].operationName {
+ "</div> <i class='fas fa-chevron-right fs-12'></i></a></li>"); ahrefRequiredFlg = $("<a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>");
} else {
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '"
+ operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-3 text-decoration-none text-dark'>" + operationList[i].operationName
+ "</div> <i class='fas fa-chevron-right fs-12'></i></a></li>");
} }
else
{
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "');\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>");
}
var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>");
var iIcon = $("<i class='fas fa-chevron-right fs-12'></i>");
ahrefRequiredFlg.append(divTitle);
ahrefRequiredFlg.append(iIcon);
messageli.append(ahrefRequiredFlg);
//console.log(li );
$("#newReport-list").append(operationNameLi); $("#newReport-list").append(messageli);
CHK_pu.countNewReportList = CHK_pu.countNewReportList + 1; CHK_pu.countNewReportList = CHK_pu.countNewReportList + 1;
} }
...@@ -85,28 +91,35 @@ CHK_pu.createContinueWorkList = function(operationList, isSearched = false) { ...@@ -85,28 +91,35 @@ CHK_pu.createContinueWorkList = function(operationList, isSearched = false) {
for (var i = 0; i < operationList.length; i++) { for (var i = 0; i < operationList.length; i++) {
if (operationList[i].reportType === 3) if (operationList[i].reportType === 3)
{ {
console.log("operationList[i].operationName", operationList[i].operationName );
console.log("operationList[i].process_list", operationList[i].processList[0] );
//TODO aタグlist.html 転移処理 //TODO aタグlist.html 転移処理
var operationNameLi; var messageli = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId + "'></li>") ;
if (operationList[i].permitCodeRequiredFlg == 1) { var ahrefRequiredFlg ;
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId if (operationList[i].permitCodeRequiredFlg == 1)
+ "'><a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" {
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].process_list[0].process_name ahrefRequiredFlg = $("<a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>");
+ "</div> <div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001"
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
} else {
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].process_list[0].process_name
+ "</div> <div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001"
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
} }
else
$("#continueWork-list").append(operationNameLi); {
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>");
}
var divProccess = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName + "</div>");
var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>");
var divSubTitleWrap = $("<div class='sub-title-wrap'> </div>");
var divCode = $(" <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001" + "</div></div>");
var divSubTitle = $("<div class='sub-title'>" + operationList[i].operationName + "</div>");
var iIcon = $("<i class='fas fa-chevron-right fs-12''></i>");
divSubTitleWrap.append(divCode);
ahrefRequiredFlg.append(divProccess);
ahrefRequiredFlg.append(divTitle);
ahrefRequiredFlg.append(divSubTitleWrap);
ahrefRequiredFlg.append(divSubTitle);
ahrefRequiredFlg.append(iIcon);
messageli.append(ahrefRequiredFlg);
$("#continueWork-list").append(messageli);
CHK_pu.countContinueWorkReport = CHK_pu.countContinueWorkReport + 1; CHK_pu.countContinueWorkReport = CHK_pu.countContinueWorkReport + 1;
} }
...@@ -131,28 +144,28 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -131,28 +144,28 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
switch (operationList[i].reportType) switch (operationList[i].reportType)
{ {
case 0: case 0:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].taskKey
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].taskKey
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].task_code + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].task_name + "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].task_name
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"); + "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break; break;
case 1: case 1:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].taskKey
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].taskKey
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].operationStartDate + " / " + operationList[i].operationEndDate + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].operationStartDate + " / " + operationList[i].operationEndDate
+ "</div></div> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"); + "</div></div> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break; break;
case 2: case 2:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].taskKey
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].taskKey
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].task_code + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].task_name + "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].task_name
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"); + "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break; break;
...@@ -160,9 +173,9 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -160,9 +173,9 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].process_list[0].process_name +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName
+ "</div> <div class='title'>" + operationList[i].operationName + "</div> <div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].task_code + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName + "</div></div> <div class='sub-title'>" + operationList[i].operationName
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"); + "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break; break;
......
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