commit

amd64/score_server/handler/h_exam.go

@@ -579,30 +579,18 @@ func Report(c *gin.Context) {
 							currentLine++
 						}
 						{
-							{
-								pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
-								_ = pdf.CellWithOption(&gopdf.Rect{W: tableCellWidth, H: lineHeight}, "扣分说明", alignOptionTable)
-							}
+							pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
+							_ = pdf.CellWithOption(&gopdf.Rect{W: tableCellWidth, H: lineHeight}, "扣分说明", alignOptionTable)
 							currentLine++
 						}
 						{
-							{
-								pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
-								_ = pdf.CellWithOption(&gopdf.Rect{W: tableCellWidth, H: lineHeight}, detailsDtos2[i].Reason, alignOptionTable)
-							}
+							pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
+							_ = pdf.CellWithOption(&gopdf.Rect{W: tableCellWidth, H: lineHeight}, detailsDtos2[i].Reason, alignOptionTable)
 							currentLine++
 						}
 					}
 				}
 			}
-			//if size <= 8 {
-			//	// 4 作品优化建议
-			//	{
-			//		pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
-			//		_ = pdf.CellWithOption(&gopdf.Rect{W: tableWidth, H: lineHeight}, "4. 作品优化建议", alignOptionText)
-			//		currentLine++
-			//	}
-			//}
 		}
 		// ------- 详情页 第三页 -------
 
@@ -615,25 +603,19 @@ func Report(c *gin.Context) {
 				tableCellWidth := tableWidth / columnNumber // 单元格宽度
 				for i := 8; i < 10; i++ {
 					{
-						{
-							pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
-							_ = pdf.CellWithOption(&gopdf.Rect{W: tableWidth, H: lineHeight}, "（"+util.ToString(i+1)+"）xxxx场景", alignOptionText)
-							currentLine++
-						}
-						{
-							{
-								pdf.SetXY(leftMargin+2.0*tableCellWidth, topMargin+currentLine*lineHeight)
-								_ = pdf.CellWithOption(&gopdf.Rect{W: tableCellWidth, H: lineHeight}, "扣分说明", alignOptionTable)
-							}
-							currentLine++
-						}
-						{
-							{
-								pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
-								_ = pdf.CellWithOption(&gopdf.Rect{W: tableCellWidth, H: lineHeight}, detailsDtos2[i].Reason, alignOptionTable)
-							}
-							currentLine++
-						}
+						pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
+						_ = pdf.CellWithOption(&gopdf.Rect{W: tableWidth, H: lineHeight}, "（"+util.ToString(i+1)+"）"+detailsDtos2[i].SceneName, alignOptionText)
+						currentLine++
+					}
+					{
+						pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
+						_ = pdf.CellWithOption(&gopdf.Rect{W: tableCellWidth, H: lineHeight}, "扣分说明", alignOptionTable)
+						currentLine++
+					}
+					{
+						pdf.SetXY(leftMargin, topMargin+currentLine*lineHeight)
+						_ = pdf.CellWithOption(&gopdf.Rect{W: tableCellWidth, H: lineHeight}, detailsDtos2[i].Reason, alignOptionTable)
+						currentLine++
 					}
 				}
 			}