添加角度格式选择、展示数据分页，新增水准测段高差正常水准面不平行改正工具

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/controller/CmcNonparallelismCorrectionController.java

@@ -0,0 +1,303 @@
+package com.ruoyi.web.calculate.controller;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.calculate.domain.CmcNonparallelismCorrection;
+import com.ruoyi.web.calculate.service.ICmcNonparallelismCorrectionService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * 非平行差改正Controller
+ * 
+ * @author qyx
+ * @date 2026-06-22
+ */
+@RestController
+@RequestMapping("/calculate/nonparallelismCorrection")
+public class CmcNonparallelismCorrectionController extends BaseController
+{
+    @Autowired
+    private ICmcNonparallelismCorrectionService cmcNonparallelismCorrectionService;
+
+     /**
+     * 导入Excel数据（支持多个工作表）
+     * 
+     * @param file           Excel文件
+     * @param sheetNames     工作表名称列表（可选，为空时读取所有工作表）
+     * @param columnMappings 列映射配置（可选）
+     */
+    @PostMapping("/import")
+    public AjaxResult importExcel(@RequestParam("file") MultipartFile file,
+            @RequestParam(value = "sheetNames", required = false) List<String> sheetNames,
+            @RequestParam(value = "columnMappings", required = false) String columnMappings) {
+        try {
+            // 检查文件是否为空
+            if (file.isEmpty()) {
+                return AjaxResult.error("请选择要导入的文件！");
+            }
+
+            // 检查文件格式
+            String fileName = file.getOriginalFilename();
+            if (fileName == null || (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx"))) {
+                return AjaxResult.error("请上传Excel文件（.xls或.xlsx格式）！");
+            }
+
+            // 调用Service层解析Excel并返回数据
+            return cmcNonparallelismCorrectionService.importExcelData(file, sheetNames, columnMappings);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 导出非平行差改正列表（两个表在同一个Excel文件的两个sheet中）
+     */
+    @Log(title = "非平行差改正", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody Map<String, Object> exportData)
+    {
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            
+            // 解析测段高差表数据
+            List<CmcNonparallelismCorrection> heightDifferenceData = objectMapper.convertValue(
+                exportData.get("heightDifferenceData"),
+                new TypeReference<List<CmcNonparallelismCorrection>>() {}
+            );
+            
+            // 解析不平行改正表数据
+            List<CmcNonparallelismCorrection> correctionData = objectMapper.convertValue(
+                exportData.get("correctionData"),
+                new TypeReference<List<CmcNonparallelismCorrection>>() {}
+            );
+            
+            // 创建Excel工作簿
+            Workbook workbook = new XSSFWorkbook();
+            
+            // 创建测段高差表sheet
+            createHeightDifferenceSheet(workbook, heightDifferenceData);
+            
+            // 创建不平行改正表sheet
+            createCorrectionSheet(workbook, correctionData);
+            
+            // 设置响应头
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment; filename=非平行差改正结果.xlsx");
+            
+            // 写入响应流
+            OutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+            outputStream.close();
+            workbook.close();
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("导出失败：" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 创建测段高差表sheet
+     */
+    private void createHeightDifferenceSheet(Workbook workbook, List<CmcNonparallelismCorrection> dataList) {
+        Sheet sheet = workbook.createSheet("测段高差表");
+        
+        // 创建表头样式
+        CellStyle headerStyle = workbook.createCellStyle();
+        Font headerFont = workbook.createFont();
+        headerFont.setBold(true);
+        headerStyle.setFont(headerFont);
+        headerStyle.setAlignment(HorizontalAlignment.CENTER);
+        headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        headerStyle.setBorderBottom(BorderStyle.THIN);
+        headerStyle.setBorderTop(BorderStyle.THIN);
+        headerStyle.setBorderLeft(BorderStyle.THIN);
+        headerStyle.setBorderRight(BorderStyle.THIN);
+        
+        // 创建数据样式
+        CellStyle dataStyle = workbook.createCellStyle();
+        dataStyle.setAlignment(HorizontalAlignment.CENTER);
+        dataStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        dataStyle.setBorderBottom(BorderStyle.THIN);
+        dataStyle.setBorderTop(BorderStyle.THIN);
+        dataStyle.setBorderLeft(BorderStyle.THIN);
+        dataStyle.setBorderRight(BorderStyle.THIN);
+        
+        // 创建表头行
+        Row headerRow = sheet.createRow(0);
+        String[] headers = {"序号", "起点号", "终点号", "站数", "距离(m)", "高差值(m)", 
+                           "标尺真长(m)", "平均距离(km)", "平均尺改高差(m)", "往返较差(mm)", "限差(mm)", "精度统计", "质量评分"};
+        for (int i = 0; i < headers.length; i++) {
+            Cell cell = headerRow.createCell(i);
+            cell.setCellValue(headers[i]);
+            cell.setCellStyle(headerStyle);
+            sheet.setColumnWidth(i, 4000);
+        }
+        
+        // 填充数据
+        if (dataList != null && !dataList.isEmpty()) {
+            for (int i = 0; i < dataList.size(); i++) {
+                Row row = sheet.createRow(i + 1);
+                CmcNonparallelismCorrection item = dataList.get(i);
+                
+                // 序号（每两行显示一个序号）
+                createCell(row, 0, Math.floor(i / 2) + 1, dataStyle);
+                createCell(row, 1, item.getStartPointNo(), dataStyle);
+                createCell(row, 2, item.getEndPointNo(), dataStyle);
+                createCell(row, 3, item.getStationCount(), dataStyle);
+                createCell(row, 4, item.getDistance(), dataStyle);
+                createCell(row, 5, item.getHeightDifference(), dataStyle);
+                createCell(row, 6, item.getScaleTrueLength(), dataStyle);
+                createCell(row, 7, item.getAverageDistance(), dataStyle);
+                createCell(row, 8, item.getAverageScaleCorrectedHeightDiff(), dataStyle);
+                createCell(row, 9, item.getRoundTripDifference(), dataStyle);
+                createCell(row, 10, item.getTolerance(), dataStyle);
+                createCell(row, 11, item.getPrecisionStatistics(), dataStyle);
+                createCell(row, 12, item.getQualityScore(), dataStyle);
+            }
+            
+            // 合并单元格：每两行合并一次
+            // 需要合并的列索引：0: 序号, 7: 平均距离(km), 8: 平均尺改高差(m), 9: 往返较差(mm), 10: 限差(mm), 11: 精度统计, 12: 质量评分
+            int[] mergeColumns = {0, 7, 8, 9, 10, 11, 12};
+            for (int i = 0; i < dataList.size(); i += 2) {
+                for (int colIndex : mergeColumns) {
+                    if (i + 1 < dataList.size()) {
+                        // 合并当前行和下一行
+                        sheet.addMergedRegion(new CellRangeAddress(i + 1, i + 2, colIndex, colIndex));
+                    }
+                }
+            }
+        }
+    }
+    
+    /**
+     * 创建不平行改正表sheet
+     */
+    private void createCorrectionSheet(Workbook workbook, List<CmcNonparallelismCorrection> dataList) {
+        Sheet sheet = workbook.createSheet("不平行改正表");
+        
+        // 创建表头样式
+        CellStyle headerStyle = workbook.createCellStyle();
+        Font headerFont = workbook.createFont();
+        headerFont.setBold(true);
+        headerStyle.setFont(headerFont);
+        headerStyle.setAlignment(HorizontalAlignment.CENTER);
+        headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        headerStyle.setBorderBottom(BorderStyle.THIN);
+        headerStyle.setBorderTop(BorderStyle.THIN);
+        headerStyle.setBorderLeft(BorderStyle.THIN);
+        headerStyle.setBorderRight(BorderStyle.THIN);
+        
+        // 创建数据样式
+        CellStyle dataStyle = workbook.createCellStyle();
+        dataStyle.setAlignment(HorizontalAlignment.CENTER);
+        dataStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        dataStyle.setBorderBottom(BorderStyle.THIN);
+        dataStyle.setBorderTop(BorderStyle.THIN);
+        dataStyle.setBorderLeft(BorderStyle.THIN);
+        dataStyle.setBorderRight(BorderStyle.THIN);
+        
+        // 创建表头行
+        Row headerRow = sheet.createRow(0);
+        String[] headers = {"待求点", "纵坐标X(m)", "横坐标Y(m)", "高程H(m)", "带号", "带宽(°)",
+                           "大地经度(°′″)", "大地纬度(°′″)", "点间改正ε(m)", "改正后高差(m)", "高程(m)",
+                           "距起点距离(m)", "高程中误差(m)"};
+        for (int i = 0; i < headers.length; i++) {
+            Cell cell = headerRow.createCell(i);
+            cell.setCellValue(headers[i]);
+            cell.setCellStyle(headerStyle);
+            sheet.setColumnWidth(i, 5000);
+        }
+        
+        // 填充数据
+        if (dataList != null && !dataList.isEmpty()) {
+            for (int i = 0; i < dataList.size(); i++) {
+                Row row = sheet.createRow(i + 1);
+                CmcNonparallelismCorrection item = dataList.get(i);
+                
+                createCell(row, 0, item.getPendingPoint(), dataStyle);
+                createCell(row, 1, item.getCoordinateX(), dataStyle);
+                createCell(row, 2, item.getCoordinateY(), dataStyle);
+                createCell(row, 3, item.getHeightH(), dataStyle);
+                createCell(row, 4, item.getZoneNo(), dataStyle);
+                createCell(row, 5, item.getBandWidth(), dataStyle);
+                createCell(row, 6, item.getGeodeticLongitude(), dataStyle);
+                createCell(row, 7, item.getGeodeticLatitude(), dataStyle);
+                createCell(row, 8, item.getPointCorrection(), dataStyle);
+                createCell(row, 9, item.getCorrectedHeightDifference(), dataStyle);
+                createCell(row, 10, item.getElevation(), dataStyle);
+                createCell(row, 11, item.getDistanceFromStart(), dataStyle);
+                createCell(row, 12, item.getHeightMiddleError(), dataStyle);
+            }
+            
+            // 合并单元格：每两行合并一次
+            // 需要合并的列索引：8: 点间改正ε(m), 9: 改正后高差(m)
+            int[] mergeColumns = {8, 9};
+            for (int i = 0; i < dataList.size(); i += 2) {
+                for (int colIndex : mergeColumns) {
+                    if (i + 1 < dataList.size()) {
+                        // 合并当前行和下一行
+                        sheet.addMergedRegion(new CellRangeAddress(i + 1, i + 2, colIndex, colIndex));
+                    }
+                }
+            }
+        }
+    }
+    
+    /**
+     * 创建单元格并设置值
+     */
+    private void createCell(Row row, int column, Object value, CellStyle style) {
+        Cell cell = row.createCell(column);
+        if (value == null) {
+            cell.setCellValue("");
+        } else if (value instanceof Number) {
+            cell.setCellValue(((Number) value).doubleValue());
+        } else {
+            cell.setCellValue(value.toString());
+        }
+        cell.setCellStyle(style);
+    }
+
+    /**
+     * 执行非平行差改正计算（仅计算，不保存）
+     */
+    @PostMapping("/calculate")
+    public AjaxResult calculate(@RequestBody List<CmcNonparallelismCorrection> dataList)
+    {
+        List<CmcNonparallelismCorrection> result = cmcNonparallelismCorrectionService.calculateNonparallelismCorrection(dataList);
+        return success(result);
+    }
+}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/domain/CmcGaussNegative.java

@@ -36,7 +36,7 @@ public class CmcGaussNegative extends BaseEntity {
     
     /** 带号 */
     @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
+    private Double band;
 
     /** 带宽 */
     @Excel(name = "带宽", cellType = ColumnType.NUMERIC)
@@ -62,6 +62,9 @@ public class CmcGaussNegative extends BaseEntity {
     @Excel(name = "投影面高程", cellType = ColumnType.NUMERIC)
     private double projectionHeight;
 
+    /** 输出格式：degree(度) / dms(度分秒) */
+    private String outputFormat;
+
 
     public void setId(Long id) 
     {
@@ -142,12 +145,12 @@ public class CmcGaussNegative extends BaseEntity {
         return latitudePosition;
     }
     
-    public void setBand(Integer band) 
+    public void setBand(Double band) 
     {
         this.band = band;
     }
 
-    public Integer getBand() 
+    public Double getBand() 
     {
         return band;
     }
@@ -172,6 +175,16 @@ public class CmcGaussNegative extends BaseEntity {
         return projectionHeight;
     }
     
+    public void setOutputFormat(String outputFormat) 
+    {
+        this.outputFormat = outputFormat;
+    }
+
+    public String getOutputFormat() 
+    {
+        return outputFormat;
+    }
+    
     public void setGaussX(Double gaussX) 
     {
         this.gaussX = gaussX;

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/domain/CmcGaussPositive.java

@@ -48,7 +48,7 @@ public class CmcGaussPositive extends BaseEntity
 
     /** 带号 */
     @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
+    private double band;
 
     /** 带宽 */
     @Excel(name = "带宽", cellType = ColumnType.NUMERIC)
@@ -58,6 +58,9 @@ public class CmcGaussPositive extends BaseEntity
     @Excel(name = "投影面高程", cellType = ColumnType.NUMERIC)
     private double projectionHeight;
 
+    /** 角度格式：degree(度) / dms(度分秒) */
+    private String angleFormat;
+
     /** 高斯坐标x */
     @Excel(name = "高斯坐标x", cellType = ColumnType.NUMERIC, numberFormat = "0.0000")
     private Double gaussX;
@@ -149,12 +152,12 @@ public class CmcGaussPositive extends BaseEntity
         return latitudePosition;
     }
     
-    public void setBand(Integer band) 
+    public void setBand(double band) 
     {
         this.band = band;
     }
 
-    public Integer getBand() 
+    public double getBand() 
     {
         return band;
     }
@@ -179,6 +182,16 @@ public class CmcGaussPositive extends BaseEntity
         return projectionHeight;
     }
     
+    public void setAngleFormat(String angleFormat) 
+    {
+        this.angleFormat = angleFormat;
+    }
+
+    public String getAngleFormat() 
+    {
+        return angleFormat;
+    }
+    
     public void setGaussX(Double gaussX) 
     {
         this.gaussX = gaussX;

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/domain/CmcGeodeticToSpatial.java

@@ -65,6 +65,9 @@ public class CmcGeodeticToSpatial extends BaseEntity
     @Excel(name = "投影面高程", cellType = ColumnType.NUMERIC)
     private double projectionHeight;
 
+    /** 角度格式：degree(度) / dms(度分秒) */
+    private String angleFormat;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -202,6 +205,16 @@ public class CmcGeodeticToSpatial extends BaseEntity
     {
         return projectionHeight;
     }
+    
+    public void setAngleFormat(String angleFormat) 
+    {
+        this.angleFormat = angleFormat;
+    }
+
+    public String getAngleFormat() 
+    {
+        return angleFormat;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/domain/CmcNonparallelismCorrection.java

@@ -0,0 +1,511 @@
+package com.ruoyi.web.calculate.domain;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 非平行差改正计算对象 cmc_nonparallelism_correction
+ * 
+ * @author qyx
+ * @date 2026-06-22
+ */
+public class CmcNonparallelismCorrection extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 起点号 */
+    @Excel(name = "起点号")
+    private String startPointNo;
+
+    /** 终点号 */
+    @Excel(name = "终点号")
+    private String endPointNo;
+
+    /** 站数 */
+    @Excel(name = "站数", cellType = ColumnType.NUMERIC)
+    private Integer stationCount;
+
+    /** 距离（m） */
+    @Excel(name = "距离（m）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double distance;
+
+    /** 高差值（m） */
+    @Excel(name = "高差值（m）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double heightDifference;
+
+    /** 标尺真长（m） */
+    @Excel(name = "标尺真长（m）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double scaleTrueLength;
+
+    /** 平均距离（km） */
+    @Excel(name = "平均距离（km）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double averageDistance;
+
+    /** 尺改高差(m) */
+    @Excel(name = "尺改高差(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double scaleCorrectedHeightDiff;
+
+    /** 平均尺改高差(m) */
+    @Excel(name = "平均尺改高差(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double averageScaleCorrectedHeightDiff;
+
+    /** 往返较差(mm) */
+    @Excel(name = "往返较差(mm)", cellType = ColumnType.NUMERIC, numberFormat = "0.000")
+    private Double roundTripDifference;
+
+    /** 限差(mm) */
+    @Excel(name = "限差(mm)", cellType = ColumnType.NUMERIC, numberFormat = "0.000")
+    private Double tolerance;
+
+    /** 精度统计 */
+    @Excel(name = "精度统计", cellType = ColumnType.NUMERIC, numberFormat = "0.000")
+    private double precisionStatistics;
+
+    /** 质量评分 */
+    @Excel(name = "质量评分", cellType = ColumnType.NUMERIC, numberFormat = "0.00")
+    private Double qualityScore;
+
+    /** 待求点 */
+    @Excel(name = "待求点")
+    private String pendingPoint;
+
+    /** 纵坐标X(m) */
+    @Excel(name = "纵坐标X(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double coordinateX;
+
+    /** 横坐标Y(m) */
+    @Excel(name = "横坐标Y(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double coordinateY;
+
+    /** 高程H(m) */
+    @Excel(name = "高程H(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double heightH;
+
+    /** 坐标系 */
+    @Excel(name = "坐标系")
+    private String coordinateSystem;
+
+    /** 带号 */
+    @Excel(name = "带号", cellType = ColumnType.NUMERIC)
+    private Double zoneNo;
+
+    /** 带宽（°） */
+    @Excel(name = "带宽（°）", cellType = ColumnType.NUMERIC, numberFormat = "0.0")
+    private Double bandWidth;
+
+    /** 大地经度(° ′ ″) */
+    @Excel(name = "大地经度(° ′ ″)")
+    private double geodeticLongitude;
+
+    /** 大地纬度(° ′ ″) */
+    @Excel(name = "大地纬度(° ′ ″)")
+    private double geodeticLatitude;
+
+    /** 点间改正ε(m) */
+    @Excel(name = "点间改正ε(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double pointCorrection;
+
+    /** 改正后高差(m) */
+    @Excel(name = "改正后高差(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double correctedHeightDifference;
+
+    /** 高程(m) */
+    @Excel(name = "高程(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double elevation;
+
+    /** 起点距(km) */
+    @Excel(name = "起点距(km)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double distanceFromStart;
+
+    /** 高程中误差(mm) */
+    @Excel(name = "高程中误差(mm)", cellType = ColumnType.NUMERIC, numberFormat = "0.000")
+    private Double heightMiddleError;
+
+    /** 水准等级 */
+    @Excel(name = "水准等级", cellType = ColumnType.NUMERIC)
+    private int level;
+
+    /** 纬度位置 */
+    @Excel(name = "纬度位置")
+    private String latitudePosition;
+
+    /** 经度位置 */
+    @Excel(name = "经度位置")
+    private String longitudePosition;
+
+    /**投影面高程(m) */
+    @Excel(name = "投影面高程(m)", cellType = ColumnType.NUMERIC, numberFormat = "0.000000")
+    private Double projectionHeight;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    
+    public void setStartPointNo(String startPointNo) 
+    {
+        this.startPointNo = startPointNo;
+    }
+
+    public String getStartPointNo() 
+    {
+        return startPointNo;
+    }
+
+    public void setEndPointNo(String endPointNo) 
+    {
+        this.endPointNo = endPointNo;
+    }
+
+    public String getEndPointNo() 
+    {
+        return endPointNo;
+    }
+
+    public void setStationCount(Integer stationCount) 
+    {
+        this.stationCount = stationCount;
+    }
+
+    public Integer getStationCount() 
+    {
+        return stationCount;
+    }
+
+    public void setDistance(Double distance) 
+    {
+        this.distance = distance;
+    }
+
+    public Double getDistance() 
+    {
+        return distance;
+    }
+
+    public void setHeightDifference(Double heightDifference) 
+    {
+        this.heightDifference = heightDifference;
+    }
+
+    public Double getHeightDifference() 
+    {
+        return heightDifference;
+    }
+
+    public void setScaleTrueLength(Double scaleTrueLength) 
+    {
+        this.scaleTrueLength = scaleTrueLength;
+    }
+
+    public Double getScaleTrueLength() 
+    {
+        return scaleTrueLength;
+    }
+
+    public void setAverageDistance(Double averageDistance) 
+    {
+        this.averageDistance = averageDistance;
+    }
+
+    public Double getAverageDistance() 
+    {
+        return averageDistance;
+    }
+
+    public void setScaleCorrectedHeightDiff(Double scaleCorrectedHeightDiff) 
+    {
+        this.scaleCorrectedHeightDiff = scaleCorrectedHeightDiff;
+    }
+
+    public Double getScaleCorrectedHeightDiff() 
+    {
+        return scaleCorrectedHeightDiff;
+    }
+
+    public void setAverageScaleCorrectedHeightDiff(Double averageScaleCorrectedHeightDiff) 
+    {
+        this.averageScaleCorrectedHeightDiff = averageScaleCorrectedHeightDiff;
+    }
+
+    public Double getAverageScaleCorrectedHeightDiff() 
+    {
+        return averageScaleCorrectedHeightDiff;
+    }
+
+    public void setRoundTripDifference(Double roundTripDifference) 
+    {
+        this.roundTripDifference = roundTripDifference;
+    }
+
+    public Double getRoundTripDifference() 
+    {
+        return roundTripDifference;
+    }
+
+    public void setTolerance(Double tolerance) 
+    {
+        this.tolerance = tolerance;
+    }
+
+    public Double getTolerance() 
+    {
+        return tolerance;
+    }
+
+    public void setPrecisionStatistics(double precisionStatistics) 
+    {
+        this.precisionStatistics = precisionStatistics;
+    }
+
+    public double getPrecisionStatistics() 
+    {
+        return precisionStatistics;
+    }
+
+    public void setQualityScore(Double qualityScore) 
+    {
+        this.qualityScore = qualityScore;
+    }
+
+    public Double getQualityScore() 
+    {
+        return qualityScore;
+    }
+
+    public void setPendingPoint(String pendingPoint) 
+    {
+        this.pendingPoint = pendingPoint;
+    }
+
+    public String getPendingPoint() 
+    {
+        return pendingPoint;
+    }
+
+    public void setCoordinateX(Double coordinateX) 
+    {
+        this.coordinateX = coordinateX;
+    }
+
+    public Double getCoordinateX() 
+    {
+        return coordinateX;
+    }
+
+    public void setCoordinateY(Double coordinateY) 
+    {
+        this.coordinateY = coordinateY;
+    }
+
+    public Double getCoordinateY() 
+    {
+        return coordinateY;
+    }
+
+    public void setHeightH(Double heightH) 
+    {
+        this.heightH = heightH;
+    }
+
+    public Double getHeightH() 
+    {
+        return heightH;
+    }
+
+    public void setCoordinateSystem(String coordinateSystem) 
+    {
+        this.coordinateSystem = coordinateSystem;
+    }
+
+    public String getCoordinateSystem() 
+    {
+        return coordinateSystem;
+    }
+
+    public void setZoneNo(Double zoneNo) 
+    {
+        this.zoneNo = zoneNo;
+    }
+
+    public Double getZoneNo() 
+    {
+        return zoneNo;
+    }
+
+    public void setBandWidth(Double bandWidth) 
+    {
+        this.bandWidth = bandWidth;
+    }
+
+    public Double getBandWidth() 
+    {
+        return bandWidth;
+    }
+
+    public void setGeodeticLongitude(double geodeticLongitude) 
+    {
+        this.geodeticLongitude = geodeticLongitude;
+    }
+
+    public double getGeodeticLongitude() 
+    {
+        return geodeticLongitude;
+    }
+
+    public void setGeodeticLatitude(double geodeticLatitude) 
+    {
+        this.geodeticLatitude = geodeticLatitude;
+    }
+
+    public double getGeodeticLatitude() 
+    {
+        return geodeticLatitude;
+    }
+
+    public void setPointCorrection(double pointCorrection) 
+    {
+        this.pointCorrection = pointCorrection;
+    }
+
+    public Double getPointCorrection() 
+    {
+        return pointCorrection;
+    }
+
+    public void setCorrectedHeightDifference(Double correctedHeightDifference) 
+    {
+        this.correctedHeightDifference = correctedHeightDifference;
+    }
+
+    public Double getCorrectedHeightDifference() 
+    {
+        return correctedHeightDifference;
+    }
+
+    public void setElevation(Double elevation) 
+    {
+        this.elevation = elevation;
+    }
+
+    public Double getElevation() 
+    {
+        return elevation;
+    }
+
+    public void setDistanceFromStart(Double distanceFromStart) 
+    {
+        this.distanceFromStart = distanceFromStart;
+    }
+
+    public Double getDistanceFromStart() 
+    {
+        return distanceFromStart;
+    }
+
+    public void setHeightMiddleError(Double heightMiddleError) 
+    {
+        this.heightMiddleError = heightMiddleError;
+    }
+
+    public Double getHeightMiddleError() 
+    {
+        return heightMiddleError;
+    }
+
+    public void setLevel(int level) 
+    {
+        this.level = level;
+    }
+
+    public int getLevel() 
+    {
+        return level;
+    }
+
+    public void setLatitudePosition(String latitudePosition) 
+    {
+        this.latitudePosition = latitudePosition;
+    }
+
+    public String getLatitudePosition() 
+    {
+        return latitudePosition;
+    }
+
+    public void setLongitudePosition(String longitudePosition) 
+    {
+        this.longitudePosition = longitudePosition;
+    }
+
+    public String getLongitudePosition() 
+    {
+        return longitudePosition;
+    }
+    
+    public void setProjectionHeight(Double projectionHeight) 
+    {
+        this.projectionHeight = projectionHeight;
+    }
+
+    public Double getProjectionHeight() 
+    {
+        return projectionHeight;
+    }
+
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("startPointNo", getStartPointNo())
+            .append("endPointNo", getEndPointNo())
+            .append("stationCount", getStationCount())
+            .append("distance", getDistance())
+            .append("heightDifference", getHeightDifference())
+            .append("scaleTrueLength", getScaleTrueLength())
+            .append("averageDistance", getAverageDistance())
+            .append("scaleCorrectedHeightDiff", getScaleCorrectedHeightDiff())
+            .append("averageScaleCorrectedHeightDiff", getAverageScaleCorrectedHeightDiff())
+            .append("roundTripDifference", getRoundTripDifference())
+            .append("tolerance", getTolerance())
+            .append("precisionStatistics", getPrecisionStatistics())
+            .append("qualityScore", getQualityScore())
+            .append("pendingPoint", getPendingPoint())
+            .append("coordinateX", getCoordinateX())
+            .append("coordinateY", getCoordinateY())
+            .append("heightH", getHeightH())
+            .append("coordinateSystem", getCoordinateSystem())
+            .append("zoneNo", getZoneNo())
+            .append("bandWidth", getBandWidth())
+            .append("geodeticLongitude", getGeodeticLongitude())
+            .append("geodeticLatitude", getGeodeticLatitude())
+            .append("pointCorrection", getPointCorrection())
+            .append("correctedHeightDifference", getCorrectedHeightDifference())
+            .append("elevation", getElevation())
+            .append("distanceFromStart", getDistanceFromStart())
+            .append("heightMiddleError", getHeightMiddleError())
+            .append("level", getLevel())
+            .append("latitudePosition", getLatitudePosition())
+            .append("longitudePosition", getLongitudePosition())
+            .append("projectionHeight", getProjectionHeight())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/domain/CmcSpatialToGeodetic.java

@@ -66,6 +66,9 @@ public class CmcSpatialToGeodetic extends BaseEntity
     @Excel(name = "投影面高程", cellType = ColumnType.NUMERIC)
     private double projectionHeight;
 
+    /** 输出角度格式：degree(度) / dms(度分秒) */
+    private String outputFormat;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -203,6 +206,16 @@ public class CmcSpatialToGeodetic extends BaseEntity
     {
         return projectionHeight;
     }
+    
+    public void setOutputFormat(String outputFormat) 
+    {
+        this.outputFormat = outputFormat;
+    }
+
+    public String getOutputFormat() 
+    {
+        return outputFormat;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/domain/CmcUTMNegative.java

@@ -40,12 +40,15 @@ public class CmcUTMNegative extends BaseEntity
 
     /** 带号 */
     @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
+    private Double band;
 
     /** 投影面高程 */
     @Excel(name = "投影面高程", cellType = ColumnType.NUMERIC)
     private double projectionHeight;
 
+    /** 输出格式：degree(度) / dms(度分秒) */
+    private String outputFormat;
+
     /** 大地经度 */
     @Excel(name = "大地经度" , cellType = ColumnType.NUMERIC,numberFormat = "0.000000000")
     private Double longitude;
@@ -109,12 +112,12 @@ public class CmcUTMNegative extends BaseEntity
         return utmY;
     }
     
-    public void setBand(Integer band) 
+    public void setBand(Double band) 
     {
         this.band = band;
     }
 
-    public Integer getBand() 
+    public Double getBand() 
     {
         return band;
     }
@@ -129,6 +132,16 @@ public class CmcUTMNegative extends BaseEntity
         return projectionHeight;
     }
     
+    public void setOutputFormat(String outputFormat) 
+    {
+        this.outputFormat = outputFormat;
+    }
+
+    public String getOutputFormat() 
+    {
+        return outputFormat;
+    }
+    
     public void setLongitude(Double longitude) 
     {
         if (longitude != null) {

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/domain/CmcUTMPositive.java

@@ -48,12 +48,15 @@ public class CmcUTMPositive extends BaseEntity
 
     /** 带号 */
     @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
+    private Double band;
 
     /** 投影面高程 */
     @Excel(name = "投影面高程", cellType = ColumnType.NUMERIC)
     private double projectionHeight;
 
+    /** 角度格式：degree(度) / dms(度分秒) */
+    private String angleFormat;
+
     /** UTM坐标x */
     @Excel(name = "UTM坐标x", cellType = ColumnType.NUMERIC, numberFormat = "0.0000")
     private Double utmX;
@@ -143,12 +146,12 @@ public class CmcUTMPositive extends BaseEntity
         return latitudePosition;
     }
     
-    public void setBand(Integer band) 
+    public void setBand(Double band) 
     {
         this.band = band;
     }
 
-    public Integer getBand() 
+    public Double getBand() 
     {
         return band;
     }
@@ -163,6 +166,16 @@ public class CmcUTMPositive extends BaseEntity
         return projectionHeight;
     }
     
+    public void setAngleFormat(String angleFormat) 
+    {
+        this.angleFormat = angleFormat;
+    }
+
+    public String getAngleFormat() 
+    {
+        return angleFormat;
+    }
+    
     public void setUtmX(Double utmX) 
     {
         this.utmX = utmX;
@@ -213,6 +226,8 @@ public class CmcUTMPositive extends BaseEntity
             .append("utmX", getUtmX())
             .append("utmY", getUtmY())
             .append("meridianConvergence", getMeridianConvergence())
+            .append("projectionHeight", getProjectionHeight())
+            .append("angleFormat", getAngleFormat())
             .append("createTime", getCreateTime())
             .append("createBy", getCreateBy())
             .append("updateTime", getUpdateTime())

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/service/ICmcNonparallelismCorrectionService.java

@@ -0,0 +1,48 @@
+package com.ruoyi.web.calculate.service;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.calculate.domain.CmcEleDifSideLandDir;
+import com.ruoyi.web.calculate.domain.CmcNonparallelismCorrection;
+
+/**
+ * 非平行差改正服务接口
+ * 
+ * @author qyx
+ * @date 2026-06-22
+ */
+public interface ICmcNonparallelismCorrectionService {
+
+    /**
+     * 导入Excel数据（支持多个工作表和列映射）
+     * 
+     * @param file           Excel文件
+     * @param sheetNames     工作表名称列表（可选，为空时读取所有工作表）
+     * @param columnMappings 列映射配置（JSON字符串）
+     * @return 导入结果
+     */
+    public AjaxResult importExcelData(MultipartFile file, List<String> sheetNames, String columnMappings);
+
+    /**
+     * 执行非平行差改正计算
+     * 
+     * @param cmcNonparallelismCorrection 非平行差改正参数
+     * @return 计算结果
+     */
+    public List<CmcNonparallelismCorrection> calculateNonparallelismCorrection(
+            List<CmcNonparallelismCorrection> dataList);
+
+    /**
+    * 获取Excel文件的所有工作表名称
+    * 
+    * @param file Excel文件
+    * @return 工作表名称列表
+    */
+    public List<String> getSheetNames(MultipartFile file);
+}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/service/impl/CmcGaussNegativeServiceImpl.java

@@ -232,19 +232,20 @@ public class CmcGaussNegativeServiceImpl implements ICmcGaussNegativeService {
     }
 
     /**
-     * 单条高斯正算
+     * 单条高斯反算
      */
     private CmcGaussNegative calculateGaussNegativeSingle(CmcGaussNegative cmcGaussNegative) {
         try {
             initEllipsoidParams(cmcGaussNegative.getCoordinateSystem());
             
-            double gaussX = cmcGaussNegative.getGaussX(); // 经度（度）
-            double gaussY = cmcGaussNegative.getGaussY(); // 经度（度）
-            String longitudePosition = cmcGaussNegative.getLongitudePosition(); // 经度位置（东/西）
-            String latitudePosition = cmcGaussNegative.getLatitudePosition(); // 纬度位置（北/南）
-            double projectionHeight = cmcGaussNegative.getProjectionHeight(); // 投影面高程
+            double gaussX = cmcGaussNegative.getGaussX();
+            double gaussY = cmcGaussNegative.getGaussY();
+            String longitudePosition = cmcGaussNegative.getLongitudePosition();
+            String latitudePosition = cmcGaussNegative.getLatitudePosition();
+            double projectionHeight = cmcGaussNegative.getProjectionHeight();
+            String outputFormat = cmcGaussNegative.getOutputFormat();
             String yStr = String.valueOf(Math.abs((long) gaussY));
-            int band = cmcGaussNegative.getBand();
+            double band = cmcGaussNegative.getBand();
             int bandwidth = cmcGaussNegative.getBandwidth();
 
             double x = latitudePosition.equals("S") ? 10000000 - gaussX : gaussX;
@@ -264,9 +265,19 @@ public class CmcGaussNegativeServiceImpl implements ICmcGaussNegativeService {
             //计算L
             double L = calculateL(bf, tf, etaf2, n, longitudePosition, bandwidth, band);
 
-            //大地经度和大地纬度
-            double longitude = convertDecimalDegrees(L);
-            double latitude = convertDecimalDegrees(B);
+            double longitude = L;
+            double latitude = B;
+            //大地经度和大地纬度（默认为度分秒格式）
+            if ("dms".equals(outputFormat)) {
+                longitude = convertDecimalDegrees(L);
+                latitude = convertDecimalDegrees(B);
+            }
+            
+            // 如果输出格式为度（degree），则将度分秒转换为十进制度
+            // if ("degree".equalsIgnoreCase(outputFormat)) {
+            //     longitude = convertDMSToDegree(longitude);
+            //     latitude = convertDMSToDegree(latitude);
+            // }
 
             cmcGaussNegative.setLongitude(longitude);
             cmcGaussNegative.setLatitude(latitude);
@@ -404,7 +415,7 @@ public class CmcGaussNegativeServiceImpl implements ICmcGaussNegativeService {
     }
 
     /**
-     * 将十进制度数数值转换为度分秒格式（
+     * 将度分秒数值转换为十进制度数（
      * 
      * @param decimalDegrees 十进制度数数值
      * @return 转换后的值

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/service/impl/CmcGaussPositiveServiceImpl.java

@@ -243,11 +243,18 @@ public class CmcGaussPositiveServiceImpl implements ICmcGaussPositiveService
         try {
             initEllipsoidParams(cmcGaussPositive.getCoordinateSystem());
 
-            double longitude = cmcGaussPositive.getLongitude(); // 经度（度）
+            double longitude = cmcGaussPositive.getLongitude(); // 经度
             String longitudePosition = cmcGaussPositive.getLongitudePosition(); // 经度位置（东/西）
             String latitudePosition = cmcGaussPositive.getLatitudePosition(); // 纬度位置（北/南）
-            double latitude = cmcGaussPositive.getLatitude(); // 纬度（度）
-            Integer band = cmcGaussPositive.getBand(); // 带号
+            double latitude = cmcGaussPositive.getLatitude(); // 纬度
+            String angleFormat = cmcGaussPositive.getAngleFormat(); // 角度格式
+            
+            // 如果输入格式为度（degree），先转换为度分秒格式
+            // if ("degree".equalsIgnoreCase(angleFormat)) {
+            //     longitude = convertDegreeToDMS(longitude);
+            //     latitude = convertDegreeToDMS(latitude);
+            // }
+            double band = cmcGaussPositive.getBand(); // 带号
             int bandwidth = cmcGaussPositive.getBandwidth(); // 带宽
             double projectionHeight = cmcGaussPositive.getProjectionHeight(); // 投影面高程
 
@@ -258,14 +265,18 @@ public class CmcGaussPositiveServiceImpl implements ICmcGaussPositiveService
             } else { // 3度带
                 centralMeridian = band * 3;
             }
+            double B = latitude * Math.PI / 180;
+            double L = longitude;
             // 转换为弧度
-            double B = convertDecimalDegrees(latitude) * Math.PI / 180;
-            double L = convertDecimalDegrees(longitude);
+            if ("dms".equalsIgnoreCase(angleFormat)) {
+                B = convertDecimalDegrees(latitude) * Math.PI / 180;
+                L = convertDecimalDegrees(longitude);
+            }
             // double L0 = Math.toRadians(centralMeridian);
            
             // 计算经差
             double l = (centralMeridian - L) * Math.PI / 180;
-            // 处理西经情况
+            // 处理东经度情况
             if ("东".equals(longitudePosition) || "E".equalsIgnoreCase(longitudePosition)) {
                 l = (L - centralMeridian) * Math.PI / 180;
             }
@@ -399,6 +410,28 @@ public class CmcGaussPositiveServiceImpl implements ICmcGaussPositiveService
         return X;
     }
     
+    /**
+     * 将十进制度数转换为度分秒格式数值（DD.MMSSssss）
+     * 与 calculateDegreeToDMSSingle 方法逻辑相同
+     * 
+     * @param decimalDegrees 十进制度数（如 103.373428195）
+     * @return 度分秒格式数值（如 103.22240038）
+     */
+    private double convertDegreeToDMS(double decimalDegrees) {
+        // 1. 提取度
+        double degrees = Math.floor(decimalDegrees + 1.0E-13);
+        
+        // 2. 提取分
+        double minutesRaw = 60 * (decimalDegrees - degrees);
+        double minutes = Math.floor(minutesRaw + 1.0E-13) / 100;
+        
+        // 3. 提取秒
+        double secondsRaw = 60 * (60 * decimalDegrees - Math.floor(60 * decimalDegrees + 1.0E-13)) + 1.0E-13;
+        double seconds = secondsRaw / 10000;
+        
+        return degrees + minutes + seconds;
+    }
+    
     /**
      * 将十进制度数转换为特定格式（
      * @param decimalDegrees 十进制度数

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/service/impl/CmcGeodeticToSpatialServiceImpl.java

@@ -283,17 +283,23 @@ public class CmcGeodeticToSpatialServiceImpl implements ICmcGeodeticToSpatialSer
         String latitudePosition = cmcGeodeticToSpatial.getLatitudePosition(); // 纬度位置 N/S
         double projectionHeight = cmcGeodeticToSpatial.getProjectionHeight(); // 投影高
         double height = cmcGeodeticToSpatial.getHeight(); // 大地高
+        String angleFormat = cmcGeodeticToSpatial.getAngleFormat(); // 角度格式
         double j = 1.5e-12;
 
         // 初始化椭球参数
         initEllipsoidParams(coordinateSystem);
 
         double a = A + projectionHeight;
-        // 将角度转换为弧度
-        double B = latitudePosition.equals("N") ? calculateRadianValue(latitude, j)
-                : -calculateRadianValue(latitude, j); // 纬度弧度
-        double L = longitudePosition.equals("E") ? calculateRadianValue(longitude, j)
-                : -calculateRadianValue(longitude, j);// 经度弧度
+        double B = latitude / 180.0 * Math.PI;
+        double L = longitude / 180.0 * Math.PI;
+        if("dms".equalsIgnoreCase(angleFormat)){
+            // 将角度转换为弧度
+            B = latitudePosition.equals("N") ? calculateRadianValue(latitude, j)
+                    : -calculateRadianValue(latitude, j); // 纬度弧度
+            L = longitudePosition.equals("E") ? calculateRadianValue(longitude, j)
+                    : -calculateRadianValue(longitude, j);// 经度弧度
+        }
+        
 
         // 计算卯酉圈曲率半径 N = a / sqrt(1 - e² * sin²(B))
         double sinB = Math.sin(B);

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/service/impl/CmcNonparallelismCorrectionServiceImpl.java

@@ -0,0 +1,785 @@
+package com.ruoyi.web.calculate.service.impl;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.web.calculate.domain.CmcNonparallelismCorrection;
+import com.ruoyi.web.calculate.service.ICmcNonparallelismCorrectionService;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+/**
+ * 非平行差改正服务实现
+ * 
+ * @author qyx
+ * @date 2026-06-22
+ */
+@Service
+public class CmcNonparallelismCorrectionServiceImpl implements ICmcNonparallelismCorrectionService {
+
+    // 扁率直接计算精度不够，在后面的椭球参数选择中用BigDecimal计算，下面的F是分母
+    private static final double A_WGS84 = 6378137.0;
+    private static final String F_WGS84 = "298.257223563";
+
+    private static final double A_CGCS2000 = 6378137.0;
+    private static final String F_CGCS2000 = "298.257222101";
+
+    private static final double A_BJ54 = 6378245.0;
+    private static final String F_BJ54 = "298.3";
+
+    private static final double A_XA80 = 6378140.0;
+    private static final String F_XA80 = "298.257";
+
+    private static double A;
+    private static double F;
+    private static double E2;
+
+    
+    /**
+     * 导入Excel数据（支持多个工作表和列映射）
+     * 重构后：返回所有工作表信息，由前端选择工作表和配置字段映射
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult importExcelData(MultipartFile file, List<String> sheetNames, String columnMappingsJson) {
+        try {
+            // 获取所有工作表名称
+            List<String> allSheetNames = getSheetNames(file);
+            
+            // 存储每个工作表的信息
+            List<Map<String, Object>> sheetInfoList = new ArrayList<>();
+            
+            // 读取每个工作表的表头和原始数据
+            for (String sheetName : allSheetNames) {
+                List<String> headers = readSheetHeaders(file, sheetName);
+                List<Map<String, Object>> rawData = readRawSheetDataAsMap(file, sheetName, headers);
+                
+                Map<String, Object> sheetInfo = new HashMap<>();
+                sheetInfo.put("sheetName", sheetName);
+                sheetInfo.put("headers", headers);
+                sheetInfo.put("rawData", rawData);
+                sheetInfoList.add(sheetInfo);
+            }
+
+            // 构建返回结果（参考gausspositive格式，但支持多sheet）
+            Map<String, Object> result = new HashMap<>();
+            result.put("sheetNames", allSheetNames);
+            result.put("sheetInfo", sheetInfoList);
+
+            String message = String.format("导入成功！共%d个工作表", allSheetNames.size());
+            return AjaxResult.success(message, result);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("导入失败：" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 读取工作表的表头信息
+     * 
+     * @param file Excel文件
+     * @param sheetName 工作表名称
+     * @return 表头列表
+     */
+    private List<String> readSheetHeaders(MultipartFile file, String sheetName) {
+        List<String> headers = new ArrayList<>();
+        
+        try (InputStream inputStream = file.getInputStream();
+             Workbook workbook = createWorkbook(inputStream, file.getOriginalFilename())) {
+            // 查找指定名称的工作表
+            Sheet sheet = workbook.getSheet(sheetName);
+            
+            if (sheet == null) {
+                // 如果按名称找不到，尝试按索引查找
+                try {
+                    int sheetIndex = Integer.parseInt(sheetName);
+                    sheet = workbook.getSheetAt(sheetIndex);
+                } catch (NumberFormatException e) {
+                    return headers;
+                }
+            }
+            
+            if (sheet == null) {
+                return headers;
+            }
+            
+            // 读取第一行作为表头
+            org.apache.poi.ss.usermodel.Row headerRow = sheet.getRow(0);
+            if (headerRow != null) {
+                int lastCellNum = headerRow.getLastCellNum();
+                for (int i = 0; i < lastCellNum; i++) {
+                    String header = getCellStringValue(headerRow.getCell(i));
+                    // 过滤掉null、空字符串和"null"字符串的表头，避免生成null键导致JSON序列化失败
+                    if (header != null && !header.trim().isEmpty() && !"null".equalsIgnoreCase(header.trim())) {
+                        headers.add(header);
+                    }
+                }
+            }
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return headers;
+    }
+    
+    /**
+     * 读取工作表的原始数据（从第二行开始），转换为Map格式
+     * 
+     * @param file Excel文件
+     * @param sheetName 工作表名称
+     * @param headers 表头列表
+     * @return 原始数据列表（Map格式）
+     */
+    private List<Map<String, Object>> readRawSheetDataAsMap(MultipartFile file, String sheetName, List<String> headers) {
+        List<Map<String, Object>> rawData = new ArrayList<>();
+        
+        try (InputStream inputStream = file.getInputStream();
+             Workbook workbook = createWorkbook(inputStream, file.getOriginalFilename())) {
+            // 查找指定名称的工作表
+            Sheet sheet = workbook.getSheet(sheetName);
+            
+            if (sheet == null) {
+                try {
+                    int sheetIndex = Integer.parseInt(sheetName);
+                    sheet = workbook.getSheetAt(sheetIndex);
+                } catch (NumberFormatException e) {
+                    return rawData;
+                }
+            }
+            
+            if (sheet == null) {
+                return rawData;
+            }
+            
+            // 从第二行开始读取数据
+            int lastRowNum = sheet.getLastRowNum();
+            for (int i = 1; i <= lastRowNum; i++) {
+                org.apache.poi.ss.usermodel.Row row = sheet.getRow(i);
+                if (row == null) continue;
+                
+                Map<String, Object> rowData = new HashMap<>();
+                for (int j = 0; j < headers.size(); j++) {
+                    rowData.put(headers.get(j), getCellStringValue(row.getCell(j)));
+                }
+                
+                // 跳过空行
+                boolean hasData = false;
+                for (Object obj : rowData.values()) {
+                    if (obj != null && !"".equals(obj.toString().trim())) {
+                        hasData = true;
+                        break;
+                    }
+                }
+                if (hasData) {
+                    rawData.add(rowData);
+                }
+            }
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return rawData;
+    }
+    
+    /**
+     * 从指定工作表读取Excel数据
+     * 
+     * @param file Excel文件
+     * @param sheetName 工作表名称
+     * @return 数据列表
+     */
+    private List<CmcNonparallelismCorrection> importExcelFromSheet(MultipartFile file, String sheetName) {
+        return importExcelFromSheet(file, sheetName, null);
+    }
+    
+    /**
+     * 从指定工作表读取Excel数据（支持列映射）
+     * 
+     * @param file Excel文件
+     * @param sheetName 工作表名称
+     * @param columnMapping 列映射配置（字段名 -> 列索引），为空则使用默认映射
+     * @return 数据列表
+     */
+    private List<CmcNonparallelismCorrection> importExcelFromSheet(MultipartFile file, String sheetName, Map<String, Integer> columnMapping) {
+        List<CmcNonparallelismCorrection> dataList = new ArrayList<>();
+        
+        try (InputStream inputStream = file.getInputStream();
+             Workbook workbook = createWorkbook(inputStream, file.getOriginalFilename())) {
+            // 查找指定名称的工作表
+            Sheet sheet = workbook.getSheet(sheetName);
+            
+            if (sheet == null) {
+                // 如果按名称找不到，尝试按索引查找
+                try {
+                    int sheetIndex = Integer.parseInt(sheetName);
+                    sheet = workbook.getSheetAt(sheetIndex);
+                } catch (NumberFormatException e) {
+                    // 不是数字索引，返回空列表
+                    return dataList;
+                }
+            }
+            
+            if (sheet == null) {
+                return dataList;
+            }
+            
+            // 直接使用POI解析Sheet数据
+            int lastRowNum = sheet.getLastRowNum();
+            // 从第二行开始读取（跳过表头）
+            for (int i = 1; i <= lastRowNum; i++) {
+                org.apache.poi.ss.usermodel.Row row = sheet.getRow(i);
+                if (row == null) {
+                    continue;
+                }
+                
+                CmcNonparallelismCorrection item = new CmcNonparallelismCorrection();
+                
+                if (columnMapping != null && !columnMapping.isEmpty()) {
+                    // 使用自定义列映射
+                    // 测段高差计算字段
+                    int colIndex = columnMapping.getOrDefault("startPointNo", -1);
+                    if (colIndex >= 0) {
+                        item.setStartPointNo(getCellStringValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("endPointNo", -1);
+                    if (colIndex >= 0) {
+                        item.setEndPointNo(getCellStringValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("distance", -1);
+                    if (colIndex >= 0) {
+                        item.setDistance(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("heightDifference", -1);
+                    if (colIndex >= 0) {
+                        item.setHeightDifference(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("scaleTrueLength", -1);
+                    if (colIndex >= 0) {
+                        item.setScaleTrueLength(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("level", -1);
+                    if (colIndex >= 0) {
+                        Integer levelValue = getCellIntegerValue(row.getCell(colIndex));
+                        item.setLevel(levelValue != null ? levelValue : 0);
+                    }
+                    
+                    // 不平行改正计算字段
+                    colIndex = columnMapping.getOrDefault("pendingPoint", -1);
+                    if (colIndex >= 0) {
+                        item.setPendingPoint(getCellStringValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("coordinateX", -1);
+                    if (colIndex >= 0) {
+                        item.setCoordinateX(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("coordinateY", -1);
+                    if (colIndex >= 0) {
+                        item.setCoordinateY(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("heightH", -1);
+                    if (colIndex >= 0) {
+                        item.setHeightH(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("coordinateSystem", -1);
+                    if (colIndex >= 0) {
+                        item.setCoordinateSystem(getCellStringValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("zoneNo", -1);
+                    if (colIndex >= 0) {
+                        item.setZoneNo(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("bandWidth", -1);
+                    if (colIndex >= 0) {
+                        item.setBandWidth(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("latitudePosition", -1);
+                    if (colIndex >= 0) {
+                        item.setLatitudePosition(getCellStringValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("longitudePosition", -1);
+                    if (colIndex >= 0) {
+                        item.setLongitudePosition(getCellStringValue(row.getCell(colIndex)));
+                    }
+                    
+                    colIndex = columnMapping.getOrDefault("projectionHeight", -1);
+                    if (colIndex >= 0) {
+                        item.setProjectionHeight(getCellDoubleValue(row.getCell(colIndex)));
+                    }
+                    
+                } else {
+                    // 使用默认列映射
+                    // 测段高差计算字段（前7列）
+                    item.setStartPointNo(getCellStringValue(row.getCell(0)));
+                    item.setEndPointNo(getCellStringValue(row.getCell(1)));
+                    item.setDistance(getCellDoubleValue(row.getCell(2)));
+                    item.setHeightDifference(getCellDoubleValue(row.getCell(3)));
+                    item.setScaleTrueLength(getCellDoubleValue(row.getCell(4)));
+                    Integer levelValue = getCellIntegerValue(row.getCell(5));
+                    item.setLevel(levelValue != null ? levelValue : 0);
+                    // 不平行改正计算字段（后续列）
+                    item.setPendingPoint(getCellStringValue(row.getCell(6)));
+                    item.setCoordinateX(getCellDoubleValue(row.getCell(7)));
+                    item.setCoordinateY(getCellDoubleValue(row.getCell(8)));
+                    item.setHeightH(getCellDoubleValue(row.getCell(9)));
+                    item.setCoordinateSystem(getCellStringValue(row.getCell(10)));
+                    item.setZoneNo(getCellDoubleValue(row.getCell(11)));
+                    item.setBandWidth(getCellDoubleValue(row.getCell(12)));
+                    item.setLatitudePosition(getCellStringValue(row.getCell(13)));
+                    item.setLongitudePosition(getCellStringValue(row.getCell(14)));
+                    item.setProjectionHeight(getCellDoubleValue(row.getCell(15)));
+                }
+                
+                dataList.add(item);
+            }
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return dataList;
+    }
+    
+    /**
+     * 获取单元格的字符串值
+     */
+    private String getCellStringValue(org.apache.poi.ss.usermodel.Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                // 数字类型转字符串，避免科学计数法
+                double numValue = cell.getNumericCellValue();
+                if (numValue == Math.floor(numValue)) {
+                    return String.valueOf((long) numValue);
+                }
+                return String.valueOf(numValue);
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return String.valueOf(cell.getNumericCellValue());
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 获取单元格的Double值
+     */
+    private Double getCellDoubleValue(org.apache.poi.ss.usermodel.Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case NUMERIC:
+                return cell.getNumericCellValue();
+            case STRING:
+                try {
+                    return Double.parseDouble(cell.getStringCellValue().trim());
+                } catch (NumberFormatException e) {
+                    return null;
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 获取单元格的Integer值
+     */
+    private Integer getCellIntegerValue(org.apache.poi.ss.usermodel.Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case NUMERIC:
+                return (int) cell.getNumericCellValue();
+            case STRING:
+                try {
+                    return Integer.parseInt(cell.getStringCellValue().trim());
+                } catch (NumberFormatException e) {
+                    return null;
+                }
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 根据文件类型创建Workbook
+     */
+    private Workbook createWorkbook(InputStream inputStream, String fileName) throws Exception {
+        if (fileName != null && fileName.endsWith(".xlsx")) {
+            return new XSSFWorkbook(inputStream);
+        } else {
+            return new HSSFWorkbook(inputStream);
+        }
+    }
+
+    /**
+     * 获取Excel文件的所有工作表名称
+     * 
+     * @param file Excel文件
+     * @return 工作表名称列表
+     */
+    @Override
+    public List<String> getSheetNames(MultipartFile file) {
+        List<String> sheetNames = new ArrayList<>();
+        
+        try (InputStream inputStream = file.getInputStream();
+             Workbook workbook = createWorkbook(inputStream, file.getOriginalFilename())) {
+            int numberOfSheets = workbook.getNumberOfSheets();
+            for (int i = 0; i < numberOfSheets; i++) {
+                sheetNames.add(workbook.getSheetName(i));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return sheetNames;
+    }
+
+    /**
+     * 执行非平行差改正计算
+     */
+    @Override
+    public List<CmcNonparallelismCorrection> calculateNonparallelismCorrection(
+            List<CmcNonparallelismCorrection> dataList) {
+        List<CmcNonparallelismCorrection> resultList = new ArrayList<>();
+        initEllipsoidParams(dataList.get(0).getCoordinateSystem());
+        int level = dataList.get(0).getLevel();
+        double distanceFromStart = 0;
+
+        for (int i = 0; i < dataList.size()-1; i++) {
+            CmcNonparallelismCorrection item1 = dataList.get(i);
+            CmcNonparallelismCorrection item2 = dataList.get(i + 1);
+            double dist1 = item1.getDistance();
+            double dist2 = item2.getDistance();
+            double heightdiff1 = item1.getHeightDifference();
+            double heightdiff2 = item2.getHeightDifference();
+            double truelen1 = item1.getScaleTrueLength();
+            double truelen2 = item2.getScaleTrueLength();
+            double Z1 = item1.getHeightH();
+            double Z2 = item2.getHeightH();
+            double band1 = item1.getZoneNo();
+            double height = item1.getHeightH();
+
+            double averageDistance = (dist1 + dist2) / 2/1000;
+            double scale1 = heightdiff1 * truelen1;
+            double scale2 = heightdiff2 * truelen2;
+            double averageScale = (scale1 - scale2) / 2;
+            double roundTripDifference = (scale1 + scale2) * 1000;
+            double tolerance = level == 2 ? 4 * Math.sqrt(averageDistance)
+                    : level == 3 ? 12 * Math.sqrt(averageDistance) : 20 * Math.sqrt(averageDistance);
+            double precisionStatistics = roundTripDifference * roundTripDifference / 4 / averageDistance;
+            double qualityScore = calculateQualityScore(roundTripDifference, tolerance);
+
+            // 计算正常重力值
+            double gamma1 = calculategamma(item1);
+            double gamma2 = calculategamma(item2);
+            double gammam = (gamma1 + gamma2) / 2 - 0.1543 * (Z1 + Z2) / 2;
+            double pointCorrection = -(gamma2 - gamma1) * (Z1 + Z2) / 2 / gammam;
+            double correctedHeightDifference = averageScale + pointCorrection;
+            double elevation = height + correctedHeightDifference;
+
+            double distanceFromStart1 = i == 0 ? 0 : dataList.get(i - 1).getDistanceFromStart();
+            distanceFromStart += averageDistance;
+            double distanceFromStart2 = distanceFromStart;
+
+            double heightMiddleError1 = level == 2 ? Math.sqrt(distanceFromStart1)
+                    : level == 3 ? Math.sqrt(distanceFromStart1) * 3 : Math.sqrt(distanceFromStart1) * 5;
+            double heightMiddleError2 = level == 2 ? Math.sqrt(distanceFromStart2)
+                    : level == 3 ? Math.sqrt(distanceFromStart2) * 3 : Math.sqrt(distanceFromStart2) * 5;
+            item1.setAverageDistance(averageDistance);
+            item1.setScaleCorrectedHeightDiff(heightMiddleError1);
+            item2.setScaleCorrectedHeightDiff(heightMiddleError2);
+            item1.setAverageScaleCorrectedHeightDiff(averageScale);
+            item1.setRoundTripDifference(roundTripDifference);
+            item1.setTolerance(tolerance);
+            item1.setPrecisionStatistics(precisionStatistics);
+            item1.setQualityScore(qualityScore);
+            item1.setPointCorrection(pointCorrection);
+            item1.setCorrectedHeightDifference(correctedHeightDifference);
+            item1.setElevation(height);
+            item2.setElevation(elevation);
+            item1.setDistanceFromStart(distanceFromStart1);
+            item2.setDistanceFromStart(distanceFromStart2);
+            item1.setHeightMiddleError(heightMiddleError1);
+            item2.setHeightMiddleError(heightMiddleError2);
+            resultList.add(item1);
+            resultList.add(item2);
+            i++;
+        }
+
+        return resultList;
+    }
+
+    // 选择椭球体参数
+    private void initEllipsoidParams(String coordinateSystem) {
+        String F_str;
+        if ("CGCS2000".equalsIgnoreCase(coordinateSystem) || "国家2000".equalsIgnoreCase(coordinateSystem)
+                || "2000".equalsIgnoreCase(coordinateSystem)) {
+            A = A_CGCS2000;
+            F_str = F_CGCS2000;
+        } else if ("1954".equalsIgnoreCase(coordinateSystem) || "北京54".equalsIgnoreCase(coordinateSystem)
+                || "Beijing54".equalsIgnoreCase(coordinateSystem)
+                || "54".equalsIgnoreCase(coordinateSystem)) {
+            A = A_BJ54;
+            F_str = F_BJ54;
+        } else if ("1980".equalsIgnoreCase(coordinateSystem) || "西安80".equalsIgnoreCase(coordinateSystem)
+                || "Xian80".equalsIgnoreCase(coordinateSystem)
+                || "80".equalsIgnoreCase(coordinateSystem)) {
+            A = A_XA80;
+            F_str = F_XA80;
+        } else {
+            A = A_WGS84;
+            F_str = F_WGS84;
+        }
+        BigDecimal one = BigDecimal.ONE;
+        BigDecimal divisor = new BigDecimal(F_str);
+        BigDecimal db_F = one.divide(divisor, 20, RoundingMode.HALF_UP);
+
+        // 计算 2 * F
+        BigDecimal two = new BigDecimal("2");
+        BigDecimal twoF = two.multiply(db_F);
+
+        // 计算 F * F
+        BigDecimal F_squared = db_F.multiply(db_F);
+
+        // 计算 e2 = 2*F - F*F
+        BigDecimal e2 = twoF.subtract(F_squared);
+        E2 = e2.doubleValue();
+        F = db_F.doubleValue();
+    }
+
+    /**
+     * 根据往返较差和限差计算质量评分
+     * 
+     * @param diff  往返较差
+     * @param limit 限差
+     * @return 质量评分（0-100分），或 -1 表示不合格
+     */
+    public static double calculateQualityScore(double diff, double limit) {
+        double absDiff = Math.abs(diff);
+
+        // 分档区间阈值
+        double threshold1 = limit / 3.0; // 33.3%
+        double threshold2 = limit / 2.0; // 50%
+        double threshold3 = limit / 4.0 * 3.0; // 75%
+
+        if (absDiff <= threshold1) {
+            // 第一档：100分
+            return 100.0;
+        } else if (absDiff <= threshold2) {
+            // 第二档：90~100分（线性插值）
+            double scoreMin = 90.0;
+            double scoreMax = 100.0;
+            double valueMin = threshold1;
+            double valueMax = threshold2;
+            return scoreMin + (scoreMax - scoreMin) / (valueMax - valueMin) * (absDiff - valueMin);
+        } else if (absDiff <= threshold3) {
+            // 第三档：75~90分（线性插值）
+            double scoreMin = 75.0;
+            double scoreMax = 90.0;
+            double valueMin = threshold2;
+            double valueMax = threshold3;
+            return scoreMin + (scoreMax - scoreMin) / (valueMax - valueMin) * (absDiff - valueMin);
+        } else if (absDiff <= limit) {
+            // 第四档：60~75分（线性插值）
+            double scoreMin = 60.0;
+            double scoreMax = 75.0;
+            double valueMin = threshold3;
+            double valueMax = limit;
+            return scoreMin + (scoreMax - scoreMin) / (valueMax - valueMin) * (absDiff - valueMin);
+        } else {
+            // 超限：不合格
+            return -1.0;
+        }
+    }
+
+
+    private double calculategamma(CmcNonparallelismCorrection item) {
+        double X = item.getCoordinateX();
+        double Y = item.getCoordinateY();
+        double band = item.getZoneNo();
+        double bandwidth = item.getBandWidth();
+        String latitudePosition = item.getLatitudePosition();
+        String longitudePosition = item.getLongitudePosition();
+        double projectionHeight = item.getProjectionHeight();
+
+        double x = latitudePosition.equals("S") ? 10000000 - X : X;
+        double y = Y > 1.0E+7 ? Y - (int) Math.floor(Y / 1.0E+6) * 1.0E+6 - 500000 : Y - 500000;
+
+        double bf = calculateBf(x, projectionHeight);
+        double tf = Math.tan(bf);
+        double ep2 = 1 / Math.pow(1 - F, 2) - 1;
+        double etaf2 = ep2 * Math.pow(Math.cos(bf), 2);
+        double Vf = Math.sqrt(1 + etaf2);
+        double c = (A + projectionHeight) / (1 - F);
+        double n = y * Vf / c;
+
+        // 最终纬度 B
+        double B = calculateB(bf, tf, etaf2, n);
+
+        // 计算L
+        double L = calculateL(bf, tf, etaf2, n, longitudePosition, bandwidth, band);
+        // 大地经度和大地纬度
+        double longitude = convertDecimalDegrees(L);
+        double latitude = convertDecimalDegrees(B);
+        item.setGeodeticLongitude(longitude);
+        item.setGeodeticLatitude(latitude);
+
+        double gamma = 978030 * (1 + 0.005302 * Math.pow(Math.sin(B / 180 * Math.PI), 2) - 
+        0.000007 * Math.pow(Math.sin(2 * B / 180 * Math.PI), 2));
+        return gamma;
+    }
+
+    // 计算bf
+    private double calculateBf(double x, double projectionHeight) {
+        double e2 = E2;
+        double e4 = E2 * E2;
+        double e6 = e4 * E2;
+        double e8 = e6 * E2;
+        double e10 = e8 * E2;
+        double d = A + projectionHeight;
+        // 计算子午线弧长系数
+        double a0 = (d - d * e2) * (1
+                + 3.0 / 4.0 * e2
+                + 45.0 / 64.0 * e4
+                + 175.0 / 256.0 * e6
+                + 11025.0 / 16384.0 * e8
+                + 43659.0 / 65536.0 * e10);
+
+        double a2 = (d - d * e2) * (3.0 / 4.0 * e2
+                + 45.0 / 64.0 * e4
+                + 175.0 / 256.0 * e6
+                + 11025.0 / 16384.0 * e8
+                + 43659.0 / 65536.0 * e10);
+
+        double a4 = (d - d * e2) * (15.0 / 32.0 * e4
+                + 175.0 / 384.0 * e6
+                + 3675.0 / 8192.0 * e8
+                + 14553.0 / 32768.0 * e10);
+
+        double a6 = (d - d * e2) * (35.0 / 96.0 * e6
+                + 735.0 / 2048.0 * e8
+                + 14553.0 / 40960.0 * e10);
+
+        double a8 = (d - d * e2) * (315.0 / 1024.0 * e8
+                + 6237.0 / 20480.0 * e10);
+
+        double b = x / a0;
+        double sinB = Math.sin(b);
+        double cosB = Math.cos(b);
+        double f = -(a2 * sinB + a4 * Math.pow(sinB, 3) + a6 * Math.pow(sinB, 5) + a8 * Math.pow(sinB, 7)) * cosB;
+
+        for (int i = 0; i < 9; i++) {
+            b = (x - f) / a0;
+            sinB = Math.sin(b);
+            cosB = Math.cos(b);
+            f = -(a2 * sinB + a4 * Math.pow(sinB, 3) + a6 * Math.pow(sinB, 5) + a8 * Math.pow(sinB, 7)) * cosB;
+            i++;
+        }
+        return b;
+    }
+
+    //计算B
+    private double calculateB(double bf, double tf, double etaf2, double n) {        double n2 = n * n;
+        double n4 = n2 * n2;
+        double n6 = n4 * n2;
+        // 计算底点纬度对应的值
+        double term1 = bf * 180 / Math.PI; // 转为度
+        // 计算括号内的各项
+        double bracket = 90 * n2
+                - 7.5 * (5 + 3 * tf * tf + etaf2 - 9 * etaf2 * tf * tf) * n4
+                + 0.25 * (61 + 90 * tf * tf + 45 * tf * tf * tf * tf) * n6;
+        // 计算第二项
+        double term2 = (1 + etaf2) / Math.PI * tf * bracket;
+        // 最终纬度 B
+        double B = term1 - term2;
+        return B;
+    }
+
+    //计算l
+    private double calculateL(double bf, double tf, double etaf2, double n, String longitudePosition,
+            double bandwidth, double band) {
+        double n2 = n * n;
+        double n3 = n2 * n;
+        double n5 = n3 * n2;
+        double tf2 = tf * tf;
+        double tf4 = tf2 * tf2;
+        // 括号内计算
+        double bracket2 = 180 * n
+                - 30 * (1 + 2 * tf2 + etaf2) * n3
+                + 1.5 * (5 + 28 * tf2 + 24 * tf4) * n5;
+        double l = 1 / Math.PI / Math.cos(bf) * bracket2;
+
+        double L = "W".equals(longitudePosition)
+                ? (bandwidth == 6 ? (band * bandwidth - 3 - l) : (band * bandwidth - l))
+                : (bandwidth == 6 ? (l + band * bandwidth - 3) : (l + band * bandwidth));
+        return L;
+    }
+    
+    private static double convertDecimalDegrees(double decimalDegrees) {
+
+        final double PRECISION = 1.2e-12; // 修正值
+        final double SEC_PRECISION = 1e-11; // 秒的修正值
+
+        // 提取度
+        double degrees = Math.floor(decimalDegrees + PRECISION);
+        // 提取分
+        double minutesRaw = 60 * (decimalDegrees - degrees);
+        double minutes = Math.floor(minutesRaw + PRECISION) / 100;
+        // 提取秒（高精度）
+        double secondsRaw = (decimalDegrees * 60 - Math.floor(decimalDegrees * 60 + PRECISION)) * 60;
+        double seconds = Math.floor((secondsRaw + SEC_PRECISION) * 1000000) / 10000000000.0;
+        
+        return degrees + minutes + seconds;
+    }
+}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/service/impl/CmcSpatialToGeodeticServiceImpl.java

@@ -271,16 +271,16 @@ public class CmcSpatialToGeodeticServiceImpl implements ICmcSpatialToGeodeticSer
     }
 
     /**
-     * 单条空间直角坐标转大地坐标计算（待实现）
+     * 单条空间直角坐标转大地坐标计算
      */
     private CmcSpatialToGeodetic calculateSpatialToGeodeticSingle(CmcSpatialToGeodetic cmcSpatialToGeodetic) {
         // 获取输入值
-        String coordinateSystem = cmcSpatialToGeodetic.getCoordinateSystem(); // 坐标系
-        double spatialX = cmcSpatialToGeodetic.getSpatialX(); // 空间坐标X
-        Double spatialY = cmcSpatialToGeodetic.getSpatialY(); // 空间坐标Y
-        double spatialZ = cmcSpatialToGeodetic.getSpatialZ(); // 空间坐标Z
-        double projectionHeight = cmcSpatialToGeodetic.getProjectionHeight(); // 投影高
-        double j = 1.5e-12;
+        String coordinateSystem = cmcSpatialToGeodetic.getCoordinateSystem();
+        double spatialX = cmcSpatialToGeodetic.getSpatialX();
+        Double spatialY = cmcSpatialToGeodetic.getSpatialY();
+        double spatialZ = cmcSpatialToGeodetic.getSpatialZ();
+        double projectionHeight = cmcSpatialToGeodetic.getProjectionHeight();
+        String outputFormat = cmcSpatialToGeodetic.getOutputFormat();
 
         initEllipsoidParams(coordinateSystem);
 
@@ -302,14 +302,16 @@ public class CmcSpatialToGeodeticServiceImpl implements ICmcSpatialToGeodeticSer
 
         double B = Math.toDegrees(b);
 
-        double longitude = Math.floor(L_degree + j) + 
-                           Math.floor((L_degree - Math.floor(L_degree + j)) * 60 + j) / 100.0 + 
-                           Math.floor(((L_degree * 60 - Math.floor(L_degree * 60)) * 60 + Math.pow(10, -11)) * Math.pow(10, 6))
-                        / Math.pow(10, 10);
-        double latitude = Math.floor(B + j) + 
-                           Math.floor((B - Math.floor(B + j)) * 60 + j) / 100.0 + 
-                           Math.floor(((B * 60 - Math.floor(B * 60)) * 60 + Math.pow(10, -11)) * Math.pow(10, 6))
-                        / Math.pow(10, 10);
+        // 大地经度和大地纬度
+        double longitude = L_degree;
+        double latitude = B;
+        
+        // 如果输出格式为度分秒（dms），则转换为度分秒格式
+        if ("dms".equalsIgnoreCase(outputFormat)) {
+            longitude = convertDecimalDegrees(longitude);
+            latitude = convertDecimalDegrees(latitude);
+        }
+        
         String longitudePosition = spatialY < 0 ? "W" : "E";
         String latitudePosition = spatialZ < 0 ? "S" : "N";
         double height = Math.sqrt(Math.pow(spatialX, 2) + Math.pow(spatialY, 2) + Math.pow(spatialZ + t, 2)) - N;
@@ -320,6 +322,29 @@ public class CmcSpatialToGeodeticServiceImpl implements ICmcSpatialToGeodeticSer
         cmcSpatialToGeodetic.setHeight(height);
         return cmcSpatialToGeodetic;
     }
+    
+    /**
+     * 将十进制度数转换为度分秒格式数值（DD.MMSSssss）
+     * 与高斯反算中相同的方法
+     * 
+     * @param decimalDegrees 十进制度数
+     * @return 度分秒格式数值
+     */
+    private static double convertDecimalDegrees(double decimalDegrees) {
+        final double PRECISION = 1.2e-12;
+        final double SEC_PRECISION = 1e-11;
+
+        // 提取度
+        double degrees = Math.floor(decimalDegrees + PRECISION);
+        // 提取分
+        double minutesRaw = 60 * (decimalDegrees - degrees);
+        double minutes = Math.floor(minutesRaw + PRECISION) / 100;
+        // 提取秒（高精度）
+        double secondsRaw = (decimalDegrees * 60 - Math.floor(decimalDegrees * 60 + PRECISION)) * 60;
+        double seconds = Math.floor((secondsRaw + SEC_PRECISION) * 1000000) / 10000000000.0;
+        
+        return degrees + minutes + seconds;
+    }
 
     // 选择椭球体参数
     private void initEllipsoidParams(String coordinateSystem) {

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/service/impl/CmcUTMNegativeServiceImpl.java

@@ -285,10 +285,11 @@ public class CmcUTMNegativeServiceImpl implements ICmcUTMNegativeService
             
             double utmX = cmcUTMNagative.getUtmX();
             double utmY = cmcUTMNagative.getUtmY();
-            Integer band = cmcUTMNagative.getBand();
+            Double band = cmcUTMNagative.getBand();
             String longitudePosition = cmcUTMNagative.getLongitudePosition();
             String latitudePosition = cmcUTMNagative.getLatitudePosition();
             double projectionHeight = cmcUTMNagative.getProjectionHeight();
+            String outputFormat = cmcUTMNagative.getOutputFormat();
             
             // UTM使用固定6度带
             int bandwidth = 6;
@@ -314,9 +315,15 @@ public class CmcUTMNegativeServiceImpl implements ICmcUTMNegativeService
             double B = calculateB(bf, tf, etaf2, n);
             // 计算经度 L
             double L = calculateL(bf, tf, etaf2, n, longitudePosition, bandwidth, band);
-            // 大地经度和大地纬度
-            double longitude = convertDecimalDegrees(L);
-            double latitude = convertDecimalDegrees(B);
+
+            double longitude = L;
+            double latitude = B;
+            // 大地经度和大地纬度（默认为度分秒格式）
+            if ("dms".equalsIgnoreCase(outputFormat)) {
+                longitude = convertDecimalDegrees(longitude);
+                latitude = convertDecimalDegrees(latitude);
+            }
+            
 
             cmcUTMNagative.setLongitude(longitude);
             cmcUTMNagative.setLatitude(latitude);

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/service/impl/CmcUTMPositiveServiceImpl.java

@@ -244,16 +244,26 @@ public class CmcUTMPositiveServiceImpl implements ICmcUTMPositiveService
         try {
             initEllipsoidParams(cmcUTMPositive.getCoordinateSystem());
 
-            double longitude = cmcUTMPositive.getLongitude(); // 经度（度）
-            String longitudePosition = cmcUTMPositive.getLongitudePosition(); // 经度位置（东/西）
-            String latitudePosition = cmcUTMPositive.getLatitudePosition(); // 纬度位置（北/南）
-            double latitude = cmcUTMPositive.getLatitude(); // 纬度（度）
-            Integer band = cmcUTMPositive.getBand(); // 带号
-            double projectionHeight = cmcUTMPositive.getProjectionHeight(); // 投影面高程
+            double longitude = cmcUTMPositive.getLongitude();
+            String longitudePosition = cmcUTMPositive.getLongitudePosition();
+            String latitudePosition = cmcUTMPositive.getLatitudePosition();
+            double latitude = cmcUTMPositive.getLatitude();
+            Double band = cmcUTMPositive.getBand();
+            double projectionHeight = cmcUTMPositive.getProjectionHeight();
+            String angleFormat = cmcUTMPositive.getAngleFormat();
+            double B = latitude * Math.PI / 180;
+            double L = longitude;
+            // 如果输入格式为度（degree），先转换为度分秒格式
+            // if ("degree".equalsIgnoreCase(angleFormat)) {
+            //     longitude = convertDegreeToDMS(longitude);
+            //     latitude = convertDegreeToDMS(latitude);
+            // }
 
             // 转换为弧度
-            double B = convertDecimalDegrees(latitude) * Math.PI / 180;
-            double L = convertDecimalDegrees(longitude);
+            if ("dms".equalsIgnoreCase(angleFormat)) {
+                B = convertDecimalDegrees(latitude) * Math.PI / 180;
+                L = convertDecimalDegrees(longitude);
+            }
            
             // 计算经差
             double l = ((30-band)*6+3-L) * Math.PI / 180;
@@ -426,4 +436,26 @@ public class CmcUTMPositiveServiceImpl implements ICmcUTMPositiveService
 
         return degrees + minutes + seconds;
     }
+    
+    /**
+     * 将十进制度数转换为度分秒格式数值（DD.MMSSssss）
+     * 与 calculateDegreeToDMSSingle 方法逻辑相同
+     * 
+     * @param decimalDegrees 十进制度数（如 103.373428195）
+     * @return 度分秒格式数值（如 103.22240038）
+     */
+    private double convertDegreeToDMS(double decimalDegrees) {
+        // 1. 提取度
+        double degrees = Math.floor(decimalDegrees + 1.0E-13);
+        
+        // 2. 提取分
+        double minutesRaw = 60 * (decimalDegrees - degrees);
+        double minutes = Math.floor(minutesRaw + 1.0E-13) / 100;
+        
+        // 3. 提取秒
+        double secondsRaw = 60 * (60 * decimalDegrees - Math.floor(60 * decimalDegrees + 1.0E-13)) + 1.0E-13;
+        double seconds = secondsRaw / 10000;
+        
+        return degrees + minutes + seconds;
+    }
 }

oa-ui/src/api/calculate/nonparallelismcorrection.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+/**
+ * 非平行度修正计算
+ */
+export function calculate(data) {
+    return request({
+        url: `/calculate/nonparallelismCorrection/calculate`,
+        method: 'post',
+        data: data
+    })
+}
+
+/**
+ * 导入Excel数据
+ */
+export function importExcel(data) {
+    return request({
+        url: `/calculate/nonparallelismCorrection/import`,
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        }
+    })
+}
+
+/**
+ * 导出计算结果
+ */
+export function exportExcel(data) {
+    return request({
+        url: `/calculate/nonparallelismCorrection/export`,
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}
+
+/**
+ * 下载导入模板
+ */
+export function downloadTemplate() {
+    return request({
+        url: '/calculate/nonparallelismCorrection/template',
+        method: 'get',
+        responseType: 'blob'
+    })
+}
+
+/**
+ * 获取工作表名称
+ */
+export function getSheetNames(data) {
+    return request({
+        url: '/calculate/nonparallelismCorrection/sheetNames',
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        }
+    })
+}

oa-ui/src/views/calculate/index.vue

@@ -56,6 +56,7 @@ import SpatialToGeodeticTool from './tools/spatialtogeodetic.vue'
 import DegreeToDSTool from './tools/degreetoDMS.vue'
 import DMStodegreeTool from './tools/DMStodegree.vue'
 import DegreeToRadianTool from './tools/degreetoradian.vue'
+import NonParallelismCorrectionTool from './tools/nonparallelismcorrection.vue'
 
 export default {
   name: 'CalculationTools',
@@ -71,6 +72,7 @@ export default {
     DegreeToDSTool, 
     DMStodegreeTool,
     DegreeToRadianTool,
+    NonParallelismCorrectionTool,
   },
   data() {
     return {
@@ -162,7 +164,11 @@ export default {
           id: 'other-category',
           name: '其他计算工具',
           children: [
-            // 预留其他工具位置
+            {
+              id: 'nonparallelism-correction',
+              name: '水准测段高差正常水准面不平行改正',
+              component: 'NonParallelismCorrectionTool'
+            }
           ]
         }
       ]

oa-ui/src/views/calculate/tools/DMStodegree.vue

@@ -69,6 +69,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -166,6 +179,10 @@ export default {
       importFile: null,
       calculating: false,
       
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
+      
       // 字段映射相关
       mappingDialogVisible: false,
       excelColumns: [],
@@ -398,6 +415,17 @@ export default {
     formatNumber(value, decimals = 3) {
       if (value === null || value === undefined) return '--'
       return Number(value).toFixed(decimals)
+    },
+    
+    // 分页大小变化
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.currentPage = 1
+    },
+    
+    // 当前页变化
+    handleCurrentChange(val) {
+      this.currentPage = val
     }
   },
   
@@ -414,16 +442,11 @@ export default {
     
     // 显示数据：优先显示计算结果，否则显示导入数据
     displayData() {
+      let data = []
       if (this.calculationResults.length > 0) {
-        return this.calculationResults.map(item => ({
-          pointNumber: item.pointNumber,
-          longitudeDMS: item.longitudeDMS,
-          latitudeDMS: item.latitudeDMS,
-          longitude: item.longitude,
-          latitude: item.latitude
-        }))
+        data = this.calculationResults
       } else if (this.importedData.length > 0) {
-        return this.importedData.map(item => ({
+        data = this.importedData.map(item => ({
           pointNumber: item.pointNumber,
           longitudeDMS: item.longitudeDMS,
           latitudeDMS: item.latitudeDMS,
@@ -431,7 +454,19 @@ export default {
           latitude: undefined
         }))
       }
-      return []
+      
+      // 分页处理
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return data.slice(start, end)
+    },
+    
+    // 总数据条数（用于分页组件）
+    totalData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.length
+      }
+      return this.importedData.length
     }
   }
 }
@@ -593,4 +628,14 @@ export default {
   color: #C0C4CC;
   font-style: italic;
 }
+
+.pagination-wrapper {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+}
 </style>

oa-ui/src/views/calculate/tools/degreetoDMS.vue

@@ -69,6 +69,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -166,6 +179,10 @@ export default {
       importFile: null,
       calculating: false,
       
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
+      
       // 字段映射相关
       mappingDialogVisible: false,
       excelColumns: [],
@@ -394,6 +411,17 @@ export default {
     formatNumber(value, decimals = 3) {
       if (value === null || value === undefined) return '--'
       return Number(value).toFixed(decimals)
+    },
+    
+    // 分页大小变化
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.currentPage = 1
+    },
+    
+    // 当前页变化
+    handleCurrentChange(val) {
+      this.currentPage = val
     }
   },
   
@@ -410,16 +438,11 @@ export default {
     
     // 显示数据：优先显示计算结果，否则显示导入数据
     displayData() {
+      let data = []
       if (this.calculationResults.length > 0) {
-        return this.calculationResults.map(item => ({
-          pointNumber: item.pointNumber,
-          longitude: item.longitude,
-          latitude: item.latitude,
-          longitudeDMS: item.longitudeDMS,
-          latitudeDMS: item.latitudeDMS,
-        }))
+        data = this.calculationResults
       } else if (this.importedData.length > 0) {
-        return this.importedData.map(item => ({
+        data = this.importedData.map(item => ({
           pointNumber: item.pointNumber,
           longitude: item.longitude,
           latitude: item.latitude,
@@ -427,7 +450,19 @@ export default {
           latitudeDMS: undefined,
         }))
       }
-      return []
+      
+      // 分页处理
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return data.slice(start, end)
+    },
+    
+    // 总数据条数（用于分页组件）
+    totalData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.length
+      }
+      return this.importedData.length
     }
   }
 }
@@ -589,4 +624,14 @@ export default {
   color: #C0C4CC;
   font-style: italic;
 }
+
+.pagination-wrapper {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+}
 </style>

oa-ui/src/views/calculate/tools/degreetoradian.vue

@@ -68,6 +68,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -164,6 +177,9 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
       // 字段映射相关
       mappingDialogVisible: false,
       excelColumns: [],
@@ -180,8 +196,9 @@ export default {
       return this.fieldMapping.pointNumber && this.fieldMapping.longitude && this.fieldMapping.latitude
     },
     displayData() {
+      let data = []
       if (this.calculationResults.length > 0) {
-        return this.calculationResults.map(item => ({
+        data = this.calculationResults.map(item => ({
           pointNumber: item.pointNumber,
           longitude: item.longitude,
           latitude: item.latitude,
@@ -189,7 +206,7 @@ export default {
           latitudeRadian: item.latitudeRadian
         }))
       } else if (this.importedData.length > 0) {
-        return this.importedData.map(item => ({
+        data = this.importedData.map(item => ({
           pointNumber: item.pointNumber,
           longitude: item.longitude,
           latitude: item.latitude,
@@ -197,7 +214,19 @@ export default {
           latitudeRadian: undefined
         }))
       }
-      return []
+      
+      // 分页处理
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return data.slice(start, end)
+    },
+    
+    // 总数据条数（用于分页组件）
+    totalData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.length
+      }
+      return this.importedData.length
     }
   },
   methods: {
@@ -407,6 +436,17 @@ export default {
     formatNumber(value, decimals = 3) {
       if (value === null || value === undefined) return '--'
       return Number(value).toFixed(decimals)
+    },
+    
+    // 分页大小变化
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.currentPage = 1
+    },
+    
+    // 当前页变化
+    handleCurrentChange(val) {
+      this.currentPage = val
     }
   }
 }
@@ -561,4 +601,15 @@ export default {
   flex: 1;
   min-width: 200px;
 }
+
+/* 分页组件样式 */
+.pagination-wrapper {
+  padding: 12px 16px;
+  background: #fff;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+  display: flex;
+  justify-content: flex-end;
+}
 </style>

oa-ui/src/views/calculate/tools/gaussbandchange.vue

@@ -72,7 +72,7 @@
       <div class="params-row" style="margin-top: 15px;">
         <div class="params-group">
           <label class="param-label">带号</label>
-          <el-input v-model.number="commonParams.band" size="small" style="width: 80px;" placeholder="带号" @change="onParamsChange"></el-input>
+          <el-input-number v-model="commonParams.band" size="small" :precision="3" :step="0.1" :controls="false" style="width: 80px;" placeholder="带号" @change="onParamsChange"></el-input-number>
         </div>
         
         <div class="params-group">
@@ -85,7 +85,7 @@
         
         <div class="params-group">
           <label class="param-label">新带号</label>
-          <el-input v-model.number="commonParams.newBand" size="small" style="width: 80px;" placeholder="新带号" @change="onParamsChange"></el-input>
+          <el-input-number v-model="commonParams.newBand" size="small" :precision="3" :step="0.1" :controls="false" style="width: 80px;" placeholder="新带号" @change="onParamsChange"></el-input-number>
         </div>
         
         <div class="params-group">
@@ -143,6 +143,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -246,12 +259,16 @@ export default {
         coordinateSystem: 'CGCS2000',
         longitudePosition: 'E',
         latitudePosition: 'N',
-        band: 0,
+        band: 0.0,
         bandwidth: 3,
-        newBand: 0,
+        newBand: 0.0,
         newBandwidth: 3
       },
       
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
+      
       // 字段映射相关
       mappingDialogVisible: false,
       excelColumns: [],
@@ -523,6 +540,17 @@ export default {
     return Number(value).toFixed(decimals)
   },
   
+  // 分页大小变化
+  handleSizeChange(val) {
+    this.pageSize = val
+    this.currentPage = 1
+  },
+  
+  // 当前页变化
+  handleCurrentChange(val) {
+    this.currentPage = val
+  },
+  
   // 获取坐标系标签类型
   getCoordinateType(system) {
     const types = {
@@ -548,8 +576,9 @@ export default {
     
     // 显示数据：优先显示计算结果，否则显示导入数据
     displayData() {
+      let data = []
       if (this.calculationResults.length > 0) {
-        return this.calculationResults.map(item => ({
+        data = this.calculationResults.map(item => ({
           pointNumber: item.pointNumber,
           gaussX: item.gaussX,
           gaussY: item.gaussY,
@@ -557,7 +586,7 @@ export default {
           newGaussY: item.newGaussY
         }))
       } else if (this.importedData.length > 0) {
-        return this.importedData.map(item => ({
+        data = this.importedData.map(item => ({
           pointNumber: item.pointNumber,
           gaussX: item.gaussX,
           gaussY: item.gaussY,
@@ -565,7 +594,19 @@ export default {
           newGaussY: undefined
         }))
       }
-      return []
+      
+      // 分页处理
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return data.slice(start, end)
+    },
+    
+    // 总数据条数（用于分页组件）
+    totalData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.length
+      }
+      return this.importedData.length
     }
   }
 }
@@ -656,6 +697,16 @@ export default {
   font-weight: 500;
 }
 
+.pagination-wrapper {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+}
+
 .empty-state {
   text-align: center;
   padding: 60px 20px;

oa-ui/src/views/calculate/tools/gaussnegative.vue

@@ -70,7 +70,7 @@
         
         <div class="params-group">
           <label class="param-label">带号</label>
-          <el-input v-model.number="commonParams.band" size="small" style="width: 80px;" placeholder="带号" @change="onParamsChange"></el-input>
+          <el-input-number v-model="commonParams.band" size="small" :precision="3" :step="0.1" :controls="false" style="width: 80px;" placeholder="带号" @change="onParamsChange"></el-input-number>
         </div>
         
         <div class="params-group">
@@ -80,6 +80,14 @@
             <el-option label="6" :value="6"></el-option>
           </el-select>
         </div>
+        
+        <div class="params-group">
+          <label class="param-label">输出格式</label>
+          <el-select v-model="commonParams.outputFormat" size="small" style="width: 120px;">
+            <el-option label="度分秒" value="dms"></el-option>
+            <el-option label="度" value="degree"></el-option>
+          </el-select>
+        </div>
       </div>
     </div>
 
@@ -123,6 +131,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -235,9 +256,14 @@ export default {
         coordinateSystem: 'CGCS2000',
         longitudePosition: 'E',
         latitudePosition: 'N',
-        band: 0,
-        bandwidth: 3
-      }
+        band: 0.0,
+        bandwidth: 3,
+        outputFormat: 'degree'
+      },
+      
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
     }
   },
   watch: {
@@ -361,7 +387,8 @@ export default {
         longitudePosition: 'E',
         latitudePosition: 'N',
         band: 3,
-        bandwidth: 3
+        bandwidth: 3,
+        outputFormat: 'degree'
       }
     },
     
@@ -401,7 +428,8 @@ export default {
         latitudePosition: this.commonParams.latitudePosition,
         band: this.commonParams.band,
         bandwidth: this.commonParams.bandwidth,
-        projectionHeight: this.projectionHeight
+        projectionHeight: this.projectionHeight,
+        outputFormat: this.commonParams.outputFormat
       }))
       
       const response = await calculate(requestData)
@@ -448,6 +476,17 @@ export default {
       return Number(value).toFixed(decimals)
     },
     
+    // 分页大小变化
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.currentPage = 1
+    },
+    
+    // 当前页变化
+    handleCurrentChange(val) {
+      this.currentPage = val
+    },
+    
     // 导出结果
     async handleExport() {
       if (this.calculationResults.length === 0) {
@@ -508,8 +547,9 @@ export default {
     
     // 显示数据：优先显示计算结果，否则显示导入数据
     displayData() {
+      let data = []
       if (this.calculationResults.length > 0) {
-        return this.calculationResults.map(item => ({
+        data = this.calculationResults.map(item => ({
           pointNumber: item.pointNumber,
           gaussX: item.gaussX,
           gaussY: item.gaussY,
@@ -517,7 +557,7 @@ export default {
           latitude: item.latitude
         }))
       } else if (this.importedData.length > 0) {
-        return this.importedData.map(item => ({
+        data = this.importedData.map(item => ({
           pointNumber: item.pointNumber,
           gaussX: item.gaussX,
           gaussY: item.gaussY,
@@ -525,7 +565,19 @@ export default {
           latitude: undefined
         }))
       }
-      return []
+      
+      // 分页处理
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return data.slice(start, end)
+    },
+    
+    // 总数据条数（用于分页组件）
+    totalData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.length
+      }
+      return this.importedData.length
     }
   },
     
@@ -617,6 +669,16 @@ export default {
   font-weight: 500;
 }
 
+.pagination-wrapper {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+}
+
 .empty-state {
   text-align: center;
   padding: 60px 20px;

oa-ui/src/views/calculate/tools/gausspositive.vue

@@ -70,7 +70,7 @@
         
         <div class="params-group">
           <label class="param-label">带号</label>
-          <el-input v-model.number="commonParams.band" size="small" style="width: 80px;" placeholder="带号"></el-input>
+          <el-input-number v-model="commonParams.band" size="small" :precision="3" :step="0.1" :controls="false" style="width: 80px;" placeholder="带号"></el-input-number>
         </div>
         
         <div class="params-group">
@@ -80,6 +80,16 @@
             <el-option label="6" :value="6"></el-option>
           </el-select>
         </div>
+
+        
+        
+        <div class="params-group">
+          <label class="param-label">输入数据类型</label>
+          <el-select v-model="commonParams.angleFormat" size="small" style="width: 120px;">
+            <el-option label="度分秒" value="dms"></el-option>
+            <el-option label="度" value="degree"></el-option>
+          </el-select>
+        </div>
       </div>
     </div>
 
@@ -100,12 +110,12 @@
       
       <el-table :data="displayData" style="width: 100%" border stripe>
         <el-table-column prop="pointNumber" label="待求点号" width="120" align="center"></el-table-column>
-        <el-table-column prop="longitude" label="大地经度(° ′ ″)" width="150" align="center">
+        <el-table-column prop="longitude" label="大地经度" width="150" align="center">
           <template slot-scope="scope">
             {{ formatNumber(scope.row.longitude, 9) }}
           </template>
         </el-table-column>
-        <el-table-column prop="latitude" label="大地纬度(° ′ ″)" width="150" align="center">
+        <el-table-column prop="latitude" label="大地纬度" width="150" align="center">
           <template slot-scope="scope">
             {{ formatNumber(scope.row.latitude, 9) }}
           </template>
@@ -129,6 +139,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -273,7 +296,11 @@ export default {
       projectionHeight: 0,
       heightTimer: null,
       //  预览对话框显示控制
-      previewDialogVisible: false, 
+      previewDialogVisible: false,
+      
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100, 
       
       // 字段映射相关
       fieldMappingVisible: false,
@@ -289,7 +316,8 @@ export default {
         longitudePosition: 'E',
         latitudePosition: 'N',
         band: 0,
-        bandwidth: 3
+        bandwidth: 3,
+        angleFormat: 'degree'
       }
     }
   },
@@ -360,11 +388,12 @@ export default {
     
     // 显示数据：优先显示计算结果，否则显示导入数据
     displayData() {
+      let data = []
       if (this.calculationResults.length > 0) {
-        return this.calculationResults
+        data = this.calculationResults
       } else if (this.importedData.length > 0) {
         // 将导入数据转换为统一格式，保留公共参数信息
-        return this.importedData.map(item => ({
+        data = this.importedData.map(item => ({
           pointNumber: item.pointNumber,
           coordinateSystem: this.commonParams.coordinateSystem,
           band: this.commonParams.band,
@@ -376,7 +405,19 @@ export default {
           meridianConvergence: undefined
         }))
       }
-      return []
+      
+      // 分页处理
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return data.slice(start, end)
+    },
+    
+    // 总数据条数（用于分页组件）
+    totalData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.length
+      }
+      return this.importedData.length
     }
   },
   methods: {
@@ -490,7 +531,8 @@ export default {
         longitudePosition: 'E',
         latitudePosition: 'N',
         band: 3,
-        bandwidth: 3
+        bandwidth: 3,
+        angleFormat: 'degree'
       }
     },
     
@@ -529,7 +571,8 @@ export default {
         latitudePosition: this.commonParams.latitudePosition,
         band: this.commonParams.band,
         bandwidth: this.commonParams.bandwidth,
-        projectionHeight: this.commonParams.projectionHeight
+        projectionHeight: this.commonParams.projectionHeight,
+        angleFormat: this.commonParams.angleFormat
       }))
       
       const response = await calculate(requestData)
@@ -625,6 +668,17 @@ export default {
     return Number(value).toFixed(decimals)
   },
   
+  // 分页大小变化
+  handleSizeChange(val) {
+    this.pageSize = val
+    this.currentPage = 1
+  },
+  
+  // 当前页变化
+  handleCurrentChange(val) {
+    this.currentPage = val
+  },
+  
   // 获取坐标系标签类型
   getCoordinateType(system) {
     const types = {
@@ -724,6 +778,16 @@ export default {
   font-weight: 500;
 }
 
+.pagination-wrapper {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+}
+
 .empty-state {
   text-align: center;
   padding: 60px 20px;

oa-ui/src/views/calculate/tools/geodetictospatial.vue

@@ -69,6 +69,14 @@
             <el-option label="S" value="S"></el-option>
           </el-select>
         </div>
+        
+        <div class="params-group">
+          <label class="param-label">角度格式</label>
+          <el-select v-model="commonParams.angleFormat" size="small" style="width: 120px;">
+            <el-option label="度分秒" value="dms"></el-option>
+            <el-option label="度" value="degree"></el-option>
+          </el-select>
+        </div>
       </div>
     </div>
 
@@ -126,6 +134,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -235,9 +256,14 @@ export default {
         coordinateSystem: 'WGS84',
         projectionHeight: 0,
         longitudePosition: 'E',
-        latitudePosition: 'N'
+        latitudePosition: 'N',
+        angleFormat: 'dms'
       },
       
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
+      
       // 字段映射相关
       mappingDialogVisible: false,
       excelColumns: [],
@@ -405,7 +431,8 @@ export default {
         longitudePosition: this.commonParams.longitudePosition,
         latitude: parseFloat(item.latitude),
         latitudePosition: this.commonParams.latitudePosition,
-        height: parseFloat(item.height) || 0
+        height: parseFloat(item.height) || 0,
+        angleFormat: this.commonParams.angleFormat
       }))
       
       const response = await calculate(requestData)
@@ -492,6 +519,17 @@ export default {
       return Number(value).toFixed(decimals)
     },
     
+    // 分页大小变化
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.currentPage = 1
+    },
+    
+    // 当前页变化
+    handleCurrentChange(val) {
+      this.currentPage = val
+    },
+    
     // 获取坐标系标签类型
   getCoordinateType(system) {
     const types = {
@@ -518,8 +556,9 @@ computed: {
   
   // 显示数据：优先显示计算结果，否则显示导入数据
   displayData() {
+    let data = []
     if (this.calculationResults.length > 0) {
-      return this.calculationResults.map(item => ({
+      data = this.calculationResults.map(item => ({
         pointNumber: item.pointNumber,
         longitude: item.longitude,
         latitude: item.latitude,
@@ -529,7 +568,7 @@ computed: {
         spatialZ: item.spatialZ
       }))
     } else if (this.importedData.length > 0) {
-      return this.importedData.map(item => ({
+      data = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
         longitude: item.longitude,
         latitude: item.latitude,
@@ -539,7 +578,19 @@ computed: {
         spatialZ: undefined
       }))
     }
-    return []
+    
+    // 分页处理
+    const start = (this.currentPage - 1) * this.pageSize
+    const end = start + this.pageSize
+    return data.slice(start, end)
+  },
+  
+  // 总数据条数（用于分页组件）
+  totalData() {
+    if (this.calculationResults.length > 0) {
+      return this.calculationResults.length
+    }
+    return this.importedData.length
   }
 }
 }
@@ -744,4 +795,15 @@ computed: {
   color: #C0C4CC;
   font-style: italic;
 }
+
+/* 分页组件样式 */
+.pagination-wrapper {
+  padding: 12px 16px;
+  background: #fff;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+  display: flex;
+  justify-content: flex-end;
+}
 </style>

oa-ui/src/views/calculate/tools/spatialtogeodetic.vue

@@ -52,6 +52,14 @@
             <el-option label="Xian80" value="Xian80"></el-option>
           </el-select>
         </div>
+        
+        <div class="params-group">
+          <label class="param-label">输出格式</label>
+          <el-select v-model="commonParams.outputFormat" size="small" style="width: 120px;">
+            <el-option label="度分秒" value="dms"></el-option>
+            <el-option label="度" value="degree"></el-option>
+          </el-select>
+        </div>
       </div>
     </div>
 
@@ -121,6 +129,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -228,9 +249,14 @@ export default {
       // 公共参数
       commonParams: {
         projectionHeight: 0,
-        coordinateSystem: 'WGS84'
+        coordinateSystem: 'WGS84',
+        outputFormat: 'dms'
       },
       
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
+      
       // 字段映射相关
       mappingDialogVisible: false,
       excelColumns: [],
@@ -396,7 +422,8 @@ export default {
         coordinateSystem: this.commonParams.coordinateSystem,
         spatialX: parseFloat(item.spatialX),
         spatialY: parseFloat(item.spatialY),
-        spatialZ: parseFloat(item.spatialZ)
+        spatialZ: parseFloat(item.spatialZ),
+        outputFormat: this.commonParams.outputFormat
       }))
       
       const response = await calculate(requestData)
@@ -482,6 +509,17 @@ export default {
       return Number(value).toFixed(decimals)
     },
     
+    // 分页大小变化
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.currentPage = 1
+    },
+    
+    // 当前页变化
+    handleCurrentChange(val) {
+      this.currentPage = val
+    },
+    
     // 获取坐标系标签类型
     getCoordinateType(system) {
       const types = {
@@ -507,34 +545,47 @@ export default {
     },
     
     // 显示数据：优先显示计算结果，否则显示导入数据
-    displayData() {
-      if (this.calculationResults.length > 0) {
-        return this.calculationResults.map(item => ({
-          pointNumber: item.pointNumber,
-          spatialX: item.spatialX,
-          spatialY: item.spatialY,
-          spatialZ: item.spatialZ,
-          longitude: item.longitude,
-          latitude: item.latitude,
-          height: item.height,
-          longitudePosition: item.longitudePosition,
-          latitudePosition: item.latitudePosition,
-        }))
-      } else if (this.importedData.length > 0) {
-        return this.importedData.map(item => ({
-          pointNumber: item.pointNumber,
-          spatialX: item.spatialX,
-          spatialY: item.spatialY,
-          spatialZ: item.spatialZ,
-          longitude: undefined,
-          latitude: undefined,
-          height: undefined
-        }))
-      }
-      return []
+  displayData() {
+    let data = []
+    if (this.calculationResults.length > 0) {
+      data = this.calculationResults.map(item => ({
+        pointNumber: item.pointNumber,
+        spatialX: item.spatialX,
+        spatialY: item.spatialY,
+        spatialZ: item.spatialZ,
+        longitude: item.longitude,
+        latitude: item.latitude,
+        height: item.height,
+        longitudePosition: item.longitudePosition,
+        latitudePosition: item.latitudePosition,
+      }))
+    } else if (this.importedData.length > 0) {
+      data = this.importedData.map(item => ({
+        pointNumber: item.pointNumber,
+        spatialX: item.spatialX,
+        spatialY: item.spatialY,
+        spatialZ: item.spatialZ,
+        longitude: undefined,
+        latitude: undefined,
+        height: undefined
+      }))
+    }
+    
+    // 分页处理
+    const start = (this.currentPage - 1) * this.pageSize
+    const end = start + this.pageSize
+    return data.slice(start, end)
+  },
+  
+  // 总数据条数（用于分页组件）
+  totalData() {
+    if (this.calculationResults.length > 0) {
+      return this.calculationResults.length
     }
+    return this.importedData.length
   }
 }
+}
 </script>
 
 <style scoped>
@@ -730,4 +781,15 @@ export default {
   flex: 1;
   min-width: 200px;
 }
+
+/* 分页组件样式 */
+.pagination-wrapper {
+  padding: 12px 16px;
+  background: #fff;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+  display: flex;
+  justify-content: flex-end;
+}
 </style>

oa-ui/src/views/calculate/tools/utmnegative.vue

@@ -70,7 +70,15 @@
         
         <div class="params-group">
           <label class="param-label">带号</label>
-          <el-input v-model.number="commonParams.band" size="small" style="width: 80px;" placeholder="带号" @change="onParamsChange"></el-input>
+          <el-input-number v-model="commonParams.band" size="small" :precision="3" :step="0.1" :controls="false" style="width: 80px;" placeholder="带号"></el-input-number>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">输出格式</label>
+          <el-select v-model="commonParams.outputFormat" size="small" style="width: 120px;">
+            <el-option label="度分秒" value="dms"></el-option>
+            <el-option label="度" value="degree"></el-option>
+          </el-select>
         </div>
       </div>
     </div>
@@ -119,6 +127,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -218,12 +239,17 @@ export default {
       projectionHeight: 0,
       heightTimer: null,
       
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
+      
       // 公共参数
       commonParams: {
         coordinateSystem: 'WGS84',
         longitudePosition: 'E',
         latitudePosition: 'N',
-        band: 0
+        band: 0,
+        outputFormat: 'degree'
       },
       
       // 字段映射相关
@@ -407,7 +433,8 @@ export default {
         band: this.commonParams.band,
         longitudePosition: this.commonParams.longitudePosition,
         latitudePosition: this.commonParams.latitudePosition,
-        projectionHeight: this.projectionHeight
+        projectionHeight: this.projectionHeight,
+        outputFormat: this.commonParams.outputFormat
       }))
       
       const response = await calculate(requestData)
@@ -493,6 +520,17 @@ export default {
     return Number(value).toFixed(decimals)
   },
   
+  // 分页大小变化
+  handleSizeChange(val) {
+    this.pageSize = val
+    this.currentPage = 1
+  },
+  
+  // 当前页变化
+  handleCurrentChange(val) {
+    this.currentPage = val
+  },
+  
   // 获取坐标系标签类型
   getCoordinateType(system) {
     const types = {
@@ -518,16 +556,11 @@ export default {
     
     // 显示数据：优先显示计算结果，否则显示导入数据
     displayData() {
+      let data = []
       if (this.calculationResults.length > 0) {
-        return this.calculationResults.map(item => ({
-          pointNumber: item.pointNumber,
-          utmX: item.utmX,
-          utmY: item.utmY,
-          longitude: item.longitude,
-          latitude: item.latitude
-        }))
+        data = this.calculationResults
       } else if (this.importedData.length > 0) {
-        return this.importedData.map(item => ({
+        data = this.importedData.map(item => ({
           pointNumber: item.pointNumber,
           utmX: item.utmX,
           utmY: item.utmY,
@@ -535,7 +568,19 @@ export default {
           latitude: undefined
         }))
       }
-      return []
+      
+      // 分页处理
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return data.slice(start, end)
+    },
+    
+    // 总数据条数（用于分页组件）
+    totalData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.length
+      }
+      return this.importedData.length
     }
   }
 }
@@ -730,4 +775,14 @@ export default {
   color: #C0C4CC;
   font-style: italic;
 }
+
+.pagination-wrapper {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+}
 </style>

oa-ui/src/views/calculate/tools/utmpositive.vue

@@ -70,7 +70,15 @@
         
         <div class="params-group">
           <label class="param-label">带号</label>
-          <el-input v-model.number="commonParams.band" size="small" style="width: 80px;" placeholder="带号" @change="onParamsChange"></el-input>
+          <el-input-number v-model="commonParams.band" size="small" :precision="3" :step="0.1" :controls="false" style="width: 80px;" placeholder="带号"></el-input-number>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">角度格式</label>
+          <el-select v-model="commonParams.angleFormat" size="small" style="width: 120px;">
+            <el-option label="度分秒" value="dms"></el-option>
+            <el-option label="度" value="degree"></el-option>
+          </el-select>
         </div>
       </div>
     </div>
@@ -96,12 +104,12 @@
       
       <el-table :data="displayData" style="width: 100%" border stripe>
         <el-table-column prop="pointNumber" label="待求点号" width="120" align="center"></el-table-column>
-        <el-table-column prop="longitude" label="大地经度(° ′ ″)" width="150" align="center">
+        <el-table-column prop="longitude" label="大地经度" width="150" align="center">
           <template slot-scope="scope">
             <span>{{ formatNumber(scope.row.longitude, 6) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="latitude" label="大地纬度(° ′ ″)" width="150" align="center">
+        <el-table-column prop="latitude" label="大地纬度" width="150" align="center">
           <template slot-scope="scope">
             <span>{{ formatNumber(scope.row.latitude, 6) }}</span>
           </template>
@@ -125,6 +133,19 @@
           </template>
         </el-table-column>
       </el-table>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-wrapper">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[100, 200, 500]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalData">
+        </el-pagination>
+      </div>
     </div>
     
     <!-- 空状态 -->
@@ -224,12 +245,17 @@ export default {
       projectionHeight: 0,
       heightTimer: null,
       
+      // 分页相关
+      currentPage: 1,
+      pageSize: 100,
+      
       // 公共参数
       commonParams: {
         coordinateSystem: 'WGS84',
         longitudePosition: 'E',
         latitudePosition: 'N',
-        band: 0
+        band: 0,
+        angleFormat: 'degree'
       },
       
       // 字段映射相关
@@ -413,7 +439,8 @@ export default {
         latitude: parseFloat(item.latitude),
         latitudePosition: this.commonParams.latitudePosition,
         band: this.commonParams.band,
-        projectionHeight: this.projectionHeight
+        projectionHeight: this.projectionHeight,
+        angleFormat: this.commonParams.angleFormat
       }))
       
       const response = await calculate(requestData)
@@ -495,22 +522,33 @@ export default {
     },
     
     // 格式化数字显示
-    formatNumber(value, decimals = 3) {
-      if (value === null || value === undefined) return '--'
-      return Number(value).toFixed(decimals)
-    },
-    
-    // 获取坐标系标签类型
-    getCoordinateType(system) {
-      const types = {
-        'WGS84': 'primary',
-        'CGCS2000': 'success',
-        'Beijing54': 'warning',
-        'Xian80': 'info'
-      }
-      return types[system] || 'info'
-    },
+  formatNumber(value, decimals = 3) {
+    if (value === null || value === undefined) return '--'
+    return Number(value).toFixed(decimals)
+  },
+  
+  // 分页大小变化
+  handleSizeChange(val) {
+    this.pageSize = val
+    this.currentPage = 1
+  },
+  
+  // 当前页变化
+  handleCurrentChange(val) {
+    this.currentPage = val
+  },
+  
+  // 获取坐标系标签类型
+  getCoordinateType(system) {
+    const types = {
+      'WGS84': 'primary',
+      'CGCS2000': 'success',
+      'Beijing54': 'warning',
+      'Xian80': 'info'
+    }
+    return types[system] || 'info'
   },
+},
   
   computed: {
     // 验证字段映射
@@ -525,17 +563,11 @@ export default {
     
     // 显示数据：优先显示计算结果，否则显示导入数据
     displayData() {
+      let data = []
       if (this.calculationResults.length > 0) {
-        return this.calculationResults.map(item => ({
-          pointNumber: item.pointNumber,
-          longitude: item.longitude,
-          latitude: item.latitude,
-          utmX: item.utmX,
-          utmY: item.utmY,
-          meridianConvergence: item.meridianConvergence
-        }))
+        data = this.calculationResults
       } else if (this.importedData.length > 0) {
-        return this.importedData.map(item => ({
+        data = this.importedData.map(item => ({
           pointNumber: item.pointNumber,
           longitude: item.longitude,
           latitude: item.latitude,
@@ -544,7 +576,19 @@ export default {
           meridianConvergence: undefined
         }))
       }
-      return []
+      
+      // 分页处理
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return data.slice(start, end)
+    },
+    
+    // 总数据条数（用于分页组件）
+    totalData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.length
+      }
+      return this.importedData.length
     }
   }
 }
@@ -739,4 +783,14 @@ export default {
   color: #C0C4CC;
   font-style: italic;
 }
+
+.pagination-wrapper {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 0 0 8px 8px;
+  border: 1px solid #e4e7ed;
+  border-top: none;
+}
 </style>