diff --git a/ruoyi-admin/src/main/resources/static/img/11.jpg b/ruoyi-admin/src/main/resources/static/img/11.jpg new file mode 100644 index 0000000..ecab0f7 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/11.jpg differ diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html index acb8de9..1799e37 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html @@ -102,33 +102,39 @@ e.data.list.forEach((i, k) => { let cardList = e.data.infolist.filter(v => v.inspectionId === i.inspectionId) - console.log(cardList) + let cardIds = [...new Set(cardList.map(v=>v.objid))] let card = `` - cardList.forEach(v => { - card += ` + cardIds.forEach(v => { + let data = cardList.filter(i=>i.objid ===v) + card += `
-
机坪名称:${v.areaName || ''}
-
机位码:${v.planePosition || ''}
-
完成状态:${v.taskState || ''}
+
机坪名称:${data[0].areaName || ''}
+
机位码:${data[0].planePosition || ''}
+
完成状态:${data[0].taskState || ''}
-
- -
+ ${ + data.map(vv=>{ + return ` +
+ ${vv.imgPath ? `` : ''} +
` + }).join('') + }
` }) let html = `
-
-
巡检时间:${i.inspectionTime}
-
巡检数量:${i.totalNumber || 0}
-
正常数量:${i.normalNumber || 0}
-
异常数量:${i.abnormalNumber || 0}
-
跳过数量:${i.skipNumber || 0}
+
+
巡检时间:
${i.inspectionTime}
+
巡检数量:
${i.totalNumber || 0}
+
正常数量:
${i.normalNumber || 0}
+
异常数量:
${i.abnormalNumber || 0}
+
跳过数量:
${i.skipNumber || 0}
${card}
`