Skip to content

D
design
Commit 36763065 by NGUYEN HOANG SON
Options

Merge commit 'ac252bae' into feature/1.4.3_dev

parents a0d68ece ac252bae
Showing with 98 additions and 78 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,
...@@ -20,23 +20,23 @@ ...@@ -20,23 +20,23 @@
"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,
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"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,
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
"permitCodeRequiredFlg": 0, "permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0, "displayPermissionFlg": 0,
"enableReportEdit": 1, "enableReportEdit": 1,
"process_list": [], "processList": [],
"warningReportList": [], "warningReportList": [],
"contentId": 6344, "contentId": 6344,
"relatedContentList": [], "relatedContentList": [],
...@@ -69,32 +69,6 @@ ...@@ -69,32 +69,6 @@
"operationGroupMasterIdList": [] "operationGroupMasterIdList": []
}, },
{ {
"operationId": 5494,
"operationType": 0,
"reportType": 1,
"operationName": "Hong3",
"operationDescriptions": "",
"operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22",
"operationStatus": 1,
"operationLastEditDate": "2022-08-24 16:44:20",
"reportCycle": 0,
"enableReportUpdate": 1,
"enableReportHistory": 0,
"enableAddReport": 0,
"quickReport": 0,
"permitCode": "",
"permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0,
"enableReportEdit": 1,
"process_list": [],
"warningReportList": [],
"contentId": 6345,
"relatedContentList": [],
"pushMessageList": [],
"operationGroupMasterIdList": []
},
{
"operationId": 5495, "operationId": 5495,
"operationType": 0, "operationType": 0,
"reportType": 2, "reportType": 2,
...@@ -103,7 +77,7 @@ ...@@ -103,7 +77,7 @@
"operationStartDate": "2022-08-22", "operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22", "operationEndDate": "2022-08-22",
"operationStatus": 1, "operationStatus": 1,
"operationLastEditDate": "2022-08-25 16:46:13", "operationLastEditDate": "2022-08-22 16:46:13",
"enableReportHistory": 0, "enableReportHistory": 0,
"enableAddReport": 1, "enableAddReport": 1,
"quickReport": 0, "quickReport": 0,
...@@ -136,7 +110,7 @@ ...@@ -136,7 +110,7 @@
"operationStartDate": "2022-08-22", "operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22", "operationEndDate": "2022-08-22",
"operationStatus": 1, "operationStatus": 1,
"operationLastEditDate": "2022-08-26 16:46:26", "operationLastEditDate": "2022-08-24 03:12:46",
"enableReportHistory": 0, "enableReportHistory": 0,
"enableAddReport": 1, "enableAddReport": 1,
"quickReport": 0, "quickReport": 0,
...@@ -169,7 +143,7 @@ ...@@ -169,7 +143,7 @@
"operationStartDate": "2022-08-22", "operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22", "operationEndDate": "2022-08-22",
"operationStatus": 1, "operationStatus": 1,
"operationLastEditDate": "2022-08-27 19:05:48", "operationLastEditDate": "2022-08-23 01:07:51",
"enableReportHistory": 0, "enableReportHistory": 0,
"enableAddReport": 1, "enableAddReport": 1,
"quickReport": 0, "quickReport": 0,
...@@ -177,36 +151,44 @@ ...@@ -177,36 +151,44 @@
"permitCodeRequiredFlg": 0, "permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0, "displayPermissionFlg": 0,
"enableReportEdit": 1, "enableReportEdit": 1,
"process_list": [ "processList": [
{ {
"code": "9999", "code": "9999",
"report_name": "9999", "reportName": "9999",
"process_name": "process1", "processName": "process1",
"process_id": 1 "processId": 1
}, },
{ {
"code": "9999", "code": "9999",
"report_name": "9999", "reportName": "9999",
"process_name": "process2", "processName": "process2",
"process_id": 2 "processId": 2
} }
], ],
"warningReportList": [ "warningReportList": [
{ {
"task_name": "??0002", "taskName": "??0010",
"task_code": "0002", "taskCode": "0010",
"task_id": 7084, "taskId": 7085,
"task_key": "fa71aa6d-f8da-497f-ae56-62722202cf68", "taskKey": "cf9c3410-73ff-4b52-a3d5-e2f198f11e8e",
"task_report_id": 7160, "taskReportId": 7161,
"task_report_info_id": 7036 "taskReportInfoId": 7037
}, },
{ {
"task_name": "??0001", "taskName": "??0002",
"task_code": "0001", "taskCode": "0002",
"task_id": 7082, "taskId": 7084,
"task_key": "76037491-c397-41f2-8e7a-15b63bd8968d", "taskKey": "fa71aa6d-f8da-497f-ae56-62722202cf68",
"task_report_id": 7158, "taskReportId": 7160,
"task_report_info_id": 7034 "taskReportInfoId": 7036
},
{
"taskName": "??0001",
"taskCode": "0001",
"taskId": 7082,
"taskKey": "76037491-c397-41f2-8e7a-15b63bd8968d",
"taskReportId": 7158,
"taskReportInfoId": 7034
} }
], ],
"contentId": 6348, "contentId": 6348,
...@@ -223,7 +205,7 @@ ...@@ -223,7 +205,7 @@
"operationStartDate": "2022-08-22", "operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22", "operationEndDate": "2022-08-22",
"operationStatus": 1, "operationStatus": 1,
"operationLastEditDate": "2022-08-28 16:52:15", "operationLastEditDate": "2022-08-22 16:52:15",
"enableReportHistory": 0, "enableReportHistory": 0,
"enableAddReport": 1, "enableAddReport": 1,
"quickReport": 0, "quickReport": 0,
...@@ -231,18 +213,18 @@ ...@@ -231,18 +213,18 @@
"permitCodeRequiredFlg": 0, "permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0, "displayPermissionFlg": 0,
"enableReportEdit": 1, "enableReportEdit": 1,
"process_list": [ "processList": [
{ {
"code": "9999", "code": "9999",
"report_name": "9999", "reportName": "9999",
"process_name": "process3", "processName": "process3",
"process_id": 1 "processId": 1
}, },
{ {
"code": "9999", "code": "9999",
"report_name": "9999", "reportName": "9999",
"process_name": "process4", "processName": "process4",
"process_id": 2 "processId": 2
} }
], ],
"warningReportList": [], "warningReportList": [],
...@@ -250,6 +232,43 @@ ...@@ -250,6 +232,43 @@
"relatedContentList": [], "relatedContentList": [],
"pushMessageList": [], "pushMessageList": [],
"operationGroupMasterIdList": [] "operationGroupMasterIdList": []
},
{
"operationId": 5499,
"operationType": 0,
"reportType": 3,
"operationName": "Hong8",
"operationDescriptions": "",
"operationStartDate": "2022-08-23",
"operationEndDate": "2022-08-23",
"operationStatus": 1,
"operationLastEditDate": "2022-08-23 21:49:48",
"enableReportHistory": 0,
"enableAddReport": 1,
"quickReport": 0,
"permitCode": "",
"permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0,
"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
...@@ -562,9 +562,9 @@ CHK.initOperationList = function() { ...@@ -562,9 +562,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);
}); });
} }
......
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