Skip to content

D
design
Commit 7fec2fea by NGUYEN HOANG SON
Options

Merge branch 'feature/1.4.3_dev_49091' into feature/1.4.3_dev 

# Conflicts:
#	app/index.html
#	app/script/check.js
parents 123f0d71 cafb403b
Showing with 592 additions and 2 deletions
app/css/style.css
......@@ -259,6 +259,10 @@
.tab-label.on {
color: var(--blue);
}
.tab-label.on .task-cnt{
font-weight: normal;
color: var(--secondary);
}
.tab-content.on{
display: block;
animation: show .3s linear 0s;
......
app/index.html
......@@ -15,6 +15,7 @@
<link rel="stylesheet" type="text/css" href="css/style.css">
<script src="js/jquery-1.11.2.min.js?__UPDATEID__"></script>
<script src="script/check.js?__UPDATEID__"></script>
<script src="script/check_PU.js?__UPDATEID__"></script>
<script src="script/check-list.js?__UPDATEID__"></script>
<script src="script/check-foriOS.js"></script>
<script src="script/constant.js?__UPDATEID__"></script>
......
app/js/common.js 0 → 100644
// トグル切り替え
$(".toggle").on("click", function() {
$(this).toggleClass("checked");
if(!$('input[name="check"]').prop("checked")) {
$(".toggle input").prop("checked", true);
} else {
$(".toggle input").prop("checked", false);
}
});
// タブ切り替え
$('.tab-wrap .tab-label').on('click', function () {
var tab_index = $(this).parent().find('.tab-label').index(this);
$(this).parent().parent().find('.tab-label, .tab-content').removeClass('on');
$(this).parent().parent().find('.tab-label').eq(tab_index).addClass('on');
$(this).parent().parent().find('.tab-content').eq(tab_index).addClass('on');
});
$(function(){
var myTarget = $(".tab-label.on");
var myIndex = $(".tab-wrap .tab-label").index(myTarget);
var scrollvalue = 130 * myIndex;
$('.tab-menu').scrollLeft(scrollvalue);
});
\ No newline at end of file
app/operationList.json 0 → 100644
{
"httpStatus": 200,
"presentTime": "2022-08-22 19:53:21",
"presentTimeUTC": "2022-08-22T10:53:21Z",
"operationList": [
{
"operationId": 5492,
"operationType": 0,
"reportType": 0,
"operationName": "Hong1",
"operationDescriptions": "",
"operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22",
"operationStatus": 1,
"operationLastEditDate": "2022-08-22 13:42:41",
"enableReportHistory": 0,
"enableAddReport": 1,
"quickReport": 0,
"permitCode": "",
"permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0,
"enableReportEdit": 1,
"process_list": [],
"warningReportList": [
{
"task_name": "??0002",
"task_code": "0002",
"task_id": 7079,
"task_key": "ef5ea05d-73ed-4d6c-a789-c2e980e8585e",
"task_report_id": 7155,
"task_report_info_id": 7032
},
{
"task_name": "??0001",
"task_code": "0001",
"task_id": 7078,
"task_key": "981c17eb-f166-4c3d-b998-c93809bf7d52",
"task_report_id": 7154,
"task_report_info_id": 7031
}
],
"contentId": 6343,
"relatedContentList": [],
"pushMessageList": [],
"operationGroupMasterIdList": []
},
{
"operationId": 5493,
"operationType": 0,
"reportType": 0,
"operationName": "Hong2",
"operationDescriptions": "",
"operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22",
"operationStatus": 1,
"operationLastEditDate": "2022-08-23 16:43:40",
"enableReportHistory": 0,
"enableAddReport": 1,
"quickReport": 0,
"permitCode": "",
"permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0,
"enableReportEdit": 1,
"process_list": [],
"warningReportList": [],
"contentId": 6344,
"relatedContentList": [],
"pushMessageList": [],
"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,
"operationType": 0,
"reportType": 2,
"operationName": "Hong4",
"operationDescriptions": "",
"operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22",
"operationStatus": 1,
"operationLastEditDate": "2022-08-25 16:46:13",
"enableReportHistory": 0,
"enableAddReport": 1,
"quickReport": 0,
"permitCode": "",
"permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0,
"enableReportEdit": 1,
"workingGroupList": [
{
"reportLevel": 0,
"groupList": [
{
"groupId": 8425
}
]
}
],
"warningReportList": [],
"contentId": 6346,
"relatedContentList": [],
"pushMessageList": [],
"operationGroupMasterIdList": []
},
{
"operationId": 5496,
"operationType": 0,
"reportType": 2,
"operationName": "Hong5",
"operationDescriptions": "",
"operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22",
"operationStatus": 1,
"operationLastEditDate": "2022-08-26 16:46:26",
"enableReportHistory": 0,
"enableAddReport": 1,
"quickReport": 0,
"permitCode": "",
"permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0,
"enableReportEdit": 1,
"workingGroupList": [
{
"reportLevel": 0,
"groupList": [
{
"groupId": 8425
}
]
}
],
"warningReportList": [],
"contentId": 6347,
"relatedContentList": [],
"pushMessageList": [],
"operationGroupMasterIdList": []
},
{
"operationId": 5497,
"operationType": 0,
"reportType": 3,
"operationName": "Hong6",
"operationDescriptions": "",
"operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22",
"operationStatus": 1,
"operationLastEditDate": "2022-08-27 19:05:48",
"enableReportHistory": 0,
"enableAddReport": 1,
"quickReport": 0,
"permitCode": "",
"permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0,
"enableReportEdit": 1,
"process_list": [
{
"code": "9999",
"report_name": "9999",
"process_name": "process1",
"process_id": 1
},
{
"code": "9999",
"report_name": "9999",
"process_name": "process2",
"process_id": 2
}
],
"warningReportList": [
{
"task_name": "??0002",
"task_code": "0002",
"task_id": 7084,
"task_key": "fa71aa6d-f8da-497f-ae56-62722202cf68",
"task_report_id": 7160,
"task_report_info_id": 7036
},
{
"task_name": "??0001",
"task_code": "0001",
"task_id": 7082,
"task_key": "76037491-c397-41f2-8e7a-15b63bd8968d",
"task_report_id": 7158,
"task_report_info_id": 7034
}
],
"contentId": 6348,
"relatedContentList": [],
"pushMessageList": [],
"operationGroupMasterIdList": []
},
{
"operationId": 5498,
"operationType": 0,
"reportType": 3,
"operationName": "Hong7",
"operationDescriptions": "",
"operationStartDate": "2022-08-22",
"operationEndDate": "2022-08-22",
"operationStatus": 1,
"operationLastEditDate": "2022-08-28 16:52:15",
"enableReportHistory": 0,
"enableAddReport": 1,
"quickReport": 0,
"permitCode": "",
"permitCodeRequiredFlg": 0,
"displayPermissionFlg": 0,
"enableReportEdit": 1,
"process_list": [
{
"code": "9999",
"report_name": "9999",
"process_name": "process3",
"process_id": 1
},
{
"code": "9999",
"report_name": "9999",
"process_name": "process4",
"process_id": 2
}
],
"warningReportList": [],
"contentId": 6349,
"relatedContentList": [],
"pushMessageList": [],
"operationGroupMasterIdList": []
}
]
}
\ No newline at end of file
app/pickup.html 0 → 100644
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title>ピックアップ</title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- vender css -->
<link rel="stylesheet" type="text/css" href="css/fontawesome_relative_path.css">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="css/app.css">
<link rel="stylesheet" type="text/css" href="css/fontawesome_relative_path.css">
<link rel="stylesheet" type="text/css" href="css/header.css">
<link rel="stylesheet" type="text/css" href="css/footer.css">
<link rel="stylesheet" type="text/css" href="css/style.css">
<script src="js/jquery-1.11.2.min.js?__UPDATEID__"></script>
<script src="script/check.js?__UPDATEID__"></script>
<script src="script/check-list.js?__UPDATEID__"></script>
<script src="script/check-foriOS.js"></script>
<script src="script/constant.js?__UPDATEID__"></script>
<script src="script/check_PU.js?__UPDATEID__"></script>
</head>
<body onload="CHK_pu.init();">
<header >
<nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100">
<a href="index.html" class="navbar-brand category-btn lht-0">
<i class="fas fa-chevron-left fs-12 p-1"></i>
<span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonBack">
戻る
</span>
</a>
<h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang" data-msg="labelPickUp">ピックアップ</h1>
<a class="nav-link text-white lht-0 p-1">
<img class="icon" src="img/icon_update.svg" alt="更新">
<span class="d-none d-md-inline fs-10 align-middle multi-lang" data-msg="buttonRefresh" onclick="CHK_pu.init();">
更新
</span>
</a>
</nav>
</header>
<!-- tab -->
<section class="main-section">
<main>
<div class="tab-wrap">
<input id="tab-NewReport" type="radio" name="tab-task" class="tab-switch">
<input id="tab-ContinueWork" type="radio" name="tab-task" class="tab-switch" checked>
<input id="tab-ReportWithWarning" type="radio" name="tab-task" class="tab-switch">
<ul class="tab-menu pl-0">
<li class="tab-label list-unstyled on"><label class="tab-label-NewReport fs-9 multi-lang" data-msg="labelNewReport" for="tab-NewReport" >新規報告</label><div class="task-cnt" id="count-NewReport"></div></li>
<li class="tab-label list-unstyled"><label class="tab-label-ContinueWork fs-9 multi-lang" data-msg="labelContinueWork" for="tab-ContinueWork" >工程作業</label><div class="task-cnt" id="count-ContinueWork"></div></li>
<li class="tab-label list-unstyled"><label class="tab-label-ReportWithWarning fs- multi-lang" data-msg="labelReportWithWarning" for="tab-ReportWithWarning" >警告を含む報告</label><div class="task-cnt" id="count-ReportWithWarning"></div></li>
</ul>
<div class="tab-content-area">
<!-- 新規報告 -->
<div id="tab-content-NewReport" class="tab-content on">
<div class="container-fluid">
<ul class="task-list p-0 mt-3" id="newReport-list">
</ul>
</div>
</div>
<!-- 工程作業 -->
<div id="tab-content-ContinueWork" class="tab-content">
<div class="container-fluid">
<ul class="task-list p-0 mt-3" id="continueWork-list">
</ul>
</div>
</div>
<!-- 警告を含む報告 -->
<div id="tab-content-ReportWithWarning" class="tab-content">
<div class="container-fluid">
<ul class="task-list p-0 mt-3" id="reportWithWarning-list">
</ul>
</div>
</div>
</div>
</div>
</main>
</section>
<footer class="fixed-bottom bg-light">
<nav class="d-flex justify-content-around">
<a href="#" class="d-block w-100 text-center py-2 text-decoration-none">
<img src="img/icon_dashboard.svg" alt="ダッシュボード" class="p-1">
<div class="fs-7">ダッシュボード</div>
</a>
<a href="#" class="d-block w-100 text-center py-2 text-decoration-none text-secondary">
<i class="fas fa-tasks fs-14 p-1"></i>
<div class="fs-7">作業一覧</div>
</a>
<a href="#" class="d-block w-100 text-center py-2 text-decoration-none text-secondary">
<i class="fas fa-folder fs-14 p-1"></i>
<div class="fs-7">関連資料</div>
</a>
<a href="#" class="d-block w-100 text-center py-2 text-decoration-none text-secondary">
<i class="fas fa-cog fs-14 p-1"></i>
<div class="fs-7">設定</div>
</a>
</nav>
</footer>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/common.js"></script>
</body>
</html>
\ No newline at end of file
app/script/check.js
......@@ -68,6 +68,7 @@ var msgMap = { // velocity?
buttonCategory: { ja: "カテゴリー", ko: "카테고리", en: "Category" },
buttonRefresh: { ja: "更新", ko: "갱신", en: "Refresh" },
buttonBack: { ja: "戻る", ko: "Back", en: "Back" },
buttonScan: { ja: "スキャン", ko: "스캔", en: "Scan" },
placeholderOperationName: { ja: "作業名", ko: "작업명", en: "Working Name" },
labelPeriod: { ja: "期間", ko: "기간", en: "Period" },
......@@ -109,6 +110,10 @@ var msgMap = { // velocity?
dashboardSettingContinousWorkTitle: { ja: "工程作業", ko: "Continous Work", en: "Continous Work"},
dashboardSettingReportWarningTitle: { ja: "警告を含む作業", ko: "Report Warning", en: "Report Warning"},
dashboardSettingDashboardHomeTitle: { ja: "ダッシュボードをホーム画面にする", ko: "Dashboard Home", en: "Dashboard Home"},
labelPickUp: { ja: "ピックアップ", ko: "Pick up", en: "Pick up" },
labelNewReport: { ja: "新規報告", ko: "New report", en: "New report" },
labelContinueWork: { ja: "工程作業", ko: "Process work", en: "Process work" },
labelReportWithWarning: { ja: "警告を含む報告", ko: "Reports with warnings", en: "Reports with warnings" }
};
// 言語取得
......@@ -515,7 +520,7 @@ CHK.initReportApp = function (callback) {
CHK.operationGroupMasterId = 0;
// 作業一覧JSONデータ
CHK.initOperationList();
// カテゴリーJSONデータ
CHK.loadJson(CHK.jsonPath.operationGroupMasterList, function (json) {
CHK.operationGroupMaster = json;
......@@ -545,6 +550,8 @@ CHK.initOperationList = function() {
CHK.operation.searchOperationList = json.operationList;
//作業一覧描画
CHK.createOperationList(CHK.operation.operationList);
CHK_pu.createNewReportList(CHK.operation.operationList);
CHK_pu.createContinueWorkList(CHK.operation.operationList);
});
}
......@@ -2971,6 +2978,7 @@ CHK.changeSortType = function(sortType) {
* 作業一覧描画
*/
CHK.createOperationList = function(operationList, isSearched = false) {
//alert("hongnt CHK.createOperationList ");
var searchKeyword = $("#searchTaskName").val();
var searchStartDate = $("#searchStartDate").val();
var searchEndDate = $("#searchEndDate").val();
......@@ -3168,6 +3176,7 @@ CHK.search = function() {
CHK.isSearched = true;
CHK.operation.searchOperationList = searchResult;
CHK.createOperationList(searchResult, CHK.isSearched);
CHK_PU.createOperationList(searchResult, CHK.isSearched);
};
/**
......@@ -3246,7 +3255,7 @@ CHK.scanClose = function() {
document.addEventListener('visibilitychange', () => {
// バックグラウンド遷移時
if (document.visibilityState === 'hidden') {
if (document.visibilityState === 'hidden') {
CHK.scanClose();
}
});
......
app/script/check_pu.js 0 → 100644
// 名前空間
var CHK_pu = {};
CHK_pu.newReportList;
CHK_pu.continueWorkReport;
CHK_pu.reportWithWarning;
CHK_pu.countNewReportList = 0;
CHK_pu.countContinueWorkReport = 0;
CHK_pu.countReportWithWarning= 0;
CHK_pu.initCommon = function() {
CHK_pu.countNewReportList = 0;
CHK_pu.countContinueWorkReport = 0;
CHK_pu.countReportWithWarning = 0;
CHK_pu.newReportList = {list_0: []};
CHK_pu.continueWorkReport = {list_0: []};
CHK_pu.reportWithWarning = {list_0: []};
}
CHK_pu.init = function() {
// 作業一覧JSONデータ
CHK.loadJson(CHK.jsonPath.operationList, function (json) {
CHK.operation = json;
CHK.operation.operationList = CHK.operation.operationList.sort(function(a,b) {
if (!a.operationLastEditDate) {
a.operationLastEditDate = "1900-01-01 09:00:00";
}
if (!b.operationLastEditDate) {
b.operationLastEditDate = "1900-01-01 09:00:00";
}
if (a.operationLastEditDate < b.operationLastEditDate) return 1;
if (a.operationLastEditDate > b.operationLastEditDate) return -1;
return 0;
});
CHK_pu.createNewReportList(CHK.operation.operationList);
CHK_pu.createContinueWorkList(CHK.operation.operationList);
CHK_pu.createReportWithWarning(CHK.operation.operationList);
CHK_pu.setCountElementInPickup();
});
}
CHK_pu.setCountElementInPickup = function() {
$("#count-NewReport")[0].innerHTML = CHK_pu.countNewReportList;
$("#count-ContinueWork")[0].innerHTML = CHK_pu.countContinueWorkReport;
$("#count-ReportWithWarning")[0].innerHTML = CHK_pu.countReportWithWarning;
}
CHK_pu.createNewReportList = function(operationList, isSearched = false) {
console.log("createNewReportList" , operationList );
for (var i = 0; i < operationList.length; i++) {
//TODO aタグlist.html 転移処理
var operationNameLi;
if (operationList[i].permitCodeRequiredFlg == 1) {
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+ "'><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>");
} 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>");
}
$("#newReport-list").append(operationNameLi);
CHK_pu.countNewReportList = CHK_pu.countNewReportList + 1;
}
if(CHK.isAndroid) {
android.hideLoading();
}
console.log("CHK_pu.countNewReportList " , CHK_pu.countNewReportList );
console.log("end createNewReportList" );
};
CHK_pu.createContinueWorkList = function(operationList, isSearched = false) {
console.log("createContinueWorkList" );
for (var i = 0; i < operationList.length; i++) {
if (operationList[i].reportType === 3)
{
//TODO aタグlist.html 転移処理
var operationNameLi;
if (operationList[i].permitCodeRequiredFlg == 1) {
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+ "'><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
+ "</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>");
}
$("#continueWork-list").append(operationNameLi);
CHK_pu.countContinueWorkReport = CHK_pu.countContinueWorkReport + 1;
}
}
if(CHK.isAndroid) {
android.hideLoading();
}
console.log("CHK_pu.countContinueWorkReport " , CHK_pu.countContinueWorkReport );
};
CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
console.log("createReportWithWarning" );
for (var i = 0; i < operationList.length; i++) {
console.log("lengh", operationList[i].warningReportList.length );
if(operationList[i].warningReportList.length === 0) continue;
//TODO aタグlist.html 転移処理
var operationNameLi;
for (var j = 0; j < operationList[i].warningReportList.length; j++)
{
switch (operationList[i].reportType)
{
case 0:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key
+ "');\" 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> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].task_code
+ "</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>");
break;
case 1:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key
+ "');\" 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> <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>");
break;
case 2:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key
+ "');\" 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> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].task_code
+ "</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>");
break;
case 3:
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'>" + operationList[i].warningReportList[j].task_code
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break;
}
$("#reportWithWarning-list").append(operationNameLi);
CHK_pu.countReportWithWarning = CHK_pu.countReportWithWarning + 1;
}
}
if(CHK.isAndroid) {
android.hideLoading();
}
console.log("CHK_pu.countReportWithWarning " , CHK_pu.countReportWithWarning );
console.log("End createReportWithWarning" );
};
\ No newline at end of file
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