diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html index 4f3df78..bdcf57f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html @@ -10,14 +10,15 @@ - - - + + + @@ -1429,19 +1518,18 @@ 2304 - 1 + 9 600 600 - - 15500 - 25820 - -110 - -110 + 12080 + 24750 + 240 + 120 600 0 @@ -1450,83 +1538,33 @@ - - - - - - - - - - +
检查结果
+ + + + + + - - - - - - - - - - - - - + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1540,14 +1578,46 @@ function printPage() { window.print(); } - function conversionDate(date){ + function updateStatus(className, dictData) { + var datas = dictData; + var elementsToFind = []; + document.querySelectorAll('.' + className).forEach(function(element) { + elementsToFind.push(element.innerHTML); + }); + + elementsToFind.forEach(function(value) { + const foundObject = datas.find(obj => obj.dictValue === value); + + document.querySelectorAll('.' + className).forEach(function(element) { + if (element.innerHTML === value) { + if(className === 'resultStarts'){ + element.innerHTML = foundObject.dictLabel; + element.style.color = value === '0' ? 'green' : 'red'; + }else{ + element.innerHTML = foundObject ? foundObject.dictLabel : ""; + } + } + }); + }); + } + // 用户状态 + var checkTypeDatas = [[${@dict.getType('sys_check_type_report')}]]; + updateStatus('checkType', checkTypeDatas); + var resultStartsDatas = [[${@dict.getType('sys_check_state')}]]; + updateStatus('resultStarts', resultStartsDatas); + function formatISO8601ToDateTime(isoString) { + var date = new Date(isoString); var year = date.getFullYear(); - var month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始,需要加 1 - var day = String(date.getDate()).padStart(2, '0'); // 日可能是个位数,需要补零 - return year + '-' + month + '-' + day + var month = (date.getMonth() + 1).toString().padStart(2, '0'); // 月份是从0开始的,所以需要+1 + var day = date.getDate().toString().padStart(2, '0'); + var hours = date.getHours().toString().padStart(2, '0'); + var minutes = date.getMinutes().toString().padStart(2, '0'); + var seconds = date.getSeconds().toString().padStart(2, '0'); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; } if(document.querySelector('#entryDate').innerHTML){ - document.querySelector('#entryDate').innerHTML ='检查日期:' + conversionDate(new Date(document.querySelector('#entryDate').innerHTML)) + document.querySelector('#entryDate').innerHTML ='检查日期:' + formatISO8601ToDateTime([[${tdCheckReportDTO}]].checkEndTime) }else{ document.querySelector('#entryDate').innerHTML ='检查日期:' }
检查结果
检查单位:[[${tdCheckResult.checkAddress}]][[${tdCheckResult.checkEndTime}]]
序号检查内容检查的具体内容检查结果备注检查单位:[[${tdCheckReportDTO.depart}]][[${tdCheckReportDTO.checkEndTime}]]
人员检查[[${tdCheckResult.checkcontentry}]][[${tdCheckResult.remark1}]]
检查项检查内容检查结果备注
文件检查[[${tdCheckResult.checkcontentrywj}]][[${tdCheckResult.remark2}]]
[[${checkResult.checkType}]][[${checkResult.typeContent}]][[${checkResult.resultStarts}]][[${checkResult.remark}]]
密品检查[[${tdCheckResult.checkcontentrysb}]][[${tdCheckResult.remark3}]]
泄密事件检查[[${tdCheckResult.checkcontentryxmsj}]][[${tdCheckResult.remark4}]]
管理制度检查[[${tdCheckResult.checkcontentryglzd}]][[${tdCheckResult.remark5}]]
其他项目检查[[${tdCheckResult.checkcontentryother}]][[${tdCheckResult.remark6}]]
检查人员:[[${tdCheckResult.checkName}]]
检查人员:[[${tdCheckReportDTO.checkName}]]