修改高斯工具显示，新增度和度分秒转换

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

@@ -0,0 +1,99 @@
+package com.ruoyi.web.calculate.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+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.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.CmcDMSToDegree;
+import com.ruoyi.web.calculate.service.ICmcDMSToDegreeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+
+/**
+ * 度分秒转度 Controller
+ * 
+ * @author ruoyi
+ * @date 2026-06-12
+ */
+@RestController
+@RequestMapping("/calculate/DMSToDegree")
+public class CmcDMSToDegreeController extends BaseController
+{
+    @Autowired
+    private ICmcDMSToDegreeService cmcDMSToDegreeService;
+
+    /**
+     * 导入 Excel 数据
+     */
+    @PostMapping("/import")
+    public AjaxResult importExcel(@RequestParam("file") MultipartFile file)
+    {
+        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 cmcDMSToDegreeService.importExcelData(file);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 导出度分秒转度列表
+     */
+    @Log(title = "度分秒转度", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody List<CmcDMSToDegree> dataList)
+    {
+        if (dataList == null || dataList.isEmpty()) {
+            throw new RuntimeException("没有需要导出的数据");
+        }
+        
+        List<CmcDMSToDegree> exportList = new ArrayList<>();
+        for (CmcDMSToDegree item : dataList) {
+            CmcDMSToDegree exportItem = new CmcDMSToDegree();   
+            exportItem.setPointNumber(item.getPointNumber());
+            exportItem.setLongitudeDMS(item.getLongitudeDMS());
+            exportItem.setLatitudeDMS(item.getLatitudeDMS());
+            exportItem.setLongitude(item.getLongitude());
+            exportItem.setLatitude(item.getLatitude());
+            exportList.add(exportItem);
+        }
+        
+        ExcelUtil<CmcDMSToDegree> util = new ExcelUtil<CmcDMSToDegree>(CmcDMSToDegree.class);
+        util.exportExcel(response, exportList, "度分秒转度结果");
+    }
+
+    /**
+     * 执行度分秒转度（仅计算，不保存）
+     */
+    @PostMapping("/calculate")
+    public AjaxResult calculate(@RequestBody List<CmcDMSToDegree> dataList)     
+    {
+        List<CmcDMSToDegree> result = cmcDMSToDegreeService.calculateDMSToDegree(dataList);
+        return success(result);
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.ruoyi.web.calculate.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+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.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.CmcDegreeToDMS;
+import com.ruoyi.web.calculate.service.ICmcDegreeToDMSService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+
+/**
+ * 角度度分秒转换 Controller
+ * 
+ * @author ruoyi
+ * @date 2026-06-12
+ */
+@RestController
+@RequestMapping("/calculate/degreeToDMS")
+public class CmcDegreeToDMSController extends BaseController
+{
+    @Autowired
+    private ICmcDegreeToDMSService cmcDegreeToDMS;
+
+    /**
+     * 导入 Excel 数据
+     */
+    @PostMapping("/import")
+    public AjaxResult importExcel(@RequestParam("file") MultipartFile file)
+    {
+        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 cmcDegreeToDMS.importExcelData(file);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 导出角度度分秒转换列表
+     */
+    @Log(title = "度转度分秒", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody List<CmcDegreeToDMS> dataList)
+    {
+        if (dataList == null || dataList.isEmpty()) {
+            throw new RuntimeException("没有需要导出的数据");
+        }
+        
+        List<CmcDegreeToDMS> exportList = new ArrayList<>();
+        for (CmcDegreeToDMS item : dataList) {
+            CmcDegreeToDMS exportItem = new CmcDegreeToDMS();
+            exportItem.setPointNumber(item.getPointNumber());
+            exportItem.setLongitude(item.getLongitude());
+            exportItem.setLatitude(item.getLatitude());
+            exportItem.setLongitudeDMS(item.getLongitudeDMS());
+            exportItem.setLatitudeDMS(item.getLatitudeDMS());
+            exportList.add(exportItem);
+        }
+        
+        ExcelUtil<CmcDegreeToDMS> util = new ExcelUtil<CmcDegreeToDMS>(CmcDegreeToDMS.class);
+        util.exportExcel(response, exportList, "度转度分秒结果");
+    }
+
+    /**
+     * 执行角度度分秒转换（仅计算，不保存）
+     */
+    @PostMapping("/calculate")
+    public AjaxResult calculate(@RequestBody List<CmcDegreeToDMS> dataList)
+    {
+        List<CmcDegreeToDMS> result = cmcDegreeToDMS.calculateDegreeToDMS(dataList);
+        return success(result);
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.ruoyi.web.calculate.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+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.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.web.calculate.domain.CmcDMSToDegree;
+import com.ruoyi.web.calculate.domain.CmcDegreeToRadian;
+import com.ruoyi.web.calculate.service.ICmcDegreeToRadianService;
+
+/**
+ * 角度度转弧度控制器
+ * 
+ * @author ruoyi
+ * @date 2026-06-17
+ */
+@RestController
+@RequestMapping("/calculate/degreeToRadian")
+public class CmcDegreeToRadianController {
+
+    @Autowired
+    private ICmcDegreeToRadianService cmcDegreeToRadianService;
+
+    /**
+     * 导入Excel数据
+     */
+    @PostMapping("/import")
+    public AjaxResult importExcel(@RequestParam("file") MultipartFile file) {
+        return cmcDegreeToRadianService.importExcelData(file);
+    }
+
+    /**
+     * 导出角度度转弧度列表
+     */
+    @Log(title = "角度度转弧度", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody List<CmcDegreeToRadian> dataList)
+    {
+        if (dataList == null || dataList.isEmpty()) {
+            throw new RuntimeException("没有需要导出的数据");
+        }
+        
+        List<CmcDegreeToRadian> exportList = new ArrayList<>();
+        for (CmcDegreeToRadian item : dataList) {
+            CmcDegreeToRadian exportItem = new CmcDegreeToRadian();   
+            exportItem.setPointNumber(item.getPointNumber());
+            exportItem.setLongitude(item.getLongitude());
+            exportItem.setLatitude(item.getLatitude());
+            exportItem.setLongitudeRadian(item.getLongitudeRadian());
+            exportItem.setLatitudeRadian(item.getLatitudeRadian());
+            exportList.add(exportItem);
+        }
+        
+        ExcelUtil<CmcDegreeToRadian> util = new ExcelUtil<CmcDegreeToRadian>(CmcDegreeToRadian.class);
+        util.exportExcel(response, exportList, "角度度转弧度结果");
+    }
+
+    /**
+     * 执行角度度转弧度计算
+     */
+    @PostMapping("/calculate")
+    public AjaxResult calculateDegreeToRadian(@RequestBody List<CmcDegreeToRadian> dataList) {
+        try {
+            List<CmcDegreeToRadian> results = cmcDegreeToRadianService.calculateDegreeToRadian(dataList);
+            return AjaxResult.success("计算完成", results);
+        } catch (Exception e) {
+            return AjaxResult.error("计算失败：" + e.getMessage());
+        }
+    }
+}

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

@@ -19,7 +19,6 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.calculate.domain.CmcGaussBandChange;
 import com.ruoyi.web.calculate.service.ICmcGaussBandChangeService;
-import com.ruoyi.web.calculate.vo.CmcGaussBandChangeTemplate;
 
 @RestController
 @RequestMapping("/calculate/gaussBandChange")
@@ -96,27 +95,4 @@ public class CmcGaussBandChangeController {
         return AjaxResult.success(result);
     }
 
-    @PostMapping("/template")
-    public void downloadTemplate(HttpServletResponse response) {
-        List<CmcGaussBandChangeTemplate> templateList = new ArrayList<>();
-
-        // 添加示例数据
-        CmcGaussBandChangeTemplate example = new CmcGaussBandChangeTemplate();
-        example.setPointNumber("示例点1");
-        example.setCoordinateSystem("WGS84");
-        example.setGaussX(3421806.699);
-        example.setGaussY(34460881.36);
-        example.setBand(1);
-        example.setBandwidth(3);
-        example.setNewBand(2);
-        example.setNewBandwidth(6);
-        example.setLongitudePosition("E");
-        example.setLatitudePosition("N");
-        templateList.add(example);
-
-        ExcelUtil<CmcGaussBandChangeTemplate> util = new ExcelUtil<CmcGaussBandChangeTemplate>(
-                CmcGaussBandChangeTemplate.class);
-        util.exportExcel(response, templateList, "高斯换带模板");
-    }
-
 }

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

@@ -19,7 +19,6 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.calculate.domain.CmcGaussNegative;
 import com.ruoyi.web.calculate.service.ICmcGaussNegativeService;
-import com.ruoyi.web.calculate.vo.CmcGaussNegativeTemplate;
 
 
 @RestController
@@ -98,26 +97,4 @@ public class CmcGaussNegativeController
         List<CmcGaussNegative> result = cmcGaussNegativeService.calculateGaussNegative(dataList);
         return AjaxResult.success(result);
     }
-
-
-
-    @PostMapping("/template")
-    public void downloadTemplate(HttpServletResponse response) {
-        List<CmcGaussNegativeTemplate> templateList = new ArrayList<>();
-
-        // 添加示例数据
-        CmcGaussNegativeTemplate example = new CmcGaussNegativeTemplate();
-        example.setPointNumber("示例点1");
-        example.setCoordinateSystem("WGS84");
-        example.setGaussX(3421806.699);
-        example.setGaussY(34460881.36);
-        example.setLongitudePosition("E");
-        example.setLatitudePosition("N");
-        templateList.add(example);
-
-        ExcelUtil<CmcGaussNegativeTemplate> util = new ExcelUtil<CmcGaussNegativeTemplate>(CmcGaussNegativeTemplate.class);
-        util.exportExcel(response, templateList, "高斯反算模板");
-    }
-
-
 }

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

@@ -22,7 +22,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.calculate.domain.CmcGaussPositive;
 import com.ruoyi.web.calculate.service.ICmcGaussPositiveService;
-import com.ruoyi.web.calculate.vo.CmcGaussPositiveTemplate;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -108,25 +107,4 @@ public class CmcGaussPositiveController extends BaseController
         List<CmcGaussPositive> result = cmcGaussPositiveService.calculateGaussPositive(dataList);
         return success(result);
     }
-
-    @PostMapping("/template")
-    public void downloadTemplate(HttpServletResponse response) {
-        List<CmcGaussPositiveTemplate> templateList = new ArrayList<>();
-
-        // 添加示例数据
-        CmcGaussPositiveTemplate example = new CmcGaussPositiveTemplate();
-        example.setPointNumber("示例点1");
-        example.setCoordinateSystem("WGS84");
-        example.setLongitude(103.3734281951);
-        example.setLongitudePosition("E");
-        example.setLatitude(29.29315636);
-        example.setLatitudePosition("N");
-        example.setBand(35);
-        example.setBandwidth(3);
-        templateList.add(example);
-
-        ExcelUtil<CmcGaussPositiveTemplate> util = new ExcelUtil<CmcGaussPositiveTemplate>(CmcGaussPositiveTemplate.class);
-        util.exportExcel(response, templateList, "高斯正算模板");
-    }
-
 }

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

@@ -22,7 +22,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.calculate.domain.CmcGeodeticToSpatial;
 import com.ruoyi.web.calculate.service.ICmcGeodeticToSpatialService;
-import com.ruoyi.web.calculate.vo.CmcGeodeticToSpatialTemplate;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -107,24 +106,4 @@ public class CmcGeodeticToSpatialController extends BaseController
         List<CmcGeodeticToSpatial> result = cmcGeodeticToSpatialService.calculateGeodeticToSpatial(dataList);
         return success(result);
     }
-
-    @PostMapping("/template")
-    public void downloadTemplate(HttpServletResponse response) {
-        List<CmcGeodeticToSpatialTemplate> templateList = new ArrayList<>();
-
-        // 添加示例数据
-        CmcGeodeticToSpatialTemplate example = new CmcGeodeticToSpatialTemplate();
-        example.setPointNumber("示例点 1");
-        example.setCoordinateSystem("WGS84");
-        example.setLongitude(103.3734281951);
-        example.setLongitudePosition("E");
-        example.setLatitude(29.29315636);
-        example.setLatitudePosition("N");
-        example.setHeight(500.0);
-        templateList.add(example);
-
-        ExcelUtil<CmcGeodeticToSpatialTemplate> util = new ExcelUtil<CmcGeodeticToSpatialTemplate>(CmcGeodeticToSpatialTemplate.class);
-        util.exportExcel(response, templateList, "大地坐标转空间坐标模板");
-    }
-
 }

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

@@ -22,7 +22,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.calculate.domain.CmcSpatialToGeodetic;
 import com.ruoyi.web.calculate.service.ICmcSpatialToGeodeticService;
-import com.ruoyi.web.calculate.vo.CmcSpatialToGeodeticTemplate;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -107,22 +106,4 @@ public class CmcSpatialToGeodeticContoller extends BaseController
         List<CmcSpatialToGeodetic> result = cmcSpatialToGeodeticService.calculateSpatialToGeodetic(dataList);
         return success(result);
     }
-
-    @PostMapping("/template")
-    public void downloadTemplate(HttpServletResponse response) {
-        List<CmcSpatialToGeodeticTemplate> templateList = new ArrayList<>();
-
-        // 添加示例数据
-        CmcSpatialToGeodeticTemplate example = new CmcSpatialToGeodeticTemplate();
-        example.setPointNumber("示例点 1");
-        example.setCoordinateSystem("WGS84");
-        example.setSpatialX(-2267767.268);
-        example.setSpatialY(4895887.566);
-        example.setSpatialZ(3279474.822);
-        templateList.add(example);
-
-        ExcelUtil<CmcSpatialToGeodeticTemplate> util = new ExcelUtil<CmcSpatialToGeodeticTemplate>(CmcSpatialToGeodeticTemplate.class);
-        util.exportExcel(response, templateList, "空间转大地模板");
-    }
-
 }

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

@@ -19,7 +19,6 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.calculate.domain.CmcUTMBandChange;
 import com.ruoyi.web.calculate.service.ICmcUTMBandChangeService;
-import com.ruoyi.web.calculate.vo.CmcUTMBandChangeTemplate;
 
 @RestController
 @RequestMapping("/calculate/utmBandChange")
@@ -93,26 +92,4 @@ public class CmcUTMBandChangeContorller {
         List<CmcUTMBandChange> result = cmcUTMBandChangeService.calculateUTMBandChange(dataList);
         return AjaxResult.success(result);
     }
-
-    @PostMapping("/template")
-    public void downloadTemplate(HttpServletResponse response) {
-        List<CmcUTMBandChangeTemplate> templateList = new ArrayList<>();
-
-        // 添加示例数据
-        CmcUTMBandChangeTemplate example = new CmcUTMBandChangeTemplate();
-        example.setPointNumber("示例点1");
-        example.setCoordinateSystem("WGS84");
-        example.setUtmX(3421806.699);
-        example.setUtmY(4460881.36);
-        example.setBand(49);
-        example.setNewBand(50);
-        example.setLongitudePosition("E");
-        example.setLatitudePosition("N");
-        templateList.add(example);
-
-        ExcelUtil<CmcUTMBandChangeTemplate> util = new ExcelUtil<CmcUTMBandChangeTemplate>(
-                CmcUTMBandChangeTemplate.class);
-        util.exportExcel(response, templateList, "UTM换带模板");
-    }
-
 }

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

@@ -19,7 +19,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.calculate.domain.CmcUTMNegative;
 import com.ruoyi.web.calculate.service.ICmcUTMNegativeService;
-import com.ruoyi.web.calculate.vo.CmcUTMNegativeTemplate;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 
 /**
@@ -102,25 +101,4 @@ public class CmcUTMNegativeController extends BaseController
         List<CmcUTMNegative> result = cmcUTMNagativeService.calculateUTMNagative(dataList);
         return success(result);
     }
-
-    @PostMapping("/template")
-    public void downloadTemplate(HttpServletResponse response) {
-        List<CmcUTMNegativeTemplate> templateList = new ArrayList<>();
-
-        // 添加示例数据
-        CmcUTMNegativeTemplate example = new CmcUTMNegativeTemplate();
-        example.setPointNumber("示例点1");
-        example.setCoordinateSystem("WGS84");
-        example.setUtmX(500000.1234);
-        example.setUtmY(3248765.4321);
-        example.setBand(48);
-        example.setLongitudePosition("东");
-        example.setLatitudePosition("北");
-        
-        templateList.add(example); // 示例数据
-        
-        ExcelUtil<CmcUTMNegativeTemplate> util = new ExcelUtil<CmcUTMNegativeTemplate>(CmcUTMNegativeTemplate.class);
-        util.exportExcel(response, templateList, "UTM反算模板");
-    }
-
 }

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

@@ -22,7 +22,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.calculate.domain.CmcUTMPositive;
 import com.ruoyi.web.calculate.service.ICmcUTMPositiveService;
-import com.ruoyi.web.calculate.vo.CmcUTMPositiveTemplate;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -107,24 +106,4 @@ public class CmcUTMPositiveController extends BaseController
         List<CmcUTMPositive> result = cmcUTMPositiveService.calculateUTMPositive(dataList);
         return success(result);
     }
-
-    @PostMapping("/template")
-    public void downloadTemplate(HttpServletResponse response) {
-        List<CmcUTMPositiveTemplate> templateList = new ArrayList<>();
-
-        // 添加示例数据
-        CmcUTMPositiveTemplate example = new CmcUTMPositiveTemplate();
-        example.setPointNumber("示例点1");
-        example.setCoordinateSystem("WGS84");
-        example.setLongitude(103.3734281951);
-        example.setLongitudePosition("E");
-        example.setLatitude(29.29315636);
-        example.setLatitudePosition("N");
-        example.setBand(48);
-        templateList.add(example);
-
-        ExcelUtil<CmcUTMPositiveTemplate> util = new ExcelUtil<CmcUTMPositiveTemplate>(CmcUTMPositiveTemplate.class);
-        util.exportExcel(response, templateList, "UTM正算模板");
-    }
-
 }

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

@@ -0,0 +1,107 @@
+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_degree_to_dms
+ * 
+ * @author qyx
+ * @date 2026-06-11
+ */
+public class CmcDMSToDegree extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 待求点号 */
+    @Excel(name = "待求点")
+    private String pointNumber;
+
+    /** 经度 */
+    @Excel(name = "经度（度分秒）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double longitudeDMS;
+
+    /** 纬度 */
+    @Excel(name = "纬度（度分秒）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double latitudeDMS;
+    
+    /** 经度 */
+    @Excel(name = "经度（度）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度（度）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double latitude;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setPointNumber(String pointNumber) {
+        this.pointNumber = pointNumber;
+    }
+
+    public String getPointNumber() {
+        return pointNumber;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLongitudeDMS(Double longitudeDMS) {
+        this.longitudeDMS = longitudeDMS;
+    }
+
+    public Double getLongitudeDMS() {
+        return longitudeDMS;
+    }
+
+    public void setLatitudeDMS(Double latitudeDMS) {
+        this.latitudeDMS = latitudeDMS;
+    }
+
+    public Double getLatitudeDMS() {
+        return latitudeDMS;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("pointNumber", getPointNumber())
+                .append("longitude", getLongitude())
+                .append("latitude", getLatitude())
+                .append("longitudeDMS", getLongitudeDMS())
+                .append("latitudeDMS", getLatitudeDMS())
+                .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/CmcDegreeToDMS.java

@@ -0,0 +1,120 @@
+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_degree_to_dms
+ * 
+ * @author qyx
+ * @date 2026-06-11
+ */
+public class CmcDegreeToDMS extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 待求点号 */
+    @Excel(name = "待求点")
+    private String pointNumber;
+
+    /** 经度 */
+    @Excel(name = "经度（度）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度（度）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double latitude;
+
+    /** 经度 */
+    @Excel(name = "经度（度分秒）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double longitudeDMS;
+
+    /** 纬度 */
+    @Excel(name = "纬度（度分秒）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double latitudeDMS;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    
+    public void setPointNumber(String pointNumber) 
+    {
+        this.pointNumber = pointNumber;
+    }
+
+    public String getPointNumber() 
+    {
+        return pointNumber;
+    }
+    
+    public void setLongitude(Double longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public Double getLongitude() 
+    {
+        return longitude;
+    }
+    
+    public void setLatitude(Double latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public Double getLatitude() 
+    {
+        return latitude;
+    }
+
+    public void setLongitudeDMS(Double longitudeDMS) 
+    {
+        this.longitudeDMS = longitudeDMS;
+    }
+
+    public Double getLongitudeDMS() 
+    {
+        return longitudeDMS;
+    }
+    
+    public void setLatitudeDMS(Double latitudeDMS) 
+    {
+        this.latitudeDMS = latitudeDMS;
+    }
+
+    public Double getLatitudeDMS() 
+    {
+        return latitudeDMS;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("pointNumber", getPointNumber())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("longitudeDMS", getLongitudeDMS())
+            .append("latitudeDMS", getLatitudeDMS())
+            .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/CmcDegreeToRadian.java

@@ -0,0 +1,120 @@
+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_degree_to_radian
+ * 
+ * @author qyx
+ * @date 2026-06-17
+ */
+public class CmcDegreeToRadian extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 待求点号 */
+    @Excel(name = "待求点")
+    private String pointNumber;
+
+    /** 经度（度） */
+    @Excel(name = "经度（度）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double longitude;
+
+    /** 纬度（度） */
+    @Excel(name = "纬度（度）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000")
+    private Double latitude;
+
+    /** 经度（弧度） */
+    @Excel(name = "经度（弧度）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000000")
+    private Double longitudeRadian;
+
+    /** 纬度（弧度） */
+    @Excel(name = "纬度（弧度）", cellType = ColumnType.NUMERIC, numberFormat = "0.000000000000")
+    private Double latitudeRadian;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    
+    public void setPointNumber(String pointNumber) 
+    {
+        this.pointNumber = pointNumber;
+    }
+
+    public String getPointNumber() 
+    {
+        return pointNumber;
+    }
+    
+    public void setLongitude(Double longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public Double getLongitude() 
+    {
+        return longitude;
+    }
+    
+    public void setLatitude(Double latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public Double getLatitude() 
+    {
+        return latitude;
+    }
+
+    public void setLongitudeRadian(Double longitudeRadian) 
+    {
+        this.longitudeRadian = longitudeRadian;
+    }
+
+    public Double getLongitudeRadian() 
+    {
+        return longitudeRadian;
+    }
+    
+    public void setLatitudeRadian(Double latitudeRadian) 
+    {
+        this.latitudeRadian = latitudeRadian;
+    }
+
+    public Double getLatitudeRadian() 
+    {
+        return latitudeRadian;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("pointNumber", getPointNumber())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("longitudeRadian", getLongitudeRadian())
+            .append("latitudeRadian", getLatitudeRadian())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+} 

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

@@ -0,0 +1,32 @@
+package com.ruoyi.web.calculate.service;
+
+import java.util.List;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.calculate.domain.CmcDMSToDegree;
+
+/**
+ * 度分秒转度服务接口
+ * 
+ * @author qyx
+ * @date 2026-06-12
+ */
+public interface ICmcDMSToDegreeService {
+    /**
+     * 导入Excel数据
+     * 
+     * @param file Excel文件
+     * @return 导入结果
+     */
+    public AjaxResult importExcelData(MultipartFile file);
+
+    /**
+     * 执行度分秒转度计算
+     * 
+     * @param dataList 计算参数列表
+     * @return 计算结果
+     */
+    public List<CmcDMSToDegree> calculateDMSToDegree(List<CmcDMSToDegree> dataList);
+}

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

@@ -0,0 +1,32 @@
+package com.ruoyi.web.calculate.service;
+
+import java.util.List;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.calculate.domain.CmcDegreeToDMS;
+
+/**
+ * 角度度分秒转换服务接口
+ * 
+ * @author qyx
+ * @date 2026-06-12
+ */
+public interface ICmcDegreeToDMSService {
+    /**
+     * 导入Excel数据
+     * 
+     * @param file Excel文件
+     * @return 导入结果
+     */
+    public AjaxResult importExcelData(MultipartFile file);
+
+    /**
+     * 执行角度度分秒转换计算
+     * 
+     * @param dataList 计算参数列表
+     * @return 计算结果
+     */
+    public List<CmcDegreeToDMS> calculateDegreeToDMS(List<CmcDegreeToDMS> dataList);
+}

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

@@ -0,0 +1,32 @@
+package com.ruoyi.web.calculate.service;
+
+import java.util.List;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.calculate.domain.CmcDegreeToRadian;
+
+/**
+ * 角度度弧度服务接口
+ * 
+ * @author qyx
+ * @date 2026-06-17
+ */
+public interface ICmcDegreeToRadianService {
+    /**
+     * 导入Excel数据
+     * 
+     * @param file Excel文件
+     * @return 导入结果
+     */
+    public AjaxResult importExcelData(MultipartFile file);
+
+    /**
+     * 执行角度转弧度计算
+     * 
+     * @param dataList 计算参数列表
+     * @return 计算结果
+     */
+    public List<CmcDegreeToRadian> calculateDegreeToRadian(List<CmcDegreeToRadian> dataList);
+}

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

@@ -0,0 +1,281 @@
+package com.ruoyi.web.calculate.service.impl;
+
+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.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.web.calculate.domain.CmcDMSToDegree;
+import com.ruoyi.web.calculate.service.ICmcDMSToDegreeService;
+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;
+
+/**
+ * 度分秒转度服务实现
+ * 
+ * @author ruoyi
+ * @date 2026-06-12
+ */
+@Service
+public class CmcDMSToDegreeServiceImpl implements ICmcDMSToDegreeService {
+
+    /**
+     * 导入Excel数据
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult importExcelData(MultipartFile file) {
+        try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
+
+            // 检查是否有数据
+            if (rawData == null || rawData.isEmpty()) {
+                return AjaxResult.error("Excel文件中没有数据！");
+            }
+
+            // 构建返回结果
+            Map<String, Object> result = new HashMap<>();
+            result.put("total", rawData.size());
+            result.put("validCount", rawData.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
+
+            String message = String.format("导入成功！共解析%d条数据", rawData.size());
+            return AjaxResult.success(message, result);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("导入失败：" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                int lastCellNum = headerRow.getLastCellNum();
+                for (int i = 0; i < lastCellNum; i++) {
+                    Cell cell = headerRow.getCell(i);
+                    String cellValue = null;
+                    if (cell != null) {
+                        cellValue = getCellStringValue(cell);
+                    }
+                    if (cellValue != null && !cellValue.trim().isEmpty()) {
+                        columns.add(cellValue.trim());
+                    } else {
+                        columns.add("列" + (i + 1));
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 获取单元格的字符串值（处理多种类型）
+     */
+    private String getCellStringValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue().toString();
+                } else {
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return String.valueOf((long) value);
+                    }
+                    return String.valueOf(value);
+                }
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    try {
+                        return String.valueOf(cell.getNumericCellValue());
+                    } catch (Exception ex) {
+                        return cell.getCellFormula();
+                    }
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                int lastCellNum = Math.min(row.getLastCellNum(), columns.size());
+                for (int j = 0; j < lastCellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 执行度分秒转度计算
+     */
+    @Override
+    public List<CmcDMSToDegree> calculateDMSToDegree(List<CmcDMSToDegree> dataList) {
+        List<CmcDMSToDegree> resultList = new ArrayList<>();
+        for (CmcDMSToDegree item : dataList) {
+            try {
+                CmcDMSToDegree result = calculateDMSToDegreeSingle(item);
+                resultList.add(result);
+            } catch (Exception e) {
+                e.printStackTrace();
+                // 计算失败时，返回带有错误信息的对象
+                CmcDMSToDegree errorResult = new CmcDMSToDegree();
+                errorResult.setPointNumber(item.getPointNumber());
+                errorResult.setLongitude(-1.0);
+                errorResult.setLatitude(-1.0);
+                resultList.add(errorResult);
+            }
+        }
+
+        return resultList;
+    }
+
+    /**
+     * 单条度分秒转度计算（待实现）
+     */
+    private CmcDMSToDegree calculateDMSToDegreeSingle(CmcDMSToDegree cmcDMSToDegree) {
+        double longitudeDegrees = cmcDMSToDegree.getLongitudeDMS();
+        double latitudeDegrees = cmcDMSToDegree.getLatitudeDMS();
+
+        // 度的整数部分
+        double longitudeDegreesInt = Math.floor(longitudeDegrees + 1.0E-12);
+        // 分的计算
+        double minutes = Math.floor(100 * (longitudeDegrees - longitudeDegreesInt) + 1.0E-12) / 60;
+        // 秒的计算
+        double seconds = (longitudeDegrees * 100 - Math.floor(longitudeDegrees * 100 + 1.0E-12)) / 36;
+
+        double longitude = longitudeDegreesInt + minutes + seconds;
+        cmcDMSToDegree.setLongitude(longitude);
+
+        // 纬度的整数部分
+        double latitudeDegreesInt = Math.floor(latitudeDegrees + 1.0E-12);
+        minutes = Math.floor(100 * (latitudeDegrees - latitudeDegreesInt) + 1.0E-12) / 60;
+        seconds = (latitudeDegrees * 100 - Math.floor(latitudeDegrees * 100 + 1.0E-12)) / 36;
+        double latitude = latitudeDegreesInt + minutes + seconds;
+        cmcDMSToDegree.setLatitude(latitude);
+        
+        return cmcDMSToDegree;
+    }
+}

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

@@ -0,0 +1,280 @@
+package com.ruoyi.web.calculate.service.impl;
+
+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.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.web.calculate.domain.CmcDegreeToDMS;
+import com.ruoyi.web.calculate.service.ICmcDegreeToDMSService;
+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;
+
+/**
+ * 角度度分秒转换服务实现
+ * 
+ * @author ruoyi
+ * @date 2026-06-12
+ */
+@Service
+public class CmcDegreeToDMSServiceImpl implements ICmcDegreeToDMSService {
+
+    /**
+     * 导入Excel数据
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult importExcelData(MultipartFile file) {
+        try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
+
+            // 检查是否有数据
+            if (rawData == null || rawData.isEmpty()) {
+                return AjaxResult.error("Excel文件中没有数据！");
+            }
+
+            // 构建返回结果
+            Map<String, Object> result = new HashMap<>();
+            result.put("total", rawData.size());
+            result.put("validCount", rawData.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
+
+            String message = String.format("导入成功！共解析%d条数据", rawData.size());
+            return AjaxResult.success(message, result);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("导入失败：" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                int lastCellNum = headerRow.getLastCellNum();
+                for (int i = 0; i < lastCellNum; i++) {
+                    Cell cell = headerRow.getCell(i);
+                    String cellValue = null;
+                    if (cell != null) {
+                        cellValue = getCellStringValue(cell);
+                    }
+                    if (cellValue != null && !cellValue.trim().isEmpty()) {
+                        columns.add(cellValue.trim());
+                    } else {
+                        columns.add("列" + (i + 1));
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 获取单元格的字符串值（处理多种类型）
+     */
+    private String getCellStringValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue().toString();
+                } else {
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return String.valueOf((long) value);
+                    }
+                    return String.valueOf(value);
+                }
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    try {
+                        return String.valueOf(cell.getNumericCellValue());
+                    } catch (Exception ex) {
+                        return cell.getCellFormula();
+                    }
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                int lastCellNum = Math.min(row.getLastCellNum(), columns.size());
+                for (int j = 0; j < lastCellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 执行角度度分秒转换计算
+     */
+    @Override
+    public List<CmcDegreeToDMS> calculateDegreeToDMS(List<CmcDegreeToDMS> dataList) {
+        List<CmcDegreeToDMS> resultList = new ArrayList<>();
+        for (CmcDegreeToDMS item : dataList) {
+            try {
+                CmcDegreeToDMS result = calculateDegreeToDMSSingle(item);
+                resultList.add(result);
+            } catch (Exception e) {
+                e.printStackTrace();
+                // 计算失败时，返回带有错误信息的对象
+                CmcDegreeToDMS errorResult = new CmcDegreeToDMS();
+                errorResult.setPointNumber(item.getPointNumber());
+                errorResult.setLongitudeDMS(-1.0);
+                errorResult.setLatitudeDMS(-1.0);
+                resultList.add(errorResult);
+            }
+        }
+
+        return resultList;
+    }
+
+    /**
+     * 单条角度度分秒转换计算
+     */
+    private CmcDegreeToDMS calculateDegreeToDMSSingle(CmcDegreeToDMS cmcDegreeToDMS) {
+        
+        double longitude = cmcDegreeToDMS.getLongitude();
+        double latitude = cmcDegreeToDMS.getLatitude();
+
+        // 1. 提取度
+        double degrees = Math.floor(longitude + 1.0E-13);
+        // 2. 提取分
+        double minutesRaw = 60 * (longitude - degrees);
+        double minutes = Math.floor(minutesRaw + 1.0E-13) / 100;
+        // 3. 提取秒
+        double secondsRaw = 60 * (60 * longitude - Math.floor(60 * longitude + 1.0E-13)) + 1.0E-13;
+        double seconds = secondsRaw / 10000;
+        cmcDegreeToDMS.setLongitudeDMS(degrees + minutes + seconds);
+
+        double latitudeDegrees = Math.floor(latitude + 1.0E-13);
+        double latitudeMinutes = Math.floor(60 * (latitude - latitudeDegrees) + 1.0E-13) / 100;
+        double latitudeSeconds = 60 * (60 * (latitude - latitudeDegrees) - Math.floor(60 * (latitude - latitudeDegrees) + 1.0E-13)) + 1.0E-13;
+        latitudeSeconds = latitudeSeconds / 10000;
+        cmcDegreeToDMS.setLatitudeDMS(latitudeDegrees + latitudeMinutes + latitudeSeconds);
+        return cmcDegreeToDMS;
+    }
+}

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

@@ -0,0 +1,271 @@
+package com.ruoyi.web.calculate.service.impl;
+
+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.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.web.calculate.domain.CmcDegreeToRadian;
+import com.ruoyi.web.calculate.service.ICmcDegreeToRadianService;
+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;
+
+/**
+ * 角度度转弧度服务实现
+ * 
+ * @author ruoyi
+ * @date 2026-06-17
+ */
+@Service
+public class CmcDegreeToRadianServiceImpl implements ICmcDegreeToRadianService {
+
+    /**
+     * 导入Excel数据
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult importExcelData(MultipartFile file) {
+        try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
+
+            // 检查是否有数据
+            if (rawData == null || rawData.isEmpty()) {
+                return AjaxResult.error("Excel文件中没有数据！");
+            }
+
+            // 构建返回结果
+            Map<String, Object> result = new HashMap<>();
+            result.put("total", rawData.size());
+            result.put("validCount", rawData.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
+
+            String message = String.format("导入成功！共解析%d条数据", rawData.size());
+            return AjaxResult.success(message, result);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("导入失败：" + e.getMessage());
+        }
+    }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                int lastCellNum = headerRow.getLastCellNum();
+                for (int i = 0; i < lastCellNum; i++) {
+                    Cell cell = headerRow.getCell(i);
+                    String cellValue = null;
+                    if (cell != null) {
+                        cellValue = getCellStringValue(cell);
+                    }
+                    if (cellValue != null && !cellValue.trim().isEmpty()) {
+                        columns.add(cellValue.trim());
+                    } else {
+                        columns.add("列" + (i + 1));
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 获取单元格的字符串值（处理多种类型）
+     */
+    private String getCellStringValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue().toString();
+                } else {
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return String.valueOf((long) value);
+                    }
+                    return String.valueOf(value);
+                }
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    try {
+                        return String.valueOf(cell.getNumericCellValue());
+                    } catch (Exception ex) {
+                        return cell.getCellFormula();
+                    }
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                int lastCellNum = Math.min(row.getLastCellNum(), columns.size());
+                for (int j = 0; j < lastCellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 执行角度度转弧度计算
+     */
+    @Override
+    public List<CmcDegreeToRadian> calculateDegreeToRadian(List<CmcDegreeToRadian> dataList) {
+        List<CmcDegreeToRadian> resultList = new ArrayList<>();
+        for (CmcDegreeToRadian item : dataList) {
+            try {
+                CmcDegreeToRadian result = calculateDegreeToRadianSingle(item);
+                resultList.add(result);
+            } catch (Exception e) {
+                e.printStackTrace();
+                // 计算失败时，返回带有错误信息的对象
+                CmcDegreeToRadian errorResult = new CmcDegreeToRadian();
+                errorResult.setPointNumber(item.getPointNumber());
+                errorResult.setLongitudeRadian(-1.0);
+                errorResult.setLatitudeRadian(-1.0);
+                resultList.add(errorResult);
+            }
+        }
+
+        return resultList;
+    }
+
+    /**
+     * 单条角度度转弧度计算（待实现）
+     */
+    private CmcDegreeToRadian calculateDegreeToRadianSingle(CmcDegreeToRadian cmcDegreeToRadian) {
+        double longitude = cmcDegreeToRadian.getLongitude();
+        double latitude = cmcDegreeToRadian.getLatitude();
+
+        // 转换为弧度
+        double longitudeRadian = Math.toRadians(longitude);
+        double latitudeRadian = Math.toRadians(latitude);
+        
+        cmcDegreeToRadian.setLongitudeRadian(longitudeRadian);
+        cmcDegreeToRadian.setLatitudeRadian(latitudeRadian);
+
+        return cmcDegreeToRadian;
+    }
+}

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

@@ -16,9 +16,15 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-// import com.ruoyi.web.calculate.mapper.CmcGaussPositiveMapper;
 import com.ruoyi.web.calculate.domain.CmcGaussBandChange;
 import com.ruoyi.web.calculate.service.ICmcGaussBandChangeService;
+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;
 
 /**
  * 高斯换带服务实现
@@ -53,6 +59,9 @@ public class CmcGaussBandChangeServiceImpl implements ICmcGaussBandChangeService
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult importExcelData(MultipartFile file) {
         try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
             // 使用若依的ExcelUtil工具类
             ExcelUtil<CmcGaussBandChange> util = new ExcelUtil<CmcGaussBandChange>(CmcGaussBandChange.class);
             List<CmcGaussBandChange> dataList = util.importExcel(file.getInputStream());
@@ -62,54 +71,17 @@ public class CmcGaussBandChangeServiceImpl implements ICmcGaussBandChangeService
                 return AjaxResult.error("Excel文件中没有数据！");
             }
 
-            // 验证数据并转换为前端需要的格式
-            List<Map<String, Object>> validData = new ArrayList<>();
-            int successCount = 0;
-            StringBuilder errorMsg = new StringBuilder();
-
-            for (int i = 0; i < dataList.size(); i++) {
-                CmcGaussBandChange item = dataList.get(i);
-
-                try {
-                    // 转换为前端需要的Map格式
-                    Map<String, Object> rowMap = new HashMap<>();
-                    rowMap.put("pointNumber", item.getPointNumber());
-                    rowMap.put("coordinateSystem", item.getCoordinateSystem());
-                    rowMap.put("gaussX", item.getGaussX());
-                    rowMap.put("gaussY", item.getGaussY());
-                    rowMap.put("band", item.getBand());
-                    rowMap.put("bandWidth", item.getBandwidth());
-                    rowMap.put("newBand", item.getNewBand());
-                    rowMap.put("newBandWidth", item.getNewBandwidth());
-                    rowMap.put("longitudePosition", item.getLongitudePosition());
-                    rowMap.put("latitudePosition", item.getLatitudePosition());
-                    rowMap.put("projectionHeight", item.getProjectionHeight());
-                    rowMap.put("rowNum", i + 2); // Excel中的行号
-
-                    validData.add(rowMap);
-                    successCount++;
-
-                } catch (Exception e) {
-                    errorMsg.append(String.format("第%d行数据验证失败：%s；", i + 2, e.getMessage()));
-                }
-            }
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
 
             // 构建返回结果
             Map<String, Object> result = new HashMap<>();
             result.put("total", dataList.size());
-            result.put("validCount", successCount);
-            result.put("data", validData);
-
-            if (successCount == 0) {
-                return AjaxResult.error("没有有效数据！" + errorMsg.toString());
-            }
-
-            String message = String.format("导入成功！共解析%d条数据，有效数据%d条", dataList.size(), successCount);
-            if (errorMsg.length() > 0) {
-                message += "；部分数据验证失败：" + errorMsg.toString();
-                return AjaxResult.success(message, result);
-            }
+            result.put("validCount", dataList.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
 
+            String message = String.format("导入成功！共解析%d条数据", dataList.size());
             return AjaxResult.success(message, result);
 
         } catch (Exception e) {
@@ -117,6 +89,123 @@ public class CmcGaussBandChangeServiceImpl implements ICmcGaussBandChangeService
             return AjaxResult.error("导入失败：" + e.getMessage());
         }
     }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                for (int i = 0; i < headerRow.getPhysicalNumberOfCells(); i++) {
+                    Cell cell = headerRow.getCell(i);
+                    if (cell != null) {
+                        String cellValue = cell.getStringCellValue();
+                        if (cellValue != null && !cellValue.trim().isEmpty()) {
+                            columns.add(cellValue.trim());
+                        }
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                for (int j = 0; j < columns.size(); j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
 
     /**
      * 执行高斯反算

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

@@ -16,9 +16,15 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-// import com.ruoyi.web.calculate.mapper.CmcGaussPositiveMapper;
 import com.ruoyi.web.calculate.domain.CmcGaussNegative;
 import com.ruoyi.web.calculate.service.ICmcGaussNegativeService;
+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;
 
 /**
  * 高斯反算服务实现
@@ -53,6 +59,9 @@ public class CmcGaussNegativeServiceImpl implements ICmcGaussNegativeService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult importExcelData(MultipartFile file) {
         try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
             // 使用若依的ExcelUtil工具类
             ExcelUtil<CmcGaussNegative> util = new ExcelUtil<CmcGaussNegative>(CmcGaussNegative.class);
             List<CmcGaussNegative> dataList = util.importExcel(file.getInputStream());
@@ -62,50 +71,17 @@ public class CmcGaussNegativeServiceImpl implements ICmcGaussNegativeService {
                 return AjaxResult.error("Excel文件中没有数据！");
             }
 
-            // 验证数据并转换为前端需要的格式
-            List<Map<String, Object>> validData = new ArrayList<>();
-            int successCount = 0;
-            StringBuilder errorMsg = new StringBuilder();
-
-            for (int i = 0; i < dataList.size(); i++) {
-                CmcGaussNegative item = dataList.get(i);
-
-                try {
-                    // 转换为前端需要的Map格式
-                    Map<String, Object> rowMap = new HashMap<>();
-                    rowMap.put("pointNumber", item.getPointNumber());
-                    rowMap.put("coordinateSystem", item.getCoordinateSystem());
-                    rowMap.put("gaussX", item.getGaussX());
-                    rowMap.put("gaussY", item.getGaussY());
-                    rowMap.put("longitudePosition", item.getLongitudePosition());
-                    rowMap.put("latitudePosition", item.getLatitudePosition());
-                    rowMap.put("projectionHeight", item.getProjectionHeight());
-                    rowMap.put("rowNum", i + 2); // Excel中的行号
-
-                    validData.add(rowMap);
-                    successCount++;
-
-                } catch (Exception e) {
-                    errorMsg.append(String.format("第%d行数据验证失败：%s；", i + 2, e.getMessage()));
-                }
-            }
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
 
             // 构建返回结果
             Map<String, Object> result = new HashMap<>();
             result.put("total", dataList.size());
-            result.put("validCount", successCount);
-            result.put("data", validData);
-
-            if (successCount == 0) {
-                return AjaxResult.error("没有有效数据！" + errorMsg.toString());
-            }
-
-            String message = String.format("导入成功！共解析%d条数据，有效数据%d条", dataList.size(), successCount);
-            if (errorMsg.length() > 0) {
-                message += "；部分数据验证失败：" + errorMsg.toString();
-                return AjaxResult.success(message, result);
-            }
+            result.put("validCount", dataList.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
 
+            String message = String.format("导入成功！共解析%d条数据", dataList.size());
             return AjaxResult.success(message, result);
 
         } catch (Exception e) {
@@ -113,6 +89,123 @@ public class CmcGaussNegativeServiceImpl implements ICmcGaussNegativeService {
             return AjaxResult.error("导入失败：" + e.getMessage());
         }
     }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                for (int i = 0; i < headerRow.getPhysicalNumberOfCells(); i++) {
+                    Cell cell = headerRow.getCell(i);
+                    if (cell != null) {
+                        String cellValue = cell.getStringCellValue();
+                        if (cellValue != null && !cellValue.trim().isEmpty()) {
+                            columns.add(cellValue.trim());
+                        }
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                for (int j = 0; j < columns.size(); j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
 
     /**
      * 执行高斯反算
@@ -151,8 +244,8 @@ public class CmcGaussNegativeServiceImpl implements ICmcGaussNegativeService {
             String latitudePosition = cmcGaussNegative.getLatitudePosition(); // 纬度位置（北/南）
             double projectionHeight = cmcGaussNegative.getProjectionHeight(); // 投影面高程
             String yStr = String.valueOf(Math.abs((long) gaussY));
-            int band = Integer.parseInt(yStr.substring(0, 2));
-            int bandwidth = band > 30 ? 3 : 6;
+            int band = cmcGaussNegative.getBand();
+            int bandwidth = cmcGaussNegative.getBandwidth();
 
             double x = latitudePosition.equals("S") ? 10000000 - gaussX : gaussX;
             double y = gaussY > 1.0E+7 ? gaussY - (int) Math.floor(gaussY / 1.0E+6) * 1.0E+6 - 500000 : gaussY - 500000;

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

@@ -7,8 +7,6 @@ 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;
@@ -19,6 +17,13 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 // import com.ruoyi.web.calculate.mapper.CmcGaussPositiveMapper;
 import com.ruoyi.web.calculate.domain.CmcGaussPositive;
 import com.ruoyi.web.calculate.service.ICmcGaussPositiveService;
+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;
 
 /**
  * 高斯正算服务实现
@@ -56,6 +61,9 @@ public class CmcGaussPositiveServiceImpl implements ICmcGaussPositiveService
     public AjaxResult importExcelData(MultipartFile file)
     {
         try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
             // 使用若依的ExcelUtil工具类
             ExcelUtil<CmcGaussPositive> util = new ExcelUtil<CmcGaussPositive>(CmcGaussPositive.class);
             List<CmcGaussPositive> dataList = util.importExcel(file.getInputStream());
@@ -65,52 +73,17 @@ public class CmcGaussPositiveServiceImpl implements ICmcGaussPositiveService
                 return AjaxResult.error("Excel文件中没有数据！");
             }
 
-            // 验证数据并转换为前端需要的格式
-            List<Map<String, Object>> validData = new ArrayList<>();
-            int successCount = 0;
-            StringBuilder errorMsg = new StringBuilder();
-
-            for (int i = 0; i < dataList.size(); i++) {
-                CmcGaussPositive item = dataList.get(i);
-
-                try {
-                    // 转换为前端需要的Map格式
-                    Map<String, Object> rowMap = new HashMap<>();
-                    rowMap.put("pointNumber", item.getPointNumber());
-                    rowMap.put("coordinateSystem", item.getCoordinateSystem());
-                    rowMap.put("longitude", item.getLongitude());
-                    rowMap.put("longitudePosition", item.getLongitudePosition());
-                    rowMap.put("latitude", item.getLatitude());
-                    rowMap.put("latitudePosition", item.getLatitudePosition());
-                    rowMap.put("band", item.getBand());
-                    rowMap.put("bandwidth", item.getBandwidth());
-                    rowMap.put("projectionHeight", item.getProjectionHeight());
-                    rowMap.put("rowNum", i + 2); // Excel中的行号
-
-                    validData.add(rowMap);
-                    successCount++;
-
-                } catch (Exception e) {
-                    errorMsg.append(String.format("第%d行数据验证失败：%s；", i + 2, e.getMessage()));
-                }
-            }
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
 
             // 构建返回结果
             Map<String, Object> result = new HashMap<>();
             result.put("total", dataList.size());
-            result.put("validCount", successCount);
-            result.put("data", validData);
-
-            if (successCount == 0) {
-                return AjaxResult.error("没有有效数据！" + errorMsg.toString());
-            }
-
-            String message = String.format("导入成功！共解析%d条数据，有效数据%d条", dataList.size(), successCount);
-            if (errorMsg.length() > 0) {
-                message += "；部分数据验证失败：" + errorMsg.toString();
-                return AjaxResult.success(message, result);
-            }
+            result.put("validCount", dataList.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
 
+            String message = String.format("导入成功！共解析%d条数据", dataList.size());
             return AjaxResult.success(message, result);
 
         } catch (Exception e) {
@@ -118,6 +91,123 @@ public class CmcGaussPositiveServiceImpl implements ICmcGaussPositiveService
             return AjaxResult.error("导入失败：" + e.getMessage());
         }
     }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                for (int j = 0; j < columns.size(); j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            org.apache.poi.ss.usermodel.Workbook workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(file.getInputStream());
+            org.apache.poi.ss.usermodel.Sheet sheet = workbook.getSheetAt(0);
+            org.apache.poi.ss.usermodel.Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                for (int i = 0; i < headerRow.getPhysicalNumberOfCells(); i++) {
+                    org.apache.poi.ss.usermodel.Cell cell = headerRow.getCell(i);
+                    if (cell != null) {
+                        String cellValue = cell.getStringCellValue();
+                        if (cellValue != null && !cellValue.trim().isEmpty()) {
+                            columns.add(cellValue.trim());
+                        }
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
 
     /**
      * 执行高斯正算

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

@@ -18,6 +18,13 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.calculate.domain.CmcGeodeticToSpatial;
 import com.ruoyi.web.calculate.service.ICmcGeodeticToSpatialService;
+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;
 
 /**
  * 大地坐标转空间直角坐标服务实现
@@ -52,59 +59,25 @@ public class CmcGeodeticToSpatialServiceImpl implements ICmcGeodeticToSpatialSer
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult importExcelData(MultipartFile file) {
         try {
-            // 使用若依的ExcelUtil工具类
-            ExcelUtil<CmcGeodeticToSpatial> util = new ExcelUtil<CmcGeodeticToSpatial>(CmcGeodeticToSpatial.class);
-            List<CmcGeodeticToSpatial> dataList = util.importExcel(file.getInputStream());
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
 
             // 检查是否有数据
-            if (dataList == null || dataList.isEmpty()) {
+            if (rawData == null || rawData.isEmpty()) {
                 return AjaxResult.error("Excel文件中没有数据！");
             }
 
-            // 验证数据并转换为前端需要的格式
-            List<Map<String, Object>> validData = new ArrayList<>();
-            int successCount = 0;
-            StringBuilder errorMsg = new StringBuilder();
-
-            for (int i = 0; i < dataList.size(); i++) {
-                CmcGeodeticToSpatial item = dataList.get(i);
-
-                try {
-                    // 转换为前端需要的Map格式
-                    Map<String, Object> rowMap = new HashMap<>();
-                    rowMap.put("pointNumber", item.getPointNumber());
-                    rowMap.put("coordinateSystem", item.getCoordinateSystem());
-                    rowMap.put("longitude", item.getLongitude());
-                    rowMap.put("longitudePosition", item.getLongitudePosition());
-                    rowMap.put("latitude", item.getLatitude());
-                    rowMap.put("latitudePosition", item.getLatitudePosition());
-                    rowMap.put("height", item.getHeight());
-                    rowMap.put("rowNum", i + 2); // Excel中的行号
-
-                    validData.add(rowMap);
-                    successCount++;
-
-                } catch (Exception e) {
-                    errorMsg.append(String.format("第%d行数据验证失败：%s；", i + 2, e.getMessage()));
-                }
-            }
-
             // 构建返回结果
             Map<String, Object> result = new HashMap<>();
-            result.put("total", dataList.size());
-            result.put("validCount", successCount);
-            result.put("data", validData);
-
-            if (successCount == 0) {
-                return AjaxResult.error("没有有效数据！" + errorMsg.toString());
-            }
-
-            String message = String.format("导入成功！共解析%d条数据，有效数据%d条", dataList.size(), successCount);
-            if (errorMsg.length() > 0) {
-                message += "；部分数据验证失败：" + errorMsg.toString();
-                return AjaxResult.success(message, result);
-            }
+            result.put("total", rawData.size());
+            result.put("validCount", rawData.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
 
+            String message = String.format("导入成功！共解析%d条数据", rawData.size());
             return AjaxResult.success(message, result);
 
         } catch (Exception e) {
@@ -112,6 +85,165 @@ public class CmcGeodeticToSpatialServiceImpl implements ICmcGeodeticToSpatialSer
             return AjaxResult.error("导入失败：" + e.getMessage());
         }
     }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                int lastCellNum = headerRow.getLastCellNum();
+                for (int i = 0; i < lastCellNum; i++) {
+                    Cell cell = headerRow.getCell(i);
+                    String cellValue = null;
+                    if (cell != null) {
+                        cellValue = getCellStringValue(cell);
+                    }
+                    if (cellValue != null && !cellValue.trim().isEmpty()) {
+                        columns.add(cellValue.trim());
+                    } else {
+                        columns.add("列" + (i + 1));
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 获取单元格的字符串值（处理多种类型）
+     */
+    private String getCellStringValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue().toString();
+                } else {
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return String.valueOf((long) value);
+                    }
+                    return String.valueOf(value);
+                }
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    try {
+                        return String.valueOf(cell.getNumericCellValue());
+                    } catch (Exception ex) {
+                        return cell.getCellFormula();
+                    }
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                int lastCellNum = Math.min(row.getLastCellNum(), columns.size());
+                for (int j = 0; j < lastCellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
 
     /**
      * 执行大地坐标转空间直角坐标计算

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

@@ -18,6 +18,13 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.calculate.domain.CmcSpatialToGeodetic;
 import com.ruoyi.web.calculate.service.ICmcSpatialToGeodeticService;
+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;
 
 /**
  * 空间直角坐标转大地坐标服务实现
@@ -52,57 +59,25 @@ public class CmcSpatialToGeodeticServiceImpl implements ICmcSpatialToGeodeticSer
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult importExcelData(MultipartFile file) {
         try {
-            // 使用若依的ExcelUtil工具类
-            ExcelUtil<CmcSpatialToGeodetic> util = new ExcelUtil<CmcSpatialToGeodetic>(CmcSpatialToGeodetic.class);
-            List<CmcSpatialToGeodetic> dataList = util.importExcel(file.getInputStream());
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
 
             // 检查是否有数据
-            if (dataList == null || dataList.isEmpty()) {
+            if (rawData == null || rawData.isEmpty()) {
                 return AjaxResult.error("Excel文件中没有数据！");
             }
 
-            // 验证数据并转换为前端需要的格式
-            List<Map<String, Object>> validData = new ArrayList<>();
-            int successCount = 0;
-            StringBuilder errorMsg = new StringBuilder();
-
-            for (int i = 0; i < dataList.size(); i++) {
-                CmcSpatialToGeodetic item = dataList.get(i);
-
-                try {
-                    // 转换为前端需要的Map格式
-                    Map<String, Object> rowMap = new HashMap<>();
-                    rowMap.put("pointNumber", item.getPointNumber());
-                    rowMap.put("coordinateSystem", item.getCoordinateSystem());
-                    rowMap.put("spatialX", item.getSpatialX());
-                    rowMap.put("spatialY", item.getSpatialY());
-                    rowMap.put("spatialZ", item.getSpatialZ());
-                    rowMap.put("rowNum", i + 2); // Excel中的行号
-
-                    validData.add(rowMap);
-                    successCount++;
-
-                } catch (Exception e) {
-                    errorMsg.append(String.format("第%d行数据验证失败：%s；", i + 2, e.getMessage()));
-                }
-            }
-
             // 构建返回结果
             Map<String, Object> result = new HashMap<>();
-            result.put("total", dataList.size());
-            result.put("validCount", successCount);
-            result.put("data", validData);
-
-            if (successCount == 0) {
-                return AjaxResult.error("没有有效数据！" + errorMsg.toString());
-            }
-
-            String message = String.format("导入成功！共解析%d条数据，有效数据%d条", dataList.size(), successCount);
-            if (errorMsg.length() > 0) {
-                message += "；部分数据验证失败：" + errorMsg.toString();
-                return AjaxResult.success(message, result);
-            }
+            result.put("total", rawData.size());
+            result.put("validCount", rawData.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
 
+            String message = String.format("导入成功！共解析%d条数据", rawData.size());
             return AjaxResult.success(message, result);
 
         } catch (Exception e) {
@@ -110,6 +85,165 @@ public class CmcSpatialToGeodeticServiceImpl implements ICmcSpatialToGeodeticSer
             return AjaxResult.error("导入失败：" + e.getMessage());
         }
     }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                int lastCellNum = headerRow.getLastCellNum();
+                for (int i = 0; i < lastCellNum; i++) {
+                    Cell cell = headerRow.getCell(i);
+                    String cellValue = null;
+                    if (cell != null) {
+                        cellValue = getCellStringValue(cell);
+                    }
+                    if (cellValue != null && !cellValue.trim().isEmpty()) {
+                        columns.add(cellValue.trim());
+                    } else {
+                        columns.add("列" + (i + 1));
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 获取单元格的字符串值（处理多种类型）
+     */
+    private String getCellStringValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue().toString();
+                } else {
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return String.valueOf((long) value);
+                    }
+                    return String.valueOf(value);
+                }
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    try {
+                        return String.valueOf(cell.getNumericCellValue());
+                    } catch (Exception ex) {
+                        return cell.getCellFormula();
+                    }
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                int lastCellNum = Math.min(row.getLastCellNum(), columns.size());
+                for (int j = 0; j < lastCellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
 
     /**
      * 执行空间直角坐标转大地坐标计算
@@ -177,7 +311,7 @@ public class CmcSpatialToGeodeticServiceImpl implements ICmcSpatialToGeodeticSer
                            Math.floor(((B * 60 - Math.floor(B * 60)) * 60 + Math.pow(10, -11)) * Math.pow(10, 6))
                         / Math.pow(10, 10);
         String longitudePosition = spatialY < 0 ? "W" : "E";
-        String latitudePosition = spatialX < 0 ? "S" : "N";
+        String latitudePosition = spatialZ < 0 ? "S" : "N";
         double height = Math.sqrt(Math.pow(spatialX, 2) + Math.pow(spatialY, 2) + Math.pow(spatialZ + t, 2)) - N;
         cmcSpatialToGeodetic.setLongitude(longitude);
         cmcSpatialToGeodetic.setLatitude(latitude);

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

@@ -18,6 +18,13 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.calculate.domain.CmcUTMBandChange;
 import com.ruoyi.web.calculate.service.ICmcUTMBandChangeService;
+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;
 
 /**
  * UTM换带服务实现
@@ -50,8 +57,12 @@ public class CmcUTMBandChangeServicelmpl implements ICmcUTMBandChangeService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult importExcelData(MultipartFile file) {
+    public AjaxResult importExcelData(MultipartFile file)
+    {
         try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
             // 使用若依的ExcelUtil工具类
             ExcelUtil<CmcUTMBandChange> util = new ExcelUtil<CmcUTMBandChange>(CmcUTMBandChange.class);
             List<CmcUTMBandChange> dataList = util.importExcel(file.getInputStream());
@@ -61,52 +72,17 @@ public class CmcUTMBandChangeServicelmpl implements ICmcUTMBandChangeService {
                 return AjaxResult.error("Excel文件中没有数据！");
             }
 
-            // 验证数据并转换为前端需要的格式
-            List<Map<String, Object>> validData = new ArrayList<>();
-            int successCount = 0;
-            StringBuilder errorMsg = new StringBuilder();
-
-            for (int i = 0; i < dataList.size(); i++) {
-                CmcUTMBandChange item = dataList.get(i);
-
-                try {
-                    // 转换为前端需要的Map格式
-                    Map<String, Object> rowMap = new HashMap<>();
-                    rowMap.put("pointNumber", item.getPointNumber());
-                    rowMap.put("coordinateSystem", item.getCoordinateSystem());
-                    rowMap.put("utmX", item.getUtmX());
-                    rowMap.put("utmY", item.getUtmY());
-                    rowMap.put("band", item.getBand());
-                    rowMap.put("newBand", item.getNewBand());
-                    rowMap.put("longitudePosition", item.getLongitudePosition());
-                    rowMap.put("latitudePosition", item.getLatitudePosition());
-                    rowMap.put("projectionHeight", item.getProjectionHeight());
-                    rowMap.put("rowNum", i + 2); // Excel中的行号
-
-                    validData.add(rowMap);
-                    successCount++;
-
-                } catch (Exception e) {
-                    errorMsg.append(String.format("第%d行数据验证失败：%s；", i + 2, e.getMessage()));
-                }
-            }
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
 
             // 构建返回结果
             Map<String, Object> result = new HashMap<>();
             result.put("total", dataList.size());
-            result.put("validCount", successCount);
-            result.put("data", validData);
-
-            if (successCount == 0) {
-                return AjaxResult.error("没有有效数据！" + errorMsg.toString());
-            }
-
-            String message = String.format("导入成功！共解析%d条数据，有效数据%d条", dataList.size(), successCount);
-            if (errorMsg.length() > 0) {
-                message += "；部分数据验证失败：" + errorMsg.toString();
-                return AjaxResult.success(message, result);
-            }
+            result.put("validCount", dataList.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
 
+            String message = String.format("导入成功！共解析%d条数据", dataList.size());
             return AjaxResult.success(message, result);
 
         } catch (Exception e) {
@@ -114,6 +90,165 @@ public class CmcUTMBandChangeServicelmpl implements ICmcUTMBandChangeService {
             return AjaxResult.error("导入失败：" + e.getMessage());
         }
     }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            org.apache.poi.ss.usermodel.Workbook workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(file.getInputStream());
+            org.apache.poi.ss.usermodel.Sheet sheet = workbook.getSheetAt(0);
+            org.apache.poi.ss.usermodel.Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                int lastCellNum = headerRow.getLastCellNum();
+                for (int i = 0; i < lastCellNum; i++) {
+                    org.apache.poi.ss.usermodel.Cell cell = headerRow.getCell(i);
+                    String cellValue = null;
+                    if (cell != null) {
+                        cellValue = getCellStringValue(cell);
+                    }
+                    if (cellValue != null && !cellValue.trim().isEmpty()) {
+                        columns.add(cellValue.trim());
+                    } else {
+                        columns.add("列" + (i + 1));
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 获取单元格的字符串值（处理多种类型）
+     */
+    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:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue().toString();
+                } else {
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return String.valueOf((long) value);
+                    }
+                    return String.valueOf(value);
+                }
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    try {
+                        return String.valueOf(cell.getNumericCellValue());
+                    } catch (Exception ex) {
+                        return cell.getCellFormula();
+                    }
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                int lastCellNum = Math.min(row.getLastCellNum(), columns.size());
+                for (int j = 0; j < lastCellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
 
     /**
      * 执行UTM换带计算

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

@@ -16,6 +16,13 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.calculate.domain.CmcUTMNegative;
 import com.ruoyi.web.calculate.service.ICmcUTMNegativeService;
+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;
 
 /**
  * UTM反算服务实现
@@ -54,6 +61,9 @@ public class CmcUTMNegativeServiceImpl implements ICmcUTMNegativeService
     public AjaxResult importExcelData(MultipartFile file)
     {
         try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
             // 使用若依的ExcelUtil工具类
             ExcelUtil<CmcUTMNegative> util = new ExcelUtil<CmcUTMNegative>(CmcUTMNegative.class);
             List<CmcUTMNegative> dataList = util.importExcel(file.getInputStream());
@@ -63,51 +73,17 @@ public class CmcUTMNegativeServiceImpl implements ICmcUTMNegativeService
                 return AjaxResult.error("Excel文件中没有数据！");
             }
 
-            // 验证数据并转换为前端需要的格式
-            List<Map<String, Object>> validData = new ArrayList<>();
-            int successCount = 0;
-            StringBuilder errorMsg = new StringBuilder();
-
-            for (int i = 0; i < dataList.size(); i++) {
-                CmcUTMNegative item = dataList.get(i);
-
-                try {
-                    // 转换为前端需要的Map格式
-                    Map<String, Object> rowMap = new HashMap<>();
-                    rowMap.put("pointNumber", item.getPointNumber());
-                    rowMap.put("coordinateSystem", item.getCoordinateSystem());
-                    rowMap.put("utmX", item.getUtmX());
-                    rowMap.put("utmY", item.getUtmY());
-                    rowMap.put("band", item.getBand());
-                    rowMap.put("projectionHeight", item.getProjectionHeight());
-                    rowMap.put("longitudePosition", item.getLongitudePosition());
-                    rowMap.put("latitudePosition", item.getLatitudePosition());
-                    rowMap.put("rowNum", i + 2); // Excel中的行号
-
-                    validData.add(rowMap); 
-                    successCount++;
-
-                } catch (Exception e) {
-                    errorMsg.append(String.format("第%d行数据验证失败：%s；", i + 2, e.getMessage()));
-                }
-            }
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
 
             // 构建返回结果
             Map<String, Object> result = new HashMap<>();
             result.put("total", dataList.size());
-            result.put("validCount", successCount);
-            result.put("data", validData);
-
-            if (successCount == 0) {
-                return AjaxResult.error("没有有效数据！" + errorMsg.toString());
-            }
-
-            String message = String.format("导入成功！共解析%d条数据，有效数据%d条", dataList.size(), successCount);
-            if (errorMsg.length() > 0) {
-                message += "；部分数据验证失败：" + errorMsg.toString();
-                return AjaxResult.success(message, result);
-            }
+            result.put("validCount", dataList.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
 
+            String message = String.format("导入成功！共解析%d条数据", dataList.size());
             return AjaxResult.success(message, result);
 
         } catch (Exception e) {
@@ -115,6 +91,165 @@ public class CmcUTMNegativeServiceImpl implements ICmcUTMNegativeService
             return AjaxResult.error("导入失败：" + e.getMessage());
         }
     }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            org.apache.poi.ss.usermodel.Workbook workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(file.getInputStream());
+            org.apache.poi.ss.usermodel.Sheet sheet = workbook.getSheetAt(0);
+            org.apache.poi.ss.usermodel.Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                int lastCellNum = headerRow.getLastCellNum();
+                for (int i = 0; i < lastCellNum; i++) {
+                    org.apache.poi.ss.usermodel.Cell cell = headerRow.getCell(i);
+                    String cellValue = null;
+                    if (cell != null) {
+                        cellValue = getCellStringValue(cell);
+                    }
+                    if (cellValue != null && !cellValue.trim().isEmpty()) {
+                        columns.add(cellValue.trim());
+                    } else {
+                        columns.add("列" + (i + 1));
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 获取单元格的字符串值（处理多种类型）
+     */
+    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:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue().toString();
+                } else {
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return String.valueOf((long) value);
+                    }
+                    return String.valueOf(value);
+                }
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    try {
+                        return String.valueOf(cell.getNumericCellValue());
+                    } catch (Exception ex) {
+                        return cell.getCellFormula();
+                    }
+                }
+            default:
+                return null;
+        }
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                int lastCellNum = Math.min(row.getLastCellNum(), columns.size());
+                for (int j = 0; j < lastCellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
 
     /**
      * 执行UTM反算

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

@@ -18,6 +18,13 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.calculate.domain.CmcUTMPositive;
 import com.ruoyi.web.calculate.service.ICmcUTMPositiveService;
+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;
 
 /**
  * UTM正算服务实现
@@ -55,6 +62,9 @@ public class CmcUTMPositiveServiceImpl implements ICmcUTMPositiveService
     public AjaxResult importExcelData(MultipartFile file)
     {
         try {
+            // 获取Excel表头信息
+            List<String> excelColumns = getExcelColumns(file);
+
             // 使用若依的ExcelUtil工具类
             ExcelUtil<CmcUTMPositive> util = new ExcelUtil<CmcUTMPositive>(CmcUTMPositive.class);
             List<CmcUTMPositive> dataList = util.importExcel(file.getInputStream());
@@ -64,51 +74,17 @@ public class CmcUTMPositiveServiceImpl implements ICmcUTMPositiveService
                 return AjaxResult.error("Excel文件中没有数据！");
             }
 
-            // 验证数据并转换为前端需要的格式
-            List<Map<String, Object>> validData = new ArrayList<>();
-            int successCount = 0;
-            StringBuilder errorMsg = new StringBuilder();
-
-            for (int i = 0; i < dataList.size(); i++) {
-                CmcUTMPositive item = dataList.get(i);
-
-                try {
-                    // 转换为前端需要的Map格式
-                    Map<String, Object> rowMap = new HashMap<>();
-                    rowMap.put("pointNumber", item.getPointNumber());
-                    rowMap.put("coordinateSystem", item.getCoordinateSystem());
-                    rowMap.put("longitude", item.getLongitude());
-                    rowMap.put("longitudePosition", item.getLongitudePosition());
-                    rowMap.put("latitude", item.getLatitude());
-                    rowMap.put("latitudePosition", item.getLatitudePosition());
-                    rowMap.put("band", item.getBand());
-                    rowMap.put("projectionHeight", item.getProjectionHeight());
-                    rowMap.put("rowNum", i + 2); // Excel中的行号
-
-                    validData.add(rowMap);
-                    successCount++;
-
-                } catch (Exception e) {
-                    errorMsg.append(String.format("第%d行数据验证失败：%s；", i + 2, e.getMessage()));
-                }
-            }
+            // 返回原始Excel数据格式（使用表头作为key）
+            List<Map<String, Object>> rawData = readRawExcelData(file, excelColumns);
 
             // 构建返回结果
             Map<String, Object> result = new HashMap<>();
             result.put("total", dataList.size());
-            result.put("validCount", successCount);
-            result.put("data", validData);
-
-            if (successCount == 0) {
-                return AjaxResult.error("没有有效数据！" + errorMsg.toString());
-            }
-
-            String message = String.format("导入成功！共解析%d条数据，有效数据%d条", dataList.size(), successCount);
-            if (errorMsg.length() > 0) {
-                message += "；部分数据验证失败：" + errorMsg.toString();
-                return AjaxResult.success(message, result);
-            }
+            result.put("validCount", dataList.size());
+            result.put("data", rawData);
+            result.put("columns", excelColumns); // 返回Excel表头
 
+            String message = String.format("导入成功！共解析%d条数据", dataList.size());
             return AjaxResult.success(message, result);
 
         } catch (Exception e) {
@@ -116,6 +92,123 @@ public class CmcUTMPositiveServiceImpl implements ICmcUTMPositiveService
             return AjaxResult.error("导入失败：" + e.getMessage());
         }
     }
+    
+    /**
+     * 获取Excel表头信息
+     */
+    private List<String> getExcelColumns(MultipartFile file) {
+        List<String> columns = new ArrayList<>();
+        try {
+            org.apache.poi.ss.usermodel.Workbook workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(file.getInputStream());
+            org.apache.poi.ss.usermodel.Sheet sheet = workbook.getSheetAt(0);
+            org.apache.poi.ss.usermodel.Row headerRow = sheet.getRow(0); // 第一行为表头
+            
+            if (headerRow != null) {
+                for (int i = 0; i < headerRow.getPhysicalNumberOfCells(); i++) {
+                    org.apache.poi.ss.usermodel.Cell cell = headerRow.getCell(i);
+                    if (cell != null) {
+                        String cellValue = cell.getStringCellValue();
+                        if (cellValue != null && !cellValue.trim().isEmpty()) {
+                            columns.add(cellValue.trim());
+                        }
+                    }
+                }
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return columns;
+    }
+    
+    /**
+     * 读取原始Excel数据（使用表头作为key）
+     */
+    private List<Map<String, Object>> readRawExcelData(MultipartFile file, List<String> columns) {
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            
+            // 从第二行开始读取数据（第一行为表头）
+            for (int i = 1; i <= rows; i++) {
+                Row row = sheet.getRow(i);
+                if (row == null || isRowEmpty(row)) {
+                    continue;
+                }
+                
+                Map<String, Object> rowMap = new HashMap<>();
+                for (int j = 0; j < columns.size(); j++) {
+                    Cell cell = row.getCell(j);
+                    Object value = getCellValue(cell);
+                    rowMap.put(columns.get(j), value);
+                }
+                dataList.add(rowMap);
+            }
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dataList;
+    }
+    
+    /**
+     * 判断行是否为空
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                // 使用getCellValue方法处理多种类型，避免数字类型调用getStringCellValue抛出异常
+                Object value = getCellValue(cell);
+                if (value != null) {
+                    String strValue = String.valueOf(value).trim();
+                    if (!strValue.isEmpty()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 获取单元格值
+     */
+    private Object getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue();
+            case NUMERIC:
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    return cell.getLocalDateTimeCellValue();
+                } else {
+                    // 避免科学计数法
+                    double value = cell.getNumericCellValue();
+                    if (value == Math.floor(value)) {
+                        return (long) value;
+                    }
+                    return value;
+                }
+            case BOOLEAN:
+                return cell.getBooleanCellValue();
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (Exception e) {
+                    return cell.getNumericCellValue();
+                }
+            default:
+                return null;
+        }
+    }
 
     /**
      * 执行UTM正算

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/vo/CmcGaussBandChangeTemplate.java

@@ -1,125 +0,0 @@
-package com.ruoyi.web.calculate.vo;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-
-public class CmcGaussBandChangeTemplate {
-
-    @Excel(name = "待求点")
-    private String pointNumber;
-
-    @Excel(name = "坐标系")
-    private String coordinateSystem;
-
-    @Excel(name = "高斯坐标x", cellType = ColumnType.NUMERIC)
-    private Double gaussX;
-
-    @Excel(name = "高斯坐标y", cellType = ColumnType.NUMERIC)
-    private Double gaussY;
-
-     /** 带号 */
-    @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
-
-    /** 带宽 */
-    @Excel(name = "带宽", cellType = ColumnType.NUMERIC)
-    private Integer bandwidth;
-
-    /** 新带号 */
-    @Excel(name = "新带号", cellType = ColumnType.NUMERIC)
-    private Integer newBand;
-
-    /** 新带宽 */
-    @Excel(name = "新带宽", cellType = ColumnType.NUMERIC)
-    private Integer newBandwidth;
-
-    @Excel(name = "经度位置")
-    private String longitudePosition;
-
-    @Excel(name = "纬度位置")
-    private String latitudePosition;
-
-    public void setPointNumber(String pointNumber) {
-        this.pointNumber = pointNumber;
-    }
-
-    public String getPointNumber() {
-        return pointNumber;
-    }
-
-    public void setCoordinateSystem(String coordinateSystem) {
-        this.coordinateSystem = coordinateSystem;
-    }
-
-    public String getCoordinateSystem() {
-        return coordinateSystem;
-    }
-
-    public void setGaussX(Double gaussX) {
-        this.gaussX = gaussX;
-    }
-
-    public Double getGaussX() {
-        return gaussX;
-    }
-
-    public void setGaussY(Double gaussY) {
-        this.gaussY = gaussY;
-    }
-
-    public Double getGaussY() {
-        return gaussY;
-    }
-
-    public void setBand(Integer band) {
-        this.band = band;
-    }
-
-    public Integer getBand() {
-        return band;
-    }
-    
-    public void setBandwidth(Integer bandwidth) {
-        this.bandwidth = bandwidth;
-    }
-
-    public Integer getBandwidth() {
-        return bandwidth;
-    }
-    
-    public void setNewBand(Integer newBand) {
-        this.newBand = newBand;
-    }
-
-    public Integer getNewBand() {
-        return newBand;
-    }
-    
-    public void setNewBandwidth(Integer newBandwidth) {
-        this.newBandwidth = newBandwidth;
-    }
-
-    public Integer getNewBandwidth() {
-        return newBandwidth;
-    }
-
-    public void setLongitudePosition(String longitudePosition) {
-        this.longitudePosition = longitudePosition;
-    }
-
-    public String getLongitudePosition() {
-        return longitudePosition;
-    }
-
-    public void setLatitudePosition(String latitudePosition) {
-        this.latitudePosition = latitudePosition;
-    }
-
-    public String getLatitudePosition() {
-        return latitudePosition;
-    }
-
-}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/vo/CmcGaussNegativeTemplate.java

@@ -1,76 +0,0 @@
-package com.ruoyi.web.calculate.vo;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-
-public class CmcGaussNegativeTemplate {
-
-    @Excel(name = "待求点")
-    private String pointNumber;
-
-    @Excel(name = "坐标系")
-    private String coordinateSystem;
-
-    @Excel(name = "高斯坐标x", cellType = ColumnType.NUMERIC)
-    private Double gaussX;
-
-    @Excel(name = "高斯坐标y", cellType = ColumnType.NUMERIC)
-    private Double gaussY;
-
-    @Excel(name = "经度位置")
-    private String longitudePosition;
-
-    @Excel(name = "纬度位置")
-    private String latitudePosition;
-
-    public void setPointNumber(String pointNumber) {
-        this.pointNumber = pointNumber;
-    }
-
-    public String getPointNumber() {
-        return pointNumber;
-    }
-
-    public void setCoordinateSystem(String coordinateSystem) {
-        this.coordinateSystem = coordinateSystem;
-    }
-
-    public String getCoordinateSystem() {
-        return coordinateSystem;
-    }
-
-    public void setGaussX(Double gaussX) {
-        this.gaussX = gaussX;
-    }
-
-    public Double getGaussX() {
-        return gaussX;
-    }
-
-    public void setGaussY(Double gaussY) {
-        this.gaussY = gaussY;
-    }
-
-    public Double getGaussY() {
-        return gaussY;
-    }
-    public void setLongitudePosition(String longitudePosition) {
-        this.longitudePosition = longitudePosition;
-    }
-
-    public String getLongitudePosition() {
-        return longitudePosition;
-    }
-
-    public void setLatitudePosition(String latitudePosition) {
-        this.latitudePosition = latitudePosition;
-    }
-
-    public String getLatitudePosition() {
-        return latitudePosition;
-    }
-
-}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/vo/CmcGaussPositiveTemplate.java

@@ -1,124 +0,0 @@
-package com.ruoyi.web.calculate.vo;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-
-public class CmcGaussPositiveTemplate {
-
-    @Excel(name = "待求点")
-    private String pointNumber;
-
-    @Excel(name = "坐标系")
-    private String coordinateSystem;
-
-    @Excel(name = "大地经度", cellType = ColumnType.NUMERIC)
-    private Double longitude;
-
-    @Excel(name = "经度位置")
-    private String longitudePosition;
-
-    @Excel(name = "大地纬度", cellType = ColumnType.NUMERIC)
-    private Double latitude;
-
-    @Excel(name = "纬度位置")
-    private String latitudePosition;
-
-    @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
-
-    @Excel(name = "带宽", cellType = ColumnType.NUMERIC)
-    private Integer bandwidth;
-
-    public void setPointNumber(String pointNumber) 
-    {
-        this.pointNumber = pointNumber;
-    }
-
-    public String getPointNumber() 
-    {
-        return pointNumber;
-    }
-    public void setCoordinateSystem(String coordinateSystem) 
-    {
-        this.coordinateSystem = coordinateSystem;
-    }
-
-    public String getCoordinateSystem() 
-    {
-        return coordinateSystem;
-    }
-     public void setLongitude(Double longitude) 
-    {
-        // 大地经度保留10位小数
-        if (longitude != null) {
-            BigDecimal bd = new BigDecimal(longitude);
-            this.longitude = bd.setScale(10, RoundingMode.HALF_UP).doubleValue();
-        } else {
-            this.longitude = null;
-        }
-    }
-
-    public Double getLongitude() 
-    {
-        return longitude;
-    }
-    
-    public void setLongitudePosition(String longitudePosition) 
-    {
-        this.longitudePosition = longitudePosition;
-    }
-
-    public String getLongitudePosition() 
-    {
-        return longitudePosition;
-    }
-    
-    public void setLatitude(Double latitude) 
-    {
-        // 大地纬度保留10位小数
-        if (latitude != null) {
-            BigDecimal bd = new BigDecimal(latitude);
-            this.latitude = bd.setScale(10, RoundingMode.HALF_UP).doubleValue();
-        } else {
-            this.latitude = null;
-        }
-    }
-
-    public Double getLatitude() 
-    {
-        return latitude;
-    }
-    
-    public void setLatitudePosition(String latitudePosition) 
-    {
-        this.latitudePosition = latitudePosition;
-    }
-
-    public String getLatitudePosition() 
-    {
-        return latitudePosition;
-    }
-    
-    public void setBand(Integer band) 
-    {
-        this.band = band;
-    }
-
-    public Integer getBand() 
-    {
-        return band;
-    }
-    
-    public void setBandwidth(Integer bandwidth) 
-    {
-        this.bandwidth = bandwidth;
-    }
-
-    public Integer getBandwidth() 
-    {
-        return bandwidth;
-    }
-}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/vo/CmcGeodeticToSpatialTemplate.java

@@ -1,88 +0,0 @@
-package com.ruoyi.web.calculate.vo;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-
-/**
- * 大地坐标转空间直角坐标模板
- */
-public class CmcGeodeticToSpatialTemplate {
-
-    @Excel(name = "待求点")
-    private String pointNumber;
-
-    @Excel(name = "坐标系")
-    private String coordinateSystem;
-
-    @Excel(name = "大地经度", cellType = ColumnType.NUMERIC)
-    private Double longitude;
-
-    @Excel(name = "经度位置")
-    private String longitudePosition;
-
-    @Excel(name = "大地纬度", cellType = ColumnType.NUMERIC)
-    private Double latitude;
-
-    @Excel(name = "纬度位置")
-    private String latitudePosition;
-
-    @Excel(name = "大地高", cellType = ColumnType.NUMERIC)
-    private Double height;
-
-    public void setPointNumber(String pointNumber) {
-        this.pointNumber = pointNumber;
-    }
-
-    public String getPointNumber() {
-        return pointNumber;
-    }
-
-    public void setCoordinateSystem(String coordinateSystem) {
-        this.coordinateSystem = coordinateSystem;
-    }
-
-    public String getCoordinateSystem() {
-        return coordinateSystem;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitudePosition(String longitudePosition) {
-        this.longitudePosition = longitudePosition;
-    }
-
-    public String getLongitudePosition() {
-        return longitudePosition;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitudePosition(String latitudePosition) {
-        this.latitudePosition = latitudePosition;
-    }
-
-    public String getLatitudePosition() {
-        return latitudePosition;
-    }
-
-    public void setHeight(Double height) {
-        this.height = height;
-    }
-
-    public Double getHeight() {
-        return height;
-    }
-
-}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/vo/CmcSpatialToGeodeticTemplate.java

@@ -1,66 +0,0 @@
-package com.ruoyi.web.calculate.vo;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-
-/**
- * 空间直角坐标转大地坐标模板
- */
-public class CmcSpatialToGeodeticTemplate {
-
-    @Excel(name = "待求点")
-    private String pointNumber;
-
-    @Excel(name = "坐标系")
-    private String coordinateSystem;
-
-    @Excel(name = "空间坐标X", cellType = ColumnType.NUMERIC)
-    private Double spatialX;
-
-    @Excel(name = "空间坐标Y", cellType = ColumnType.NUMERIC)
-    private Double spatialY;
-
-    @Excel(name = "空间坐标Z", cellType = ColumnType.NUMERIC)
-    private Double spatialZ;
-
-    public void setPointNumber(String pointNumber) {
-        this.pointNumber = pointNumber;
-    }
-
-    public String getPointNumber() {
-        return pointNumber;
-    }
-
-    public void setCoordinateSystem(String coordinateSystem) {
-        this.coordinateSystem = coordinateSystem;
-    }
-
-    public String getCoordinateSystem() {
-        return coordinateSystem;
-    }
-
-    public void setSpatialX(Double spatialX) {
-        this.spatialX = spatialX;
-    }
-
-    public Double getSpatialX() {
-        return spatialX;
-    }
-
-    public void setSpatialY(Double spatialY) {
-        this.spatialY = spatialY;
-    }
-
-    public Double getSpatialY() {
-        return spatialY;
-    }
-
-    public void setSpatialZ(Double spatialZ) {
-        this.spatialZ = spatialZ;
-    }
-
-    public Double getSpatialZ() {
-        return spatialZ;
-    }
-
-}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/vo/CmcUTMBandChangeTemplate.java

@@ -1,101 +0,0 @@
-package com.ruoyi.web.calculate.vo;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-
-public class CmcUTMBandChangeTemplate {
-
-    @Excel(name = "待求点")
-    private String pointNumber;
-
-    @Excel(name = "坐标系")
-    private String coordinateSystem;
-
-    @Excel(name = "UTM坐标x", cellType = ColumnType.NUMERIC)
-    private Double utmX;
-
-    @Excel(name = "UTM坐标y", cellType = ColumnType.NUMERIC)
-    private Double utmY;
-
-    /** 带号 */
-    @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
-
-    /** 新带号 */
-    @Excel(name = "新带号", cellType = ColumnType.NUMERIC)
-    private Integer newBand;
-
-    @Excel(name = "经度位置")
-    private String longitudePosition;
-
-    @Excel(name = "纬度位置")
-    private String latitudePosition;
-
-    public void setPointNumber(String pointNumber) {
-        this.pointNumber = pointNumber;
-    }
-
-    public String getPointNumber() {
-        return pointNumber;
-    }
-
-    public void setCoordinateSystem(String coordinateSystem) {
-        this.coordinateSystem = coordinateSystem;
-    }
-
-    public String getCoordinateSystem() {
-        return coordinateSystem;
-    }
-
-    public void setUtmX(Double utmX) {
-        this.utmX = utmX;
-    }
-
-    public Double getUtmX() {
-        return utmX;
-    }
-
-    public void setUtmY(Double utmY) {
-        this.utmY = utmY;
-    }
-
-    public Double getUtmY() {
-        return utmY;
-    }
-
-    public void setBand(Integer band) {
-        this.band = band;
-    }
-
-    public Integer getBand() {
-        return band;
-    }
-    
-    public void setNewBand(Integer newBand) {
-        this.newBand = newBand;
-    }
-
-    public Integer getNewBand() {
-        return newBand;
-    }
-
-    public void setLongitudePosition(String longitudePosition) {
-        this.longitudePosition = longitudePosition;
-    }
-
-    public String getLongitudePosition() {
-        return longitudePosition;
-    }
-
-    public void setLatitudePosition(String latitudePosition) {
-        this.latitudePosition = latitudePosition;
-    }
-
-    public String getLatitudePosition() {
-        return latitudePosition;
-    }
-
-}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/vo/CmcUTMNegativeTemplate.java

@@ -1,98 +0,0 @@
-package com.ruoyi.web.calculate.vo;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-
-public class CmcUTMNegativeTemplate {
-
-    @Excel(name = "待求点")
-    private String pointNumber;
-
-    @Excel(name = "坐标系")
-    private String coordinateSystem;
-
-    @Excel(name = "UTM坐标x", cellType = ColumnType.NUMERIC)
-    private Double utmX;
-
-    @Excel(name = "UTM坐标y", cellType = ColumnType.NUMERIC)
-    private Double utmY;
-
-    @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
-
-    @Excel(name = "经度位置")
-    private String longitudePosition;
-
-    @Excel(name = "纬度位置")
-    private String latitudePosition;
-
-    public void setPointNumber(String pointNumber) 
-    {
-        this.pointNumber = pointNumber;
-    }
-
-    public String getPointNumber() 
-    {
-        return pointNumber;
-    }
-    
-    public void setCoordinateSystem(String coordinateSystem) 
-    {
-        this.coordinateSystem = coordinateSystem;
-    }
-
-    public String getCoordinateSystem() 
-    {
-        return coordinateSystem;
-    }
-    
-    public void setUtmX(Double utmX) 
-    {
-        this.utmX = utmX;
-    }
-
-    public Double getUtmX() 
-    {
-        return utmX;
-    }
-    
-    public void setUtmY(Double utmY) 
-    {
-        this.utmY = utmY;
-    }
-
-    public Double getUtmY() 
-    {
-        return utmY;
-    }
-    
-    public void setBand(Integer band) 
-    {
-        this.band = band;
-    }
-
-    public Integer getBand() 
-    {
-        return band;
-    }
-    
-    public void setLongitudePosition(String longitudePosition) 
-    {
-        this.longitudePosition = longitudePosition;
-    }
-
-    public String getLongitudePosition() 
-    {
-        return longitudePosition;
-    }
-    
-    public void setLatitudePosition(String latitudePosition) 
-    {
-        this.latitudePosition = latitudePosition;
-    }
-
-    public String getLatitudePosition() 
-    {
-        return latitudePosition;
-    }
-}

oa-back/ruoyi-calculate/src/main/java/com/ruoyi/web/calculate/vo/CmcUTMPositiveTemplate.java

@@ -1,109 +0,0 @@
-package com.ruoyi.web.calculate.vo;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-
-public class CmcUTMPositiveTemplate {
-
-    @Excel(name = "待求点")
-    private String pointNumber;
-
-    @Excel(name = "坐标系")
-    private String coordinateSystem;
-
-    @Excel(name = "大地经度", cellType = ColumnType.NUMERIC)
-    private Double longitude;
-
-    @Excel(name = "经度位置")
-    private String longitudePosition;
-
-    @Excel(name = "大地纬度", cellType = ColumnType.NUMERIC)
-    private Double latitude;
-
-    @Excel(name = "纬度位置")
-    private String latitudePosition;
-
-    @Excel(name = "带号", cellType = ColumnType.NUMERIC)
-    private Integer band;
-
-    public void setPointNumber(String pointNumber) 
-    {
-        this.pointNumber = pointNumber;
-    }
-
-    public String getPointNumber() 
-    {
-        return pointNumber;
-    }
-    public void setCoordinateSystem(String coordinateSystem) 
-    {
-        this.coordinateSystem = coordinateSystem;
-    }
-
-    public String getCoordinateSystem() 
-    {
-        return coordinateSystem;
-    }
-     public void setLongitude(Double longitude) 
-    {
-        if (longitude != null) {
-            BigDecimal bd = new BigDecimal(longitude);
-            this.longitude = bd.setScale(10, RoundingMode.HALF_UP).doubleValue();
-        } else {
-            this.longitude = null;
-        }
-    }
-
-    public Double getLongitude() 
-    {
-        return longitude;
-    }
-    
-    public void setLongitudePosition(String longitudePosition) 
-    {
-        this.longitudePosition = longitudePosition;
-    }
-
-    public String getLongitudePosition() 
-    {
-        return longitudePosition;
-    }
-    
-    public void setLatitude(Double latitude) 
-    {
-        if (latitude != null) {
-            BigDecimal bd = new BigDecimal(latitude);
-            this.latitude = bd.setScale(10, RoundingMode.HALF_UP).doubleValue();
-        } else {
-            this.latitude = null;
-        }
-    }
-
-    public Double getLatitude() 
-    {
-        return latitude;
-    }
-    
-    public void setLatitudePosition(String latitudePosition) 
-    {
-        this.latitudePosition = latitudePosition;
-    }
-
-    public String getLatitudePosition() 
-    {
-        return latitudePosition;
-    }
-    
-    public void setBand(Integer band) 
-    {
-        this.band = band;
-    }
-
-    public Integer getBand() 
-    {
-        return band;
-    }
-}

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

@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+// 执行度分秒转度
+export function calculate(data) {
+    return request({
+        url: `/calculate/DMSToDegree/calculate`,
+        method: 'post',
+        data: data
+    })
+}
+
+// 导入 Excel
+export function importExcel(data) {
+    return request({
+        url: `/calculate/DMSToDegree/import`,
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        }
+    })
+}
+
+// 导出度分秒转度结果
+export function exportExcel(data) {
+    return request({
+        url: `/calculate/DMSToDegree/export`,
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}

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

@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+// 执行角度度分秒转换
+export function calculate(data) {
+    return request({
+        url: `/calculate/degreeToDMS/calculate`,
+        method: 'post',
+        data: data
+    })
+}
+
+// 导入 Excel
+export function importExcel(data) {
+    return request({
+        url: `/calculate/degreeToDMS/import`,
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        }
+    })
+}
+
+// 导出角度度分秒转换结果
+export function exportExcel(data) {
+    return request({
+        url: `/calculate/degreeToDMS/export`,
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}

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

@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+// 执行角度弧度转换
+export function calculate(data) {
+    return request({
+        url: `/calculate/degreeToRadian/calculate`,
+        method: 'post',
+        data: data
+    })
+}
+
+// 导入 Excel
+export function importExcel(data) {
+    return request({
+        url: `/calculate/degreeToRadian/import`,
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        }
+    })
+}
+
+// 导出角度弧度转换结果
+export function exportExcel(data) {
+    return request({
+        url: `/calculate/degreeToRadian/export`,
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}

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

@@ -31,12 +31,3 @@ export function exportExcel(data) {
         responseType: 'blob'
     })
 }
-
-// 下载模板
-export function downloadTemplate() {
-    return request({
-        url: '/calculate/gaussBandChange/template',
-        method: 'get',
-        responseType: 'blob'
-    })
-}

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

@@ -31,12 +31,3 @@ export function exportExcel(data) {
         responseType: 'blob'
     })
 }
-
-// 下载模板
-export function downloadTemplate() {
-    return request({
-        url: '/calculate/gaussNegative/template',
-        method: 'get',
-        responseType: 'blob'
-    })
-}

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

@@ -31,12 +31,3 @@ export function exportExcel(data) {
         responseType: 'blob'
     })
 }
-
-// 下载模板
-export function downloadTemplate() {
-    return request({
-        url: '/calculate/gaussPositive/template',
-        method: 'get',
-        responseType: 'blob'
-    })
-}

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

@@ -29,13 +29,4 @@ export function exportExcel(data) {
         data: data,
         responseType: 'blob'
     })
-}
-
-// 下载模板
-export function downloadTemplate() {
-    return request({
-        url: '/calculate/geodeticToSpatial/template',
-        method: 'get',
-        responseType: 'blob'
-    })
 }

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

@@ -29,13 +29,4 @@ export function exportExcel(data) {
         data: data,
         responseType: 'blob'
     })
-}
-
-// 下载模板
-export function downloadTemplate() {
-    return request({
-        url: '/calculate/spatialToGeodetic/template',
-        method: 'get',
-        responseType: 'blob'
-    })
 }

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

@@ -30,13 +30,4 @@ export function exportExcel(data) {
         data: data,
         responseType: 'blob'
     })
-}
-
-// 下载模板
-export function downloadTemplate() {
-    return request({
-        url: '/calculate/utmBandChange/template',
-        method: 'get',
-        responseType: 'blob'
-    })
 }

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

@@ -31,12 +31,3 @@ export function exportExcel(data) {
         responseType: 'blob'
     })
 }
-
-// 下载模板
-export function downloadTemplate() {
-    return request({
-        url: '/calculate/utmNegative/template',
-        method: 'get',
-        responseType: 'blob'
-    })
-}

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

@@ -30,13 +30,4 @@ export function exportExcel(data) {
         data: data,
         responseType: 'blob'
     })
-}
-
-// 下载模板
-export function downloadTemplate() {
-    return request({
-        url: '/calculate/utmPositive/template',
-        method: 'get',
-        responseType: 'blob'
-    })
 }

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

@@ -53,6 +53,9 @@ import UTMNegativeTool from './tools/utmnegative.vue'
 import UTMBandChangeTool from './tools/utmbandchange.vue'
 import GeodeticToSpatialTool from './tools/geodetictospatial.vue'
 import SpatialToGeodeticTool from './tools/spatialtogeodetic.vue'
+import DegreeToDSTool from './tools/degreetoDMS.vue'
+import DMStodegreeTool from './tools/DMStodegree.vue'
+import DegreeToRadianTool from './tools/degreetoradian.vue'
 
 export default {
   name: 'CalculationTools',
@@ -65,6 +68,9 @@ export default {
     UTMBandChangeTool,
     GeodeticToSpatialTool,
     SpatialToGeodeticTool,
+    DegreeToDSTool, 
+    DMStodegreeTool,
+    DegreeToRadianTool,
   },
   data() {
     return {
@@ -128,7 +134,28 @@ export default {
               id: 'spatial-to-geodetic',
               name: '空间坐标转大地坐标工具',
               component: 'SpatialToGeodeticTool'
+            }
+          ]
+        },
+        {
+          id: 'degreesandDMS-category',
+          name: '度和度分秒转换工具',
+          children: [
+            {
+              id: 'degreetodms',
+              name: '度转度分秒工具',
+              component: 'DegreeToDSTool'
+            },
+            {
+              id: 'dmstodegree',
+              name: '度分秒转度工具',
+              component: 'DMStodegreeTool'
             },
+            {
+              id: 'degreetoradian',
+              name: '度转弧度工具',
+              component: 'DegreeToRadianTool'
+            }
           ]
         },
         {

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

@@ -0,0 +1,596 @@
+<!-- 度分秒转度工具组件 -->
+<template>
+  <div class="dms-to-degree-tool">
+    <!-- 操作按钮区 -->
+    <div class="tool-header">
+      <div class="card-header-buttons">
+        <el-button type="primary" @click="handleImport" size="small" icon="el-icon-upload">
+          导入 Excel
+        </el-button>
+
+        <el-button 
+          type="warning" 
+          @click="handleCalculate" 
+          size="small" 
+          :disabled="!importedData || importedData.length === 0 || calculating"
+          :loading="calculating"
+          icon="el-icon-caret-right">
+          {{ calculating ? '计算中...' : '执行计算' }}
+        </el-button>
+        <el-button 
+          type="danger" 
+          @click="clearAll" 
+          size="small" 
+          :disabled="(!importedData || importedData.length === 0) && calculationResults.length === 0"
+          plain
+          icon="el-icon-delete">
+          清空全部
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 数据展示区域 - 合并显示导入数据和计算结果 -->
+    <div v-if="displayData.length > 0" class="result-section">
+      <div class="section-header">
+        <span class="section-title">
+          <i class="el-icon-tickets"></i>
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
+        </span>
+        <span class="section-info">
+          共 {{ displayData.length }} 条数据
+        </span>
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
+          导出结果
+        </el-button>
+      </div>
+      
+      <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="longitudeDMS" label="经度(° ′ ″)" width="200" align="center">
+          <template slot-scope="scope">
+            <span>{{ formatNumber(scope.row.longitudeDMS, 9) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitudeDMS" label="纬度(° ′ ″)" width="200" align="center">
+          <template slot-scope="scope">
+            <span>{{ formatNumber(scope.row.latitudeDMS, 9) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="longitude" label="经度(°)" width="180" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.longitude" class="result-value">{{ formatNumber(scope.row.longitude, 9) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitude" label="纬度(°)" width="180" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.latitude" class="result-value">{{ formatNumber(scope.row.latitude, 9) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    
+    <!-- 空状态 -->
+    <div v-else class="empty-state">
+      <i class="el-icon-document"></i>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入 Excel 数据</p>
+    </div>
+    
+    <!-- 导入 Excel 对话框 -->
+    <el-dialog title="导入 Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
+      <div style="text-align: center;">
+        <el-upload
+          class="upload-area"
+          :action="''"
+          :auto-upload="false"
+          :on-change="handleFileChange"
+          :show-file-list="true"
+          accept=".xlsx,.xls"
+          drag
+          ref="upload">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将 Excel 文件拖到此处，或<em>点击选择</em></div>
+          <div class="el-upload__tip" slot="tip">
+            支持.xlsx 和.xls 格式文件
+          </div>
+        </el-upload>
+      </div>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="importDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="submitImport" :loading="importLoading" :disabled="!importFile">
+          确认导入
+        </el-button>
+      </span>
+    </el-dialog>
+    
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
+      </div>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">经度(度分秒)字段</label>
+          <el-select v-model="fieldMapping.longitudeDMS" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">纬度(度分秒)字段</label>
+          <el-select v-model="fieldMapping.latitudeDMS" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { calculate, importExcel, exportExcel, downloadTemplate } from '@/api/calculate/DMStodegree'
+
+export default {
+  name: 'DMSToDegreeTool',
+  data() {
+    return {
+      importedData: [],        // 导入的原始数据
+      calculationResults: [],  // 计算结果
+      importDialogVisible: false,
+      importLoading: false,
+      importFile: null,
+      calculating: false,
+      
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        longitudeDMS: '',
+        latitudeDMS: ''
+      },
+      rawImportedData: []
+    }
+  },
+  methods: {
+    // 打开导入对话框 
+    handleImport() {
+      this.importDialogVisible = true
+    },
+    
+    // 文件选择变化
+    handleFileChange(file) {
+      this.importFile = file.raw
+    },
+    
+    // 提交导入
+    async submitImport() {
+      if (!this.importFile) {
+        this.$message.warning('请选择文件')
+        return
+      }
+      
+      this.importLoading = true
+      
+      const formData = new FormData()
+      formData.append('file', this.importFile)
+      
+      try {
+        const response = await importExcel(formData)
+        
+        if (response.code === 200) {
+          const result = response.data
+          
+          // 获取Excel列名
+          this.excelColumns = result.columns || this.extractColumns(result.data)
+          
+          // 保存原始数据
+          this.rawImportedData = result.data || []
+          
+          // 清空之前的计算结果
+          this.calculationResults = []
+          
+          // 自动匹配字段
+          this.autoMatchFields()
+          
+          // 显示字段映射对话框
+          this.mappingDialogVisible = true
+          
+          this.$message.success(`${response.msg}`)
+          this.importDialogVisible = false
+          this.importLoading = false
+        } else {
+          this.$message.error(response.msg)
+          this.importLoading = false
+        }
+      } catch (error) {
+        this.$message.error('导入失败')
+        this.importLoading = false
+      }
+    },
+    
+    // 提取列名
+    extractColumns(data) {
+      if (!data || data.length === 0) return []
+      return Object.keys(data[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      this.resetFieldMapping()
+      
+      const keywordMap = {
+        pointNumber: ['点号', '待求点', '点', '编号', '序号', 'ID'],
+        longitudeDMS: ['经度(度分秒)', '经度度分秒', '经度 DMS', 'lonDMS', 'LongitudeDMS'],
+        latitudeDMS: ['纬度(度分秒)', '纬度度分秒', '纬度 DMS', 'latDMS', 'LatitudeDMS']
+      }
+      
+      this.excelColumns.forEach(col => {
+        const lowerCol = col.toLowerCase()
+        Object.keys(keywordMap).forEach(field => {
+          if (!this.fieldMapping[field]) {
+            keywordMap[field].forEach(keyword => {
+              if (col.includes(keyword) || lowerCol.includes(keyword.toLowerCase())) {
+                this.fieldMapping[field] = col
+              }
+            })
+          }
+        })
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有必填字段的映射')
+        return
+      }
+      
+      // 根据映射转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        longitudeDMS: item[this.fieldMapping.longitudeDMS],
+        latitudeDMS: item[this.fieldMapping.latitudeDMS]
+      }))
+      
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+      this.rawImportedData = []
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        longitudeDMS: '',
+        latitudeDMS: ''
+      }
+    },
+    
+    // 下载模板
+    handleDownloadTemplate() {
+      this.download('/calculate/DMSToDegree/template', {}, '度分秒转度模板.xlsx')
+    },
+    
+    // 执行计算
+    async handleCalculate() {
+      if (!this.importedData || this.importedData.length === 0) {
+        this.$message.warning('没有数据可计算')
+        return
+      }
+      
+      this.calculating = true
+      
+      // 构建请求参数
+      const requestData = this.importedData.map(item => ({
+        pointNumber: item.pointNumber,
+        longitudeDMS: parseFloat(item.longitudeDMS),
+        latitudeDMS: parseFloat(item.latitudeDMS),
+        longitudePosition: item.longitudePosition,
+        latitudePosition: item.latitudePosition
+      }))
+      
+      const response = await calculate(requestData)
+      
+      if (response.code === 200) {
+        const results = response.data || []
+        
+        // 更新计算结果
+        this.calculationResults = results.map(item => ({
+          pointNumber: item.pointNumber,
+          longitudeDMS: item.longitudeDMS,
+          latitudeDMS: item.latitudeDMS,
+          longitudePosition: item.longitudePosition,
+          latitudePosition: item.latitudePosition,
+          longitude: item.longitude,
+          latitude: item.latitude
+        }))
+        
+        const successCount = results.filter(r => r.longitude !== undefined && r.longitude !== -1).length
+        const failCount = results.length - successCount
+        
+        this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
+      } else {
+        this.$message.error(response.msg)
+      }
+      
+      this.calculating = false
+    },
+    
+    // 导出结果
+    async handleExport() {
+      if (this.calculationResults.length === 0) {
+        this.$message.warning('没有结果可导出')
+        return
+      }
+      
+      const response = await exportExcel(this.calculationResults)
+      
+      const blob = new Blob([response], { 
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      })
+      
+      const url = window.URL.createObjectURL(blob)
+      const link = document.createElement('a')
+      link.href = url
+      link.download = `度分秒转度结果_${new Date().getTime()}.xlsx`
+      link.click()
+      window.URL.revokeObjectURL(url)
+    },
+    
+    // 清空全部
+    clearAll() {
+      if ((!this.importedData || this.importedData.length === 0) && this.calculationResults.length === 0) {
+        return
+      }
+      
+      this.$confirm('确定清空所有数据吗？此操作不可恢复！', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.importedData = []
+        this.calculationResults = []
+        this.$message.success('已清空所有数据')
+      }).catch(() => {})
+    },
+    
+    // 重置导入状态
+    resetImport() {
+      this.importFile = null
+      if (this.$refs.upload) {
+        this.$refs.upload.clearFiles()
+      }
+    },
+    
+    // 格式化数字显示
+    formatNumber(value, decimals = 3) {
+      if (value === null || value === undefined) return '--'
+      return Number(value).toFixed(decimals)
+    }
+  },
+  
+  computed: {
+    // 验证字段映射
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.longitudeDMS && 
+             this.fieldMapping.latitudeDMS
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      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
+        }))
+      } else if (this.importedData.length > 0) {
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          longitudeDMS: item.longitudeDMS,
+          latitudeDMS: item.latitudeDMS,
+          longitude: undefined,
+          latitude: undefined
+        }))
+      }
+      return []
+    }
+  }
+}
+</script>
+
+<style scoped>
+.dms-to-degree-tool {
+  width: 100%;
+}
+
+.tool-header {
+  margin-bottom: 20px;
+}
+
+.card-header-buttons {
+  display: flex;
+  gap: 10px;
+  flex-wrap: wrap;
+}
+
+.result-section {
+  margin-top: 10px;
+}
+
+.section-header {
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 8px 8px 0 0;
+  border: 1px solid #e4e7ed;
+  border-bottom: none;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: bold;
+  color: #303133;
+}
+
+.section-title i {
+  margin-right: 8px;
+  color: #11a983;
+}
+
+.section-info {
+  font-size: 12px;
+  color: #909399;
+}
+
+.result-value {
+  color: #409eff;
+  font-family: monospace;
+  font-weight: 500;
+}
+
+.empty-state {
+  text-align: center;
+  padding: 60px 20px;
+  background: #fff;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  color: #909399;
+}
+
+.empty-state i {
+  font-size: 64px;
+  margin-bottom: 16px;
+}
+
+.empty-tip {
+  font-size: 12px;
+  margin-top: 12px;
+  color: #c0c4cc;
+}
+
+.import-tips {
+  margin-bottom: 20px;
+}
+
+.template-info {
+  margin-top: 12px;
+}
+
+.template-info ul {
+  margin: 8px 0;
+  padding-left: 20px;
+}
+
+.template-info li {
+  margin: 4px 0;
+  font-size: 13px;
+}
+
+.upload-area {
+  margin-top: 10px;
+}
+
+.preview-info {
+  margin-bottom: 15px;
+  padding: 10px;
+  background: #f5f7fa;
+  border-radius: 4px;
+  font-size: 14px;
+  color: #606266;
+}
+
+.dialog-footer {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
+.template-download-wrapper {
+  margin-top: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 10px;
+  padding-top: 12px;
+  border-top: 1px dashed #e4e7ed;
+}
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 140px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
+</style>

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

@@ -0,0 +1,592 @@
+<!-- 角度度分秒转换工具组件 -->
+<template>
+  <div class="degree-to-dms-tool">
+    <!-- 操作按钮区 -->
+    <div class="tool-header">
+      <div class="card-header-buttons">
+        <el-button type="primary" @click="handleImport" size="small" icon="el-icon-upload">
+          导入 Excel
+        </el-button>
+
+        <el-button 
+          type="warning" 
+          @click="handleCalculate" 
+          size="small" 
+          :disabled="!importedData || importedData.length === 0 || calculating"
+          :loading="calculating"
+          icon="el-icon-caret-right">
+          {{ calculating ? '计算中...' : '执行计算' }}
+        </el-button>
+        <el-button 
+          type="danger" 
+          @click="clearAll" 
+          size="small" 
+          :disabled="(!importedData || importedData.length === 0) && calculationResults.length === 0"
+          plain
+          icon="el-icon-delete">
+          清空全部
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 数据展示区域 - 合并显示导入数据和计算结果 -->
+    <div v-if="displayData.length > 0" class="result-section">
+      <div class="section-header">
+        <span class="section-title">
+          <i class="el-icon-tickets"></i>
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
+        </span>
+        <span class="section-info">
+          共 {{ displayData.length }} 条数据
+        </span>
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
+          导出结果
+        </el-button>
+      </div>
+      
+      <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">
+          <template slot-scope="scope">
+            <span>{{ formatNumber(scope.row.longitude, 9) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitude" label="纬度(°)" width="150" align="center">
+          <template slot-scope="scope">
+            <span>{{ formatNumber(scope.row.latitude, 9) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="longitudeDMS" label="经度(° ′ ″)" width="200" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.longitudeDMS" class="result-value">{{ formatNumber(scope.row.longitudeDMS, 7) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitudeDMS" label="纬度(° ′ ″)" width="200" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.latitudeDMS" class="result-value">{{ formatNumber(scope.row.latitudeDMS, 7) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    
+    <!-- 空状态 -->
+    <div v-else class="empty-state">
+      <i class="el-icon-document"></i>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入 Excel 数据</p>
+    </div>
+    
+    <!-- 导入 Excel 对话框 -->
+    <el-dialog title="导入 Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
+      <div style="text-align: center;">
+        <el-upload
+          class="upload-area"
+          :action="''"
+          :auto-upload="false"
+          :on-change="handleFileChange"
+          :show-file-list="true"
+          accept=".xlsx,.xls"
+          drag
+          ref="upload">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将 Excel 文件拖到此处，或<em>点击选择</em></div>
+          <div class="el-upload__tip" slot="tip">
+            支持.xlsx 和.xls 格式文件
+          </div>
+        </el-upload>
+      </div>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="importDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="submitImport" :loading="importLoading" :disabled="!importFile">
+          确认导入
+        </el-button>
+      </span>
+    </el-dialog>
+    
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
+      </div>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">经度字段</label>
+          <el-select v-model="fieldMapping.longitude" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">纬度字段</label>
+          <el-select v-model="fieldMapping.latitude" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { calculate, importExcel, exportExcel, downloadTemplate } from '@/api/calculate/degreetoDMS'
+
+export default {
+  name: 'DegreeToDMSTool',
+  data() {
+    return {
+      importedData: [],        // 导入的原始数据
+      calculationResults: [],  // 计算结果
+      importDialogVisible: false,
+      importLoading: false,
+      importFile: null,
+      calculating: false,
+      
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        longitude: '',
+        latitude: ''
+      },
+      rawImportedData: []
+    }
+  },
+  methods: {
+    // 打开导入对话框 
+    handleImport() {
+      this.importDialogVisible = true
+    },
+    
+    // 文件选择变化
+    handleFileChange(file) {
+      this.importFile = file.raw
+    },
+    
+    // 提交导入
+    async submitImport() {
+      if (!this.importFile) {
+        this.$message.warning('请选择文件')
+        return
+      }
+      
+      this.importLoading = true
+      
+      const formData = new FormData()
+      formData.append('file', this.importFile)
+      
+      try {
+        const response = await importExcel(formData)
+        
+        if (response.code === 200) {
+          const result = response.data
+          
+          // 获取Excel列名
+          this.excelColumns = result.columns || this.extractColumns(result.data)
+          
+          // 保存原始数据
+          this.rawImportedData = result.data || []
+          
+          // 清空之前的计算结果
+          this.calculationResults = []
+          
+          // 自动匹配字段
+          this.autoMatchFields()
+          
+          // 显示字段映射对话框
+          this.mappingDialogVisible = true
+          
+          this.$message.success(`${response.msg}`)
+          this.importDialogVisible = false
+          this.importLoading = false
+        } else {
+          this.$message.error(response.msg)
+          this.importLoading = false
+        }
+      } catch (error) {
+        this.$message.error('导入失败')
+        this.importLoading = false
+      }
+    },
+    
+    // 提取列名
+    extractColumns(data) {
+      if (!data || data.length === 0) return []
+      return Object.keys(data[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      this.resetFieldMapping()
+      
+      const keywordMap = {
+        pointNumber: ['点号', '待求点', '点', '编号', '序号', 'ID'],
+        longitude: ['经度', 'lon', 'Longitude', 'L', '东经', '西经'],
+        latitude: ['纬度', 'lat', 'Latitude', 'B', '北纬', '南纬'],
+      }
+      
+      this.excelColumns.forEach(col => {
+        const lowerCol = col.toLowerCase()
+        Object.keys(keywordMap).forEach(field => {
+          if (!this.fieldMapping[field]) {
+            keywordMap[field].forEach(keyword => {
+              if (col.includes(keyword) || lowerCol.includes(keyword.toLowerCase())) {
+                this.fieldMapping[field] = col
+              }
+            })
+          }
+        })
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有必填字段的映射')
+        return
+      }
+      
+      // 根据映射转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        longitude: item[this.fieldMapping.longitude],
+        latitude: item[this.fieldMapping.latitude],
+      }))
+      
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+      this.rawImportedData = []
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        longitude: '',
+        latitude: '',
+      }
+    },
+    
+    // 下载模板
+    handleDownloadTemplate() {
+      this.download('/calculate/degreeToDMS/template', {}, '度转度分秒模板.xlsx')
+    },
+    
+    // 执行计算
+    async handleCalculate() {
+      if (!this.importedData || this.importedData.length === 0) {
+        this.$message.warning('没有数据可计算')
+        return
+      }
+      
+      this.calculating = true
+      
+      // 构建请求参数
+      const requestData = this.importedData.map(item => ({
+        pointNumber: item.pointNumber,
+        longitude: parseFloat(item.longitude),
+        latitude: parseFloat(item.latitude),
+      }))
+      
+      const response = await calculate(requestData)
+      
+      if (response.code === 200) {
+        const results = response.data || []
+        
+        // 更新计算结果
+        this.calculationResults = results.map(item => ({
+          pointNumber: item.pointNumber,
+          longitude: item.longitude,
+          latitude: item.latitude,
+          longitudeDMS: item.longitudeDMS,
+          latitudeDMS: item.latitudeDMS
+        }))
+        
+        const successCount = results.filter(r => r.longitudeDMS !== undefined && r.longitudeDMS !== -1).length
+        const failCount = results.length - successCount
+        
+        this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
+      } else {
+        this.$message.error(response.msg)
+      }
+      
+      this.calculating = false
+    },
+    
+    // 导出结果
+    async handleExport() {
+      if (this.calculationResults.length === 0) {
+        this.$message.warning('没有结果可导出')
+        return
+      }
+      
+      const response = await exportExcel(this.calculationResults)
+      
+      const blob = new Blob([response], { 
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      })
+      
+      const url = window.URL.createObjectURL(blob)
+      const link = document.createElement('a')
+      link.href = url
+      link.download = `角度度分秒转换结果_${new Date().getTime()}.xlsx`
+      link.click()
+      window.URL.revokeObjectURL(url)
+    },
+    
+    // 清空全部
+    clearAll() {
+      if ((!this.importedData || this.importedData.length === 0) && this.calculationResults.length === 0) {
+        return
+      }
+      
+      this.$confirm('确定清空所有数据吗？此操作不可恢复！', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.importedData = []
+        this.calculationResults = []
+        this.$message.success('已清空所有数据')
+      }).catch(() => {})
+    },
+    
+    // 重置导入状态
+    resetImport() {
+      this.importFile = null
+      if (this.$refs.upload) {
+        this.$refs.upload.clearFiles()
+      }
+    },
+    
+    // 格式化数字显示
+    formatNumber(value, decimals = 3) {
+      if (value === null || value === undefined) return '--'
+      return Number(value).toFixed(decimals)
+    }
+  },
+  
+  computed: {
+    // 验证字段映射
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.longitude && 
+             this.fieldMapping.latitude
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      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,
+        }))
+      } else if (this.importedData.length > 0) {
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          longitude: item.longitude,
+          latitude: item.latitude,
+          longitudeDMS: undefined,
+          latitudeDMS: undefined,
+        }))
+      }
+      return []
+    }
+  }
+}
+</script>
+
+<style scoped>
+.degree-to-dms-tool {
+  width: 100%;
+}
+
+.tool-header {
+  margin-bottom: 20px;
+}
+
+.card-header-buttons {
+  display: flex;
+  gap: 10px;
+  flex-wrap: wrap;
+}
+
+.result-section {
+  margin-top: 10px;
+}
+
+.section-header {
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 8px 8px 0 0;
+  border: 1px solid #e4e7ed;
+  border-bottom: none;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: bold;
+  color: #303133;
+}
+
+.section-title i {
+  margin-right: 8px;
+  color: #11a983;
+}
+
+.section-info {
+  font-size: 12px;
+  color: #909399;
+}
+
+.result-value {
+  color: #409eff;
+  font-family: monospace;
+  font-weight: 500;
+}
+
+.empty-state {
+  text-align: center;
+  padding: 60px 20px;
+  background: #fff;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  color: #909399;
+}
+
+.empty-state i {
+  font-size: 64px;
+  margin-bottom: 16px;
+}
+
+.empty-tip {
+  font-size: 12px;
+  margin-top: 12px;
+  color: #c0c4cc;
+}
+
+.import-tips {
+  margin-bottom: 20px;
+}
+
+.template-info {
+  margin-top: 12px;
+}
+
+.template-info ul {
+  margin: 8px 0;
+  padding-left: 20px;
+}
+
+.template-info li {
+  margin: 4px 0;
+  font-size: 13px;
+}
+
+.template-download-wrapper {
+  margin-top: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 10px;
+  padding-top: 12px;
+  border-top: 1px dashed #e4e7ed;
+}
+
+.upload-area {
+  margin-top: 10px;
+}
+
+.preview-info {
+  margin-bottom: 15px;
+  padding: 10px;
+  background: #f5f7fa;
+  border-radius: 4px;
+  font-size: 14px;
+  color: #606266;
+}
+
+.dialog-footer {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 120px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
+</style>

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

@@ -0,0 +1,564 @@
+<!-- 角度转弧度工具组件 -->
+<template>
+  <div class="degree-to-radian-tool">
+    <!-- 操作按钮区 -->
+    <div class="tool-header">
+      <div class="card-header-buttons">
+        <el-button type="primary" @click="handleImport" size="small" icon="el-icon-upload">
+          导入 Excel
+        </el-button>
+        <el-button 
+          type="warning" 
+          @click="handleCalculate" 
+          size="small" 
+          :disabled="!importedData || importedData.length === 0 || calculating"
+          :loading="calculating"
+          icon="el-icon-caret-right">
+          {{ calculating ? '计算中...' : '执行计算' }}
+        </el-button>
+        <el-button 
+          type="danger" 
+          @click="clearAll" 
+          size="small" 
+          :disabled="(!importedData || importedData.length === 0) && calculationResults.length === 0"
+          plain
+          icon="el-icon-delete">
+          清空全部
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 数据展示区域 -->
+    <div v-if="displayData.length > 0" class="result-section">
+      <div class="section-header">
+        <span class="section-title">
+          <i class="el-icon-tickets"></i>
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
+        </span>
+        <span class="section-info">
+          共 {{ displayData.length }} 条数据
+        </span>
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
+          导出结果
+        </el-button>
+      </div>
+      
+      <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="180" align="center">
+          <template slot-scope="scope">
+            <span>{{ formatNumber(scope.row.longitude, 9) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitude" label="纬度(°)" width="180" align="center">
+          <template slot-scope="scope">
+            <span>{{ formatNumber(scope.row.latitude, 9) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="longitudeRadian" label="经度(弧度)" width="200" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.longitudeRadian !== undefined" class="result-value">{{ formatNumber(scope.row.longitudeRadian, 9) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitudeRadian" label="纬度(弧度)" width="200" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.latitudeRadian !== undefined" class="result-value">{{ formatNumber(scope.row.latitudeRadian, 9) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    
+    <!-- 空状态 -->
+    <div v-else class="empty-state">
+      <i class="el-icon-document"></i>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入 Excel 数据，然后点击"执行计算"</p>
+    </div>
+    
+    <!-- 导入 Excel 对话框 -->
+    <el-dialog title="导入 Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
+      <div style="text-align: center;">
+        <el-upload
+          class="upload-area"
+          :action="''"
+          :auto-upload="false"
+          :on-change="handleFileChange"
+          :show-file-list="true"
+          accept=".xlsx,.xls"
+          drag
+          ref="upload">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将 Excel 文件拖到此处，或<em>点击选择</em></div>
+          <div class="el-upload__tip" slot="tip">
+            支持.xlsx 和.xls 格式文件
+          </div>
+        </el-upload>
+      </div>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="importDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="submitImport" :loading="importLoading" :disabled="!importFile">
+          确认导入
+        </el-button>
+      </span>
+    </el-dialog>
+    
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
+      </div>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">经度(度)字段</label>
+          <el-select v-model="fieldMapping.longitude" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">纬度(度)字段</label>
+          <el-select v-model="fieldMapping.latitude" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { calculate, importExcel, exportExcel } from '@/api/calculate/degreetoradian'
+
+export default {
+  name: 'DegreeToRadianTool',
+  data() {
+    return {
+      importedData: [],        // 导入的原始数据
+      calculationResults: [],  // 计算结果
+      importDialogVisible: false,
+      importLoading: false,
+      importFile: null,
+      calculating: false,
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        longitude: '',
+        latitude: ''
+      },
+      rawImportedData: [],
+    }
+  },
+  computed: {
+    validateMapping() {
+      return this.fieldMapping.pointNumber && this.fieldMapping.longitude && this.fieldMapping.latitude
+    },
+    displayData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.map(item => ({
+          pointNumber: item.pointNumber,
+          longitude: item.longitude,
+          latitude: item.latitude,
+          longitudeRadian: item.longitudeRadian,
+          latitudeRadian: item.latitudeRadian
+        }))
+      } else if (this.importedData.length > 0) {
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          longitude: item.longitude,
+          latitude: item.latitude,
+          longitudeRadian: undefined,
+          latitudeRadian: undefined
+        }))
+      }
+      return []
+    }
+  },
+  methods: {
+    // 打开导入对话框 
+    handleImport() {
+      this.importDialogVisible = true
+    },
+    
+    // 文件选择变化
+    handleFileChange(file) {
+      this.importFile = file.raw
+    },
+    
+    // 提交导入
+    async submitImport() {
+      if (!this.importFile) {
+        this.$message.warning('请选择文件')
+        return
+      }
+      
+      this.importLoading = true
+      
+      const formData = new FormData()
+      formData.append('file', this.importFile)
+      
+      const response = await importExcel(formData)
+      
+      if (response.code === 200) {
+        const result = response.data
+        this.rawImportedData = result.data || []
+        this.excelColumns = result.columns || []
+        
+        // 自动匹配字段
+        this.autoMatchFields()
+        
+        this.importDialogVisible = false
+        this.mappingDialogVisible = true
+      } else {
+        this.$message.error(response.msg)
+      }
+      this.importLoading = false
+    },
+    
+    // 提取列名
+    extractColumns(rows) {
+      if (!rows || rows.length === 0) return []
+      return Object.keys(rows[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      const mappings = {
+        pointNumber: ['点号', '编号', '名称', 'ID', '序号'],
+        longitude: ['经度', '东经', '西经'],
+        latitude: ['纬度', '北纬', '南纬']
+      }
+      
+      Object.keys(mappings).forEach(key => {
+        const keywords = mappings[key]
+        const matchedColumn = this.excelColumns.find(col => 
+          keywords.some(kw => col.includes(kw))
+        )
+        if (matchedColumn) {
+          this.fieldMapping[key] = matchedColumn
+        }
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请至少映射点号、经度、纬度字段')
+        return
+      }
+      
+      // 根据映射关系转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        longitude: item[this.fieldMapping.longitude],
+        latitude: item[this.fieldMapping.latitude]
+      }))
+      
+      // 清空之前的计算结果
+      this.calculationResults = []
+      
+      this.mappingDialogVisible = false
+      this.$message.success('数据导入成功')
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.rawImportedData = []
+      this.excelColumns = []
+      this.resetFieldMapping()
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        longitude: '',
+        latitude: ''
+      }
+    },
+    
+    // 参数变化时清空计算结果
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已修改，请重新执行计算')
+      }
+    },
+    
+    // 执行计算
+    async handleCalculate() {
+      if (!this.importedData || this.importedData.length === 0) {
+        this.$message.warning('没有数据可计算')
+        return
+      }
+      
+      this.calculating = true
+      
+      try {
+        // 构建请求参数
+        const requestData = this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          longitude: parseFloat(item.longitude),
+          latitude: parseFloat(item.latitude),
+        }))
+        
+        const response = await calculate(requestData)
+        
+        if (response.code === 200) {
+          const results = response.data || []
+          
+          // 更新计算结果
+          this.calculationResults = results.map(item => ({
+            pointNumber: item.pointNumber,
+            longitude: item.longitude,
+            latitude: item.latitude,
+            longitudeRadian: item.longitudeRadian,
+            latitudeRadian: item.latitudeRadian
+          }))
+          
+          const successCount = results.filter(r => r.longitudeRadian !== undefined && r.longitudeRadian !== -1).length
+          const failCount = results.length - successCount
+          
+          this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
+        } else {
+          this.$message.error(response.msg)
+        }
+      } catch (error) {
+        this.$message.error('计算失败：' + (error.message || error))
+      } finally {
+        this.calculating = false
+      }
+    },
+
+    // 导出结果
+    async handleExport() {
+      if (this.calculationResults.length === 0) {
+        this.$message.warning('没有结果可导出')
+        return
+      }
+      
+      const response = await exportExcel(this.calculationResults)
+      
+      const blob = new Blob([response], { 
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      })
+      
+      const url = window.URL.createObjectURL(blob)
+      const link = document.createElement('a')
+      link.href = url
+      link.download = `度转弧度结果_${new Date().getTime()}.xlsx`
+      link.click()
+      window.URL.revokeObjectURL(url)
+    },
+    
+    // 清空全部
+    clearAll() {
+      if ((!this.importedData || this.importedData.length === 0) && this.calculationResults.length === 0) {
+        return
+      }
+      
+      this.$confirm('确定清空所有数据吗？此操作不可恢复！', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.importedData = []
+        this.calculationResults = []
+        this.$message.success('已清空所有数据')
+      }).catch(() => {})
+    },
+    
+    // 重置导入状态
+    resetImport() {
+      this.importFile = null
+      if (this.$refs.upload) {
+        this.$refs.upload.clearFiles()
+      }
+    },
+    
+    // 格式化数字显示
+    formatNumber(value, decimals = 3) {
+      if (value === null || value === undefined) return '--'
+      return Number(value).toFixed(decimals)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.degree-to-radian-tool {
+  width: 100%;
+}
+
+.tool-header {
+  margin-bottom: 20px;
+}
+
+.card-header-buttons {
+  display: flex;
+  gap: 10px;
+  flex-wrap: wrap;
+}
+
+.params-area {
+  margin-bottom: 20px;
+  padding: 16px;
+  background: #f5f7fa;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+}
+
+.params-row {
+  display: flex;
+  gap: 24px;
+  flex-wrap: wrap;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-size: 14px;
+  color: #606266;
+  font-weight: 500;
+}
+
+.result-section {
+  margin-top: 10px;
+}
+
+.section-header {
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-radius: 8px 8px 0 0;
+  border: 1px solid #e4e7ed;
+  border-bottom: none;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: bold;
+  color: #303133;
+}
+
+.section-title i {
+  margin-right: 8px;
+  color: #11a983;
+}
+
+.section-info {
+  font-size: 12px;
+  color: #909399;
+}
+
+.result-value {
+  color: #409eff;
+  font-family: monospace;
+  font-weight: 500;
+}
+
+.empty-cell {
+  color: #c0c4cc;
+}
+
+.empty-state {
+  text-align: center;
+  padding: 60px 20px;
+  background: #fff;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  color: #909399;
+}
+
+.empty-state i {
+  font-size: 64px;
+  margin-bottom: 16px;
+}
+
+.empty-tip {
+  font-size: 12px;
+  margin-top: 12px;
+  color: #c0c4cc;
+}
+
+.upload-area {
+  margin-top: 10px;
+}
+
+.mapping-content {
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.dialog-footer {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 140px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+</style>

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

@@ -8,14 +8,6 @@
           导入Excel
         </el-button>
 
-        <el-button 
-          type="success" 
-          @click="handlePreview" 
-          size="small" 
-          :disabled="!importedData || importedData.length === 0"
-          icon="el-icon-view">
-          预览数据
-        </el-button>
         <el-button 
           type="warning" 
           @click="handleCalculate" 
@@ -37,47 +29,117 @@
       </div>
     </div>
     
-    <!-- 投影面高程设置 -->
-    <div class="height-setting">
-      <div class="setting-label">
-        <span>投影面高程</span>
+    <!-- 参数设置区域 -->
+    <div class="params-area">
+      <div class="params-row">
+        <div class="params-group">
+          <label class="param-label">投影面高程</label>
+          <el-input 
+            v-model="projectionHeight" 
+            size="small" 
+            style="width: 120px;">
+          </el-input>
+          <span class="unit">米 (m)</span>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">坐标系</label>
+          <el-select v-model="commonParams.coordinateSystem" size="small" style="width: 140px;" @change="onParamsChange">
+            <el-option label="WGS84" value="WGS84"></el-option>
+            <el-option label="CGCS2000" value="CGCS2000"></el-option>
+            <el-option label="Beijing54" value="Beijing54"></el-option>
+            <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.longitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="E" value="E"></el-option>
+            <el-option label="W" value="W"></el-option>
+          </el-select>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">纬度位置</label>
+          <el-select v-model="commonParams.latitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="N" value="N"></el-option>
+            <el-option label="S" value="S"></el-option>
+          </el-select>
+        </div>
       </div>
-      <div class="setting-content">
-        <el-input 
-          v-model="projectionHeight" 
-          size="small" 
-          style="width: 120px; margin-right: 10px;">
-        </el-input>
-        <span class="unit">米 (m)</span>
+
+      <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>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">带宽</label>
+          <el-select v-model="commonParams.bandwidth" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="3" :value="3"></el-option>
+            <el-option label="6" :value="6"></el-option>
+          </el-select>
+        </div>
+        
+        <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>
+        </div>
         
+        <div class="params-group">
+          <label class="param-label">新带宽</label>
+          <el-select v-model="commonParams.newBandwidth" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="3" :value="3"></el-option>
+            <el-option label="6" :value="6"></el-option>
+          </el-select>
+        </div>
       </div>
     </div>
 
-    <!-- 计算结果展示区 - 只显示计算结果，不包含原始数据 -->
-    <div v-if="calculationResults.length > 0" class="result-section">
+    <!-- 数据展示区域 - 合并显示导入数据和计算结果 -->
+    <div v-if="displayData.length > 0" class="result-section">
       <div class="section-header">
         <span class="section-title">
           <i class="el-icon-tickets"></i>
-          计算结果
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
         </span>
         <span class="section-info">
-          共 {{ calculationResults.length }} 条计算结果
+          共 {{ displayData.length }} 条数据
+          <span v-if="calculationResults.length > 0" style="margin-left: 10px;">
+            | 坐标系：{{ commonParams.coordinateSystem }}
+            | 带号：{{ commonParams.band }}
+            | 新带号：{{ commonParams.newBand }}
+          </span>
         </span>
-        <el-button type="text" size="small" @click="handleExport" icon="el-icon-download">
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
           导出结果
         </el-button>
       </div>
       
-      <el-table :data="calculationResults" style="width: 100%" border stripe>
+      <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="newGaussX" label="高斯坐标x(m)" width="180" align="center">
+        <el-table-column prop="gaussX" label="原高斯X(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.newGaussX,4) }}</span>
+            <span>{{ formatNumber(scope.row.gaussX,4) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="newGaussY" label="高斯坐标y(m)" width="180" align="center">
+        <el-table-column prop="gaussY" label="原高斯Y(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.newGaussY,4) }}</span>
+            <span>{{ formatNumber(scope.row.gaussY,4) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="newGaussX" label="新高斯X(m)" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.newGaussX" class="result-value">{{ formatNumber(scope.row.newGaussX,4) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="newGaussY" label="新高斯Y(m)" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.newGaussY" class="result-value">{{ formatNumber(scope.row.newGaussY,4) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -86,40 +148,12 @@
     <!-- 空状态 -->
     <div v-else class="empty-state">
       <i class="el-icon-document"></i>
-      <p>暂无计算结果</p>
-      <p class="empty-tip">请先导入Excel数据，然后点击"执行计算"</p>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入Excel数据</p>
     </div>
     
     <!-- 导入Excel对话框 -->
     <el-dialog title="导入Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
-      <div class="import-tips">
-        <el-alert
-          title="Excel模板格式说明"
-          type="info"
-          :closable="false"
-          show-icon>
-          <div class="template-info">
-            <p>请确保Excel文件包含以下列（第一行为表头）：</p>
-            <ul>
-              <li><strong>待求点</strong> - 点号</li>
-              <li><strong>坐标系</strong> - WGS84/CGCS2000/Beijing54/Xian80</li>
-              <li><strong>高斯坐标X</strong> - (m)</li>
-              <li><strong>高斯坐标Y</strong> - (m)</li>
-              <li><strong>带号</strong> - 带号数值</li>
-              <li><strong>带宽</strong> - 3或6</li>
-              <li><strong>新带号</strong> - 新带号数值</li>
-              <li><strong>新带宽</strong> - 3或6</li>
-              <li><strong>经度位置</strong> - E/W</li>
-              <li><strong>纬度位置</strong> - N/S</li>
-            </ul>
-          </div>
-        </el-alert>
-         <div class="template-download-wrapper">
-            <el-button type="primary" plain size="small" @click="handleDownloadTemplate" icon="el-icon-download">
-              下载Excel模板
-            </el-button>
-          </div>
-      </div>
       <div style="text-align: center;">
         <el-upload
           class="upload-area"
@@ -146,64 +180,47 @@
       </span>
     </el-dialog>
     
-    <!-- 预览数据对话框 - 显示导入的原始数据 -->
-    <el-dialog title="导入数据预览" :visible.sync="previewDialogVisible" width="80%">
-      <div class="preview-info">
-        <span>共 {{ importedData.length }} 条数据</span>
-        <span style="margin-left: 20px;">状态：{{ importedData.filter(item => item.calculated).length }} 条已计算，{{ importedData.filter(item => !item.calculated).length }} 条未计算</span>
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
       </div>
-      <el-table :data="importedData" border stripe max-height="500">
-        <el-table-column prop="pointNumber" label="待求点号" width="120" fixed="left" align="center"></el-table-column>
-        <el-table-column prop="coordinateSystem" label="坐标系" width="110" align="center">
-          <template slot-scope="scope">
-            <el-tag size="small" :type="getCoordinateType(scope.row.coordinateSystem)">
-              {{ scope.row.coordinateSystem }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="longitude" label="高斯X坐标(m)" width="130" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.gaussX,4) }}
-          </template>
-        </el-table-column>
-         <el-table-column prop="longitudePosition" label="高斯Y坐标(m)" width="130" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.gaussY,4) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="band" label="带号" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.band}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="bandWidth" label="带宽" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.bandWidth}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="newBand" label="新带号" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.newBand}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="newBandWidth" label="新带宽" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.newBandWidth}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="longitudePosition" label="经度位置" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.longitudePosition}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="latitudePosition" label="纬度位置" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.latitudePosition}}
-                   </template>
-        </el-table-column>
-      </el-table>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">高斯X字段</label>
+          <el-select v-model="fieldMapping.gaussX" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">高斯Y字段</label>
+          <el-select v-model="fieldMapping.gaussY" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="previewDialogVisible = false">关闭</el-button>
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
       </span>
     </el-dialog>
   </div>
@@ -222,8 +239,27 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
-      previewDialogVisible: false,
-      projectionHeight: 0
+      projectionHeight: 0,
+      
+      // 公共参数（从Excel导入的数据中提取）
+      commonParams: {
+        coordinateSystem: 'CGCS2000',
+        longitudePosition: 'E',
+        latitudePosition: 'N',
+        band: 0,
+        bandwidth: 3,
+        newBand: 0,
+        newBandwidth: 3
+      },
+      
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        gaussX: '',
+        gaussY: ''
+      }
     }
   },
   watch: {
@@ -266,42 +302,110 @@ export default {
       const formData = new FormData()
       formData.append('file', this.importFile)
       
+      try {
         const response = await importExcel(formData)
         
         if (response.code === 200) {
           const result = response.data
-          // 将后端返回的数据转换为前端格式
-          this.importedData = (result.data || []).map(item => ({
-            pointNumber: item.pointNumber,
-            coordinateSystem: item.coordinateSystem,
-            gaussX: item.gaussX,
-            gaussY: item.gaussY,
-            band: item.band,
-            bandWidth: item.bandWidth,
-            newBand: item.newBand,
-            newBandWidth: item.newBandWidth,
-            longitudePosition: item.longitudePosition,
-            latitudePosition: item.latitudePosition
-          }))
+          
+          // 获取Excel列名
+          this.excelColumns = result.columns || this.extractColumns(result.data)
+          
+          // 保存原始数据
+          this.rawImportedData = result.data || []
           
           // 清空之前的计算结果
           this.calculationResults = []
           
+          // 自动匹配字段
+          this.autoMatchFields()
+          
+          // 显示字段映射对话框
+          this.mappingDialogVisible = true
+          
           this.$message.success(`${response.msg}`)
           this.importDialogVisible = false
           this.importLoading = false
         } else {
           this.$message.error(response.msg)
+          this.importLoading = false
         }
+      } catch (error) {
+        this.$message.error('导入失败')
+        this.importLoading = false
+      }
     },
     
-    // 预览数据 - 显示导入的原始数据
-    handlePreview() {
-      if (!this.importedData || this.importedData.length === 0) {
-        this.$message.warning('没有可预览的数据')
+    // 提取列名
+    extractColumns(data) {
+      if (!data || data.length === 0) return []
+      return Object.keys(data[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      this.resetFieldMapping()
+      
+      const keywordMap = {
+        pointNumber: ['点号', '待求点', '点', '编号', '序号', 'ID'],
+        gaussX: ['x', 'X', '高斯x', '高斯X', 'x坐标', 'X坐标', '东', 'E', 'east'],
+        gaussY: ['y', 'Y', '高斯y', '高斯Y', 'y坐标', 'Y坐标', '北', 'N', 'north']
+      }
+      
+      this.excelColumns.forEach(col => {
+        const lowerCol = col.toLowerCase()
+        Object.keys(keywordMap).forEach(field => {
+          if (!this.fieldMapping[field]) {
+            keywordMap[field].forEach(keyword => {
+              if (col.includes(keyword) || lowerCol.includes(keyword.toLowerCase())) {
+                this.fieldMapping[field] = col
+              }
+            })
+          }
+        })
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有必填字段的映射')
         return
       }
-      this.previewDialogVisible = true
+      
+      // 根据映射转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        gaussX: item[this.fieldMapping.gaussX],
+        gaussY: item[this.fieldMapping.gaussY]
+      }))
+      
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+      this.rawImportedData = []
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        gaussX: '',
+        gaussY: ''
+      }
+    },
+    
+    // 参数变化时清空计算结果
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已更新，请重新执行计算')
+      }
     },
     
     // 下载模板
@@ -318,22 +422,19 @@ export default {
       }
       
       this.calculating = true
-      const results = []
-      let successCount = 0
-      let failCount = 0
       
       // 构建请求参数
       const requestData = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
-        coordinateSystem: item.coordinateSystem,
+        coordinateSystem: this.commonParams.coordinateSystem,
         gaussX: item.gaussX,
         gaussY: item.gaussY,
-        band: item.band,
-        bandwidth: item.bandWidth,
-        newBand: item.newBand,
-        newBandwidth: item.newBandWidth,
-        longitudePosition: item.longitudePosition,
-        latitudePosition: item.latitudePosition,
+        band: this.commonParams.band,
+        bandwidth: this.commonParams.bandwidth,
+        newBand: this.commonParams.newBand,
+        newBandwidth: this.commonParams.newBandwidth,
+        longitudePosition: this.commonParams.longitudePosition,
+        latitudePosition: this.commonParams.latitudePosition,
         projectionHeight: this.projectionHeight
       }))
       
@@ -350,31 +451,23 @@ export default {
           gaussY: item.gaussY,
           band: item.band,
           bandwidth: item.bandwidth,
+          newGaussX: item.newGaussX,
+          newGaussY: item.newGaussY,
           newBand: item.newBand,
           newBandwidth: item.newBandwidth,
           longitudePosition: item.longitudePosition,
           latitudePosition: item.latitudePosition,
-          newGaussX: item.newGaussX,
-          newGaussY: item.newGaussY,
-          projectionHeight: this.projectionHeight
+          projectionHeight: item.projectionHeight
         }))
         
-        // 更新导入数据的计算状态
-        this.importedData.forEach(importItem => {
-          const found = results.find(r => r.pointNumber === importItem.pointNumber)
-          if (found && found.gaussX !== -1) {
-            importItem.calculated = true
-          }
-        })
-        
-        const successCount = results.filter(r => r.gaussX !== -1).length
+        const successCount = results.filter(r => r.newGaussX !== undefined && r.newGaussX !== -1).length
         const failCount = results.length - successCount
         
         this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
-        this.calculating = false
-        } else {
-          this.$message.error(response.msg)
-        }
+      } else {
+        this.$message.error(response.msg)
+      }
+      this.calculating = false
     },
     
     
@@ -440,12 +533,46 @@ export default {
     }
     return types[system] || 'info'
   }
+  },
+  
+  computed: {
+    // 验证字段映射
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.gaussX && 
+             this.fieldMapping.gaussY
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.map(item => ({
+          pointNumber: item.pointNumber,
+          gaussX: item.gaussX,
+          gaussY: item.gaussY,
+          newGaussX: item.newGaussX,
+          newGaussY: item.newGaussY
+        }))
+      } else if (this.importedData.length > 0) {
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          gaussX: item.gaussX,
+          gaussY: item.gaussY,
+          newGaussX: undefined,
+          newGaussY: undefined
+        }))
+      }
+      return []
+    }
   }
 }
 </script>
 
 <style scoped>
-.gauss-positive-tool {
+.gauss-band-change-tool {
   width: 100%;
 }
 
@@ -459,17 +586,37 @@ export default {
   flex-wrap: wrap;
 }
 
-/* 投影面高程设置样式 */
-.height-setting {
+/* 参数设置区域样式 */
+.params-area {
   background: #f5f7fa;
   border-radius: 8px;
-  padding: 12px 20px;
+  padding: 16px 20px;
   margin-bottom: 20px;
   border: 1px solid #e4e7ed;
+}
+
+.params-row {
   display: flex;
-  align-items: center;
-  gap: 20px;
   flex-wrap: wrap;
+  gap: 24px;
+  align-items: center;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-weight: 500;
+  color: #606266;
+  min-width: 40px;
+}
+
+.unit {
+  color: #909399;
+  font-size: 13px;
 }
 
 .result-section {
@@ -576,4 +723,41 @@ export default {
   padding-top: 12px;
   border-top: 1px dashed #e4e7ed;
 }
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 80px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
 </style>

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

@@ -8,14 +8,6 @@
           导入Excel
         </el-button>
 
-        <el-button 
-          type="success" 
-          @click="handlePreview" 
-          size="small" 
-          :disabled="!importedData || importedData.length === 0"
-          icon="el-icon-view">
-          预览数据
-        </el-button>
         <el-button 
           type="warning" 
           @click="handleCalculate" 
@@ -37,57 +29,97 @@
       </div>
     </div>
     
-    <!-- 投影面高程设置 -->
-    <div class="height-setting">
-      <div class="setting-label">
-        <span>投影面高程</span>
-      </div>
-      <div class="setting-content">
-        <el-input 
-          v-model="projectionHeight" 
-          size="small" 
-          style="width: 120px; margin-right: 10px;">
-        </el-input>
-        <span class="unit">米 (m)</span>
+    <!-- 参数设置区域 -->
+    <div class="params-area">
+      <div class="params-row">
+        <div class="params-group">
+          <label class="param-label">投影面高程</label>
+          <el-input 
+            v-model="projectionHeight" 
+            size="small" 
+            style="width: 120px;">
+          </el-input>
+          <span class="unit">米 (m)</span>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">坐标系</label>
+          <el-select v-model="commonParams.coordinateSystem" size="small" style="width: 140px;" @change="onParamsChange">
+            <el-option label="WGS84" value="WGS84"></el-option>
+            <el-option label="CGCS2000" value="CGCS2000"></el-option>
+            <el-option label="Beijing54" value="Beijing54"></el-option>
+            <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.longitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="E" value="E"></el-option>
+            <el-option label="W" value="W"></el-option>
+          </el-select>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">纬度位置</label>
+          <el-select v-model="commonParams.latitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="N" value="N"></el-option>
+            <el-option label="S" value="S"></el-option>
+          </el-select>
+        </div>
+        
+        <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>
+        </div>
         
+        <div class="params-group">
+          <label class="param-label">带宽</label>
+          <el-select v-model="commonParams.bandwidth" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="3" :value="3"></el-option>
+            <el-option label="6" :value="6"></el-option>
+          </el-select>
+        </div>
       </div>
     </div>
 
-    <!-- 计算结果展示区 - 只显示计算结果，不包含原始数据 -->
-    <div v-if="calculationResults.length > 0" class="result-section">
+    <!-- 数据展示区 -->
+    <div v-if="displayData.length > 0" class="result-section">
       <div class="section-header">
         <span class="section-title">
           <i class="el-icon-tickets"></i>
-          计算结果
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
         </span>
         <span class="section-info">
-          共 {{ calculationResults.length }} 条计算结果
+          共 {{ displayData.length }} 条数据 | 坐标系：{{ commonParams.coordinateSystem }} | 带号：{{ commonParams.band }} | 带宽：{{ commonParams.bandwidth }}
         </span>
-        <el-button type="text" size="small" @click="handleExport" icon="el-icon-download">
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
           导出结果
         </el-button>
       </div>
       
-      <el-table :data="calculationResults" style="width: 100%" border stripe>
+      <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="band" label="带号" width="180" align="center">
+        <el-table-column prop="gaussX" label="高斯X坐标(m)" width="180" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.band,0) }}</span>
+            {{ formatNumber(scope.row.gaussX, 4) }}
           </template>
         </el-table-column>
-         <el-table-column prop="bandwidth" label="带宽" width="180" align="center">
+        <el-table-column prop="gaussY" label="高斯Y坐标(m)" width="180" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.bandwidth,0) }}</span>
+            {{ formatNumber(scope.row.gaussY, 4) }}
           </template>
         </el-table-column>
-        <el-table-column prop="gaussX" label="大地经度(° ′ ″)" width="180" align="center">
+        <el-table-column prop="longitude" label="大地经度" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.longitude,9) }}</span>
+            <span v-if="scope.row.longitude !== undefined" class="result-value">{{ formatNumber(scope.row.longitude, 9) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
-        <el-table-column prop="gaussY" label="大地纬度(° ′ ″)" width="180" align="center">
+        <el-table-column prop="latitude" label="大地纬度" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.latitude,9) }}</span>
+            <span v-if="scope.row.latitude !== undefined" class="result-value">{{ formatNumber(scope.row.latitude, 9) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -96,36 +128,12 @@
     <!-- 空状态 -->
     <div v-else class="empty-state">
       <i class="el-icon-document"></i>
-      <p>暂无计算结果</p>
+      <p>暂无数据</p>
       <p class="empty-tip">请先导入Excel数据，然后点击"执行计算"</p>
     </div>
     
     <!-- 导入Excel对话框 -->
     <el-dialog title="导入Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
-      <div class="import-tips">
-        <el-alert
-          title="Excel模板格式说明"
-          type="info"
-          :closable="false"
-          show-icon>
-          <div class="template-info">
-            <p>请确保Excel文件包含以下列（第一行为表头）：</p>
-            <ul>
-              <li><strong>待求点</strong> - 点号</li>
-              <li><strong>坐标系</strong> - WGS84/CGCS2000/Beijing54/Xian80</li>
-              <li><strong>高斯坐标X</strong> - (m)</li>
-              <li><strong>高斯坐标Y</strong> - (m)</li>
-              <li><strong>经度位置</strong> - E/W</li>
-              <li><strong>纬度位置</strong> - N/S</li>
-            </ul>
-          </div>
-        </el-alert>
-         <div class="template-download-wrapper">
-            <el-button type="primary" plain size="small" @click="handleDownloadTemplate" icon="el-icon-download">
-              下载Excel模板
-            </el-button>
-          </div>
-      </div>
       <div style="text-align: center;">
         <el-upload
           class="upload-area"
@@ -152,44 +160,45 @@
       </span>
     </el-dialog>
     
-    <!-- 预览数据对话框 - 显示导入的原始数据 -->
-    <el-dialog title="导入数据预览" :visible.sync="previewDialogVisible" width="80%">
-      <div class="preview-info">
-        <span>共 {{ importedData.length }} 条数据</span>
-        <span style="margin-left: 20px;">状态：{{ importedData.filter(item => item.calculated).length }} 条已计算，{{ importedData.filter(item => !item.calculated).length }} 条未计算</span>
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="fieldMappingVisible" width="500px" @close="cancelMapping">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          <p>请将Excel中的列映射到对应的坐标字段。</p>
+        </el-alert>
       </div>
-      <el-table :data="importedData" border stripe max-height="500">
-        <el-table-column prop="pointNumber" label="待求点号" width="120" fixed="left" align="center"></el-table-column>
-        <el-table-column prop="coordinateSystem" label="坐标系" width="110" align="center">
-          <template slot-scope="scope">
-            <el-tag size="small" :type="getCoordinateType(scope.row.coordinateSystem)">
-              {{ scope.row.coordinateSystem }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="longitude" label="高斯X坐标(m)" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.gaussX }}
-          </template>
-        </el-table-column>
-         <el-table-column prop="longitudePosition" label="高斯Y坐标(m)" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.gaussY }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="longitudePosition" label="经度位置" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.longitudePosition}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="latitudePosition" label="纬度位置" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.latitudePosition}}
-                   </template>
-        </el-table-column>
-      </el-table>
+      
+      <!-- 字段映射区域 -->
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段：</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" placeholder="请选择点号列">
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">高斯X字段：</label>
+          <el-select v-model="fieldMapping.gaussX" class="mapping-select" placeholder="请选择高斯X列">
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">高斯Y字段：</label>
+          <el-select v-model="fieldMapping.gaussY" class="mapping-select" placeholder="请选择高斯Y列">
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="previewDialogVisible = false">关闭</el-button>
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
       </span>
     </el-dialog>
   </div>
@@ -208,8 +217,27 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
-      previewDialogVisible: false,
-      projectionHeight: 0
+      projectionHeight: 0,
+      heightTimer: null,
+      
+      // 字段映射相关
+      fieldMappingVisible: false,
+      fieldMapping: {
+        pointNumber: '',
+        gaussX: '',
+        gaussY: ''
+      },
+      rawImportedData: [],
+      excelColumns: [],
+      
+      // 公共参数
+      commonParams: {
+        coordinateSystem: 'CGCS2000',
+        longitudePosition: 'E',
+        latitudePosition: 'N',
+        band: 0,
+        bandwidth: 3
+      }
     }
   },
   watch: {
@@ -252,39 +280,97 @@ export default {
       const formData = new FormData()
       formData.append('file', this.importFile)
       
-        const response = await importExcel(formData)
+      const response = await importExcel(formData)
+      
+      if (response.code === 200) {
+        const result = response.data
         
-        if (response.code === 200) {
-          const result = response.data
-          
-          // 将后端返回的数据转换为前端格式
-          this.importedData = (result.data || []).map(item => ({
-            pointNumber: item.pointNumber,
-            coordinateSystem: item.coordinateSystem,
-            gaussX: item.gaussX,
-            gaussY: item.gaussY,
-            longitudePosition: item.longitudePosition,
-            latitudePosition: item.latitudePosition
-          }))
-          
-          // 清空之前的计算结果
-          this.calculationResults = []
-          
-          this.$message.success(`${response.msg}`)
-          this.importDialogVisible = false
-          this.importLoading = false
-        } else {
-          this.$message.error(response.msg)
+        // 保存原始数据和列名
+        this.rawImportedData = result.data || []
+        this.excelColumns = result.columns || []
+        
+        // 尝试自动匹配字段
+        this.autoMatchFields()
+        
+        // 清空之前的计算结果
+        this.calculationResults = []
+        
+        this.importDialogVisible = false
+        this.importLoading = false
+        this.fieldMappingVisible = true
+      } else {
+        this.$message.error(response.msg)
+        this.importLoading = false
+      }
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      const matchKeywords = {
+        pointNumber: ['点号', '待求点', '点名', '名称', 'pointNumber', 'ID'],
+        gaussX: ['高斯坐标x', 'X坐标', 'X', 'gaussX', 'x'],
+        gaussY: ['高斯坐标y', 'Y坐标', 'Y', 'gaussY', 'y']
+      }
+      
+      Object.keys(matchKeywords).forEach(key => {
+        for (const keyword of matchKeywords[key]) {
+          const matchedCol = this.excelColumns.find(col => 
+            col.includes(keyword) || col.toLowerCase().includes(keyword.toLowerCase())
+          )
+          if (matchedCol) {
+            this.fieldMapping[key] = matchedCol
+            break
+          }
         }
+      })
     },
     
-    // 预览数据 - 显示导入的原始数据
-    handlePreview() {
-      if (!this.importedData || this.importedData.length === 0) {
-        this.$message.warning('没有可预览的数据')
+    // 确认映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有字段映射')
         return
       }
-      this.previewDialogVisible = true
+      
+      // 根据映射关系转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        gaussX: item[this.fieldMapping.gaussX],
+        gaussY: item[this.fieldMapping.gaussY]
+      }))
+      
+      this.fieldMappingVisible = false
+      this.$message.success('数据导入成功')
+    },
+    
+    // 取消映射
+    cancelMapping() {
+      this.fieldMappingVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        gaussX: '',
+        gaussY: ''
+      }
+      this.commonParams = {
+        coordinateSystem: 'CGCS2000',
+        longitudePosition: 'E',
+        latitudePosition: 'N',
+        band: 3,
+        bandwidth: 3
+      }
+    },
+    
+    // 参数变化时清除计算结果，提示用户重新计算
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已变更，请重新执行计算')
+      }
     },
     
     // 下载模板
@@ -308,11 +394,13 @@ export default {
       // 构建请求参数
       const requestData = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
-        coordinateSystem: item.coordinateSystem,
+        coordinateSystem: this.commonParams.coordinateSystem,
         gaussX: item.gaussX,
         gaussY: item.gaussY,
-        longitudePosition: item.longitudePosition,
-        latitudePosition: item.latitudePosition,
+        longitudePosition: this.commonParams.longitudePosition,
+        latitudePosition: this.commonParams.latitudePosition,
+        band: this.commonParams.band,
+        bandwidth: this.commonParams.bandwidth,
         projectionHeight: this.projectionHeight
       }))
       
@@ -325,12 +413,12 @@ export default {
         this.calculationResults = results.map(item => ({
           pointNumber: item.pointNumber,
           coordinateSystem: item.coordinateSystem,
-          longitude: parseFloat(item.longitude),
+          longitude: item.longitude,
           longitudePosition: item.longitudePosition,
-          latitude: parseFloat(item.latitude),
+          latitude: item.latitude,
           latitudePosition: item.latitudePosition,
-          band: parseInt(item.band),
-          bandwidth: parseInt(item.bandwidth),
+          band: item.band,
+          bandwidth: item.bandwidth,
           projectionHeight: this.projectionHeight,
           gaussX: item.gaussX,
           gaussY: item.gaussY
@@ -343,17 +431,22 @@ export default {
             importItem.calculated = true
           }
         })
-        
-        const successCount = results.filter(r => r.gaussX !== -1).length
+         const successCount = results.filter(r => r.longitude !== -1).length
         const failCount = results.length - successCount
         
         this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
         this.calculating = false
-        } else {
-          this.$message.error(response.msg)
-        }
+      } else {
+        this.$message.error(response.msg)
+        this.calculating = false
+      }
+    },
+
+    // 格式化数字显示
+    formatNumber(value, decimals = 3) {
+      if (value === null || value === undefined) return '--'
+      return Number(value).toFixed(decimals)
     },
-    
     
     // 导出结果
     async handleExport() {
@@ -362,8 +455,6 @@ export default {
         return
       }
 
-      
-
       const response = await exportExcel(this.calculationResults)
       
       const blob = new Blob([response], { 
@@ -376,10 +467,10 @@ export default {
       link.download = `高斯反算结果_${new Date().getTime()}.xlsx`
       link.click()
       window.URL.revokeObjectURL(url)
-  },
+    },
     
-  // 清空全部
-  clearAll() {
+    // 清空全部
+    clearAll() {
     if ((!this.importedData || this.importedData.length === 0) && this.calculationResults.length === 0) {
       return
     }
@@ -395,36 +486,54 @@ export default {
     }).catch(() => {})
   },
   
-  // 重置导入状态
-  resetImport() {
-    this.importFile = null
-    if (this.$refs.upload) {
-      this.$refs.upload.clearFiles()
+    // 重置导入状态
+    resetImport() {
+      this.importFile = null
+      if (this.$refs.upload) {
+        this.$refs.upload.clearFiles()
+      }
     }
   },
   
-  // 格式化数字显示
-  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'
+  computed: {
+    // 验证字段映射（只验证坐标字段）
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.gaussX && 
+             this.fieldMapping.gaussY
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.map(item => ({
+          pointNumber: item.pointNumber,
+          gaussX: item.gaussX,
+          gaussY: item.gaussY,
+          longitude: item.longitude,
+          latitude: item.latitude
+        }))
+      } else if (this.importedData.length > 0) {
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          gaussX: item.gaussX,
+          gaussY: item.gaussY,
+          longitude: undefined,
+          latitude: undefined
+        }))
+      }
+      return []
     }
-    return types[system] || 'info'
-  }
-  }
+  },
+    
 }
 </script>
 
 <style scoped>
-.gauss-positive-tool {
+.gauss-negative-tool {
   width: 100%;
 }
 
@@ -438,17 +547,37 @@ export default {
   flex-wrap: wrap;
 }
 
-/* 投影面高程设置样式 */
-.height-setting {
+/* 参数设置区域样式 */
+.params-area {
   background: #f5f7fa;
   border-radius: 8px;
-  padding: 12px 20px;
+  padding: 16px 20px;
   margin-bottom: 20px;
   border: 1px solid #e4e7ed;
+}
+
+.params-row {
   display: flex;
-  align-items: center;
-  gap: 20px;
   flex-wrap: wrap;
+  gap: 24px;
+  align-items: center;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-weight: 500;
+  color: #606266;
+  min-width: 40px;
+}
+
+.unit {
+  color: #909399;
+  font-size: 13px;
 }
 
 .result-section {
@@ -555,4 +684,41 @@ export default {
   padding-top: 12px;
   border-top: 1px dashed #e4e7ed;
 }
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 80px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
 </style>

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

@@ -8,14 +8,6 @@
           导入Excel
         </el-button>
 
-        <el-button 
-          type="success" 
-          @click="handlePreview" 
-          size="small" 
-          :disabled="!importedData || importedData.length === 0"
-          icon="el-icon-view">
-          预览数据
-        </el-button>
         <el-button 
           type="warning" 
           @click="handleCalculate" 
@@ -37,52 +29,103 @@
       </div>
     </div>
     
-    <!-- 投影面高程设置 -->
-    <div class="height-setting">
-      <div class="setting-label">
-        <span>投影面高程</span>
-      </div>
-      <div class="setting-content">
-        <el-input 
-          v-model="projectionHeight" 
-          size="small" 
-          style="width: 120px; margin-right: 10px;">
-        </el-input>
-        <span class="unit">米 (m)</span>
+    <!-- 参数设置区域 -->
+    <div class="params-area">
+      <div class="params-row">
+        <div class="params-group">
+          <label class="param-label">投影面高程</label>
+          <el-input 
+            v-model="projectionHeight" 
+            size="small" 
+            style="width: 120px;">
+          </el-input>
+          <span class="unit">米 (m)</span>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">坐标系</label>
+          <el-select v-model="commonParams.coordinateSystem" size="small" style="width: 140px;">
+            <el-option label="WGS84" value="WGS84"></el-option>
+            <el-option label="CGCS2000" value="CGCS2000"></el-option>
+            <el-option label="Beijing54" value="Beijing54"></el-option>
+            <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.longitudePosition" size="small" style="width: 80px;">
+            <el-option label="E" value="E"></el-option>
+            <el-option label="W" value="W"></el-option>
+          </el-select>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">纬度位置</label>
+          <el-select v-model="commonParams.latitudePosition" size="small" style="width: 80px;">
+            <el-option label="N" value="N"></el-option>
+            <el-option label="S" value="S"></el-option>
+          </el-select>
+        </div>
         
+        <div class="params-group">
+          <label class="param-label">带号</label>
+          <el-input v-model.number="commonParams.band" size="small" style="width: 80px;" placeholder="带号"></el-input>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">带宽</label>
+          <el-select v-model="commonParams.bandwidth" size="small" style="width: 80px;">
+            <el-option label="3" :value="3"></el-option>
+            <el-option label="6" :value="6"></el-option>
+          </el-select>
+        </div>
       </div>
     </div>
 
-    <!-- 计算结果展示区 - 只显示计算结果，不包含原始数据 -->
-    <div v-if="calculationResults.length > 0" class="result-section">
+    <!-- 数据展示区 -->
+    <div v-if="displayData.length > 0" class="result-section">
       <div class="section-header">
         <span class="section-title">
           <i class="el-icon-tickets"></i>
-          计算结果
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
         </span>
         <span class="section-info">
-          共 {{ calculationResults.length }} 条计算结果
+          共 {{ displayData.length }} 条数据 | 坐标系：{{ commonParams.coordinateSystem }} | 带号：{{ commonParams.band }} | 带宽：{{ commonParams.bandwidth }}
         </span>
-        <el-button type="text" size="small" @click="handleExport" icon="el-icon-download">
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
           导出结果
         </el-button>
       </div>
       
-      <el-table :data="calculationResults" style="width: 100%" border stripe>
+      <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">
+          <template slot-scope="scope">
+            {{ formatNumber(scope.row.longitude, 9) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitude" label="大地纬度(° ′ ″)" width="150" align="center">
+          <template slot-scope="scope">
+            {{ formatNumber(scope.row.latitude, 9) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="gaussX" label="高斯X坐标(m)" width="180" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.gaussX,4) }}</span>
+            <span v-if="scope.row.gaussX !== undefined" class="result-value">{{ formatNumber(scope.row.gaussX,4) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
         <el-table-column prop="gaussY" label="高斯Y坐标(m)" width="180" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.gaussY,4) }}</span>
+            <span v-if="scope.row.gaussY !== undefined" class="result-value">{{ formatNumber(scope.row.gaussY,4) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
-        <el-table-column prop="meridianConvergence" label="子午线收敛角γ(°)" width="200" align="center">
+        <el-table-column prop="meridianConvergence" label="子午线收敛角γ(° ′ ″)" width="160" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.meridianConvergence, 7) }}</span>
+            <span v-if="scope.row.meridianConvergence !== undefined" class="result-value">{{ formatNumber(scope.row.meridianConvergence, 7) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -91,38 +134,12 @@
     <!-- 空状态 -->
     <div v-else class="empty-state">
       <i class="el-icon-document"></i>
-      <p>暂无计算结果</p>
+      <p>暂无数据</p>
       <p class="empty-tip">请先导入Excel数据，然后点击"执行计算"</p>
     </div>
     
     <!-- 导入Excel对话框 -->
     <el-dialog title="导入Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
-      <div class="import-tips">
-        <el-alert
-          title="Excel模板格式说明"
-          type="info"
-          :closable="false"
-          show-icon>
-          <div class="template-info">
-            <p>请确保Excel文件包含以下列（第一行为表头）：</p>
-            <ul>
-              <li><strong>待求点</strong> - 点号</li>
-              <li><strong>坐标系</strong> - WGS84/CGCS2000/Beijing54/Xian80</li>
-              <li><strong>大地经度</strong> - 经度数值(° ′ ″)</li>
-              <li><strong>经度位置</strong> - E/W</li>
-              <li><strong>大地纬度</strong> - 纬度数值(° ′ ″)</li>
-              <li><strong>纬度位置</strong> - N/S</li>
-              <li><strong>带号</strong> - 带号数值</li>
-              <li><strong>带宽</strong> - 3或6</li>
-            </ul>
-          </div>
-        </el-alert>
-         <div class="template-download-wrapper">
-            <el-button type="primary" plain size="small" @click="handleDownloadTemplate" icon="el-icon-download">
-              下载Excel模板
-            </el-button>
-          </div>
-      </div>
       <div style="text-align: center;">
         <el-upload
           class="upload-area"
@@ -149,6 +166,48 @@
       </span>
     </el-dialog>
     
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="fieldMappingVisible" width="500px" @close="cancelMapping">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          <p>请将Excel中的列映射到对应的坐标字段。</p>
+        </el-alert>
+      </div>
+      
+      <!-- 字段映射区域 -->
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段：</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" placeholder="请选择点号列">
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">经度字段：</label>
+          <el-select v-model="fieldMapping.longitude" class="mapping-select" placeholder="请选择经度列">
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">纬度字段：</label>
+          <el-select v-model="fieldMapping.latitude" class="mapping-select" placeholder="请选择纬度列">
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
+      </span>
+    </el-dialog>
+    
     <!-- 预览数据对话框 - 显示导入的原始数据 -->
     <el-dialog title="导入数据预览" :visible.sync="previewDialogVisible" width="80%">
       <div class="preview-info">
@@ -211,9 +270,27 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
-      previewDialogVisible: false,
       projectionHeight: 0,
       heightTimer: null,
+      //  预览对话框显示控制
+      previewDialogVisible: false, 
+      
+      // 字段映射相关
+      fieldMappingVisible: false,
+      rawImportedData: [],     // 原始导入数据（未映射）
+      excelColumns: [],        // Excel列名
+      fieldMapping: {
+        pointNumber: '',
+        longitude: '',
+        latitude: ''
+      },
+      commonParams: {
+        coordinateSystem: 'CGCS2000',
+        longitudePosition: 'E',
+        latitudePosition: 'N',
+        band: 0,
+        bandwidth: 3
+      }
     }
   },
   watch: {
@@ -233,6 +310,75 @@ export default {
       }
     }
   },
+  computed: {
+    // 验证字段映射（只验证坐标字段）
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.longitude && 
+             this.fieldMapping.latitude
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      if (this.calculationResults.length > 0) {
+        // 只返回需要显示的字段
+        return this.calculationResults.map(item => ({
+          pointNumber: item.pointNumber,
+          longitude: item.longitude,
+          latitude: item.latitude,
+          gaussX: item.gaussX,
+          gaussY: item.gaussY,
+          meridianConvergence: item.meridianConvergence
+        }))
+      } else if (this.importedData.length > 0) {
+        // 将导入数据转换为统一格式，只包含映射字段
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          longitude: item.longitude,
+          latitude: item.latitude,
+          gaussX: undefined,
+          gaussY: undefined,
+          meridianConvergence: undefined
+        }))
+      }
+      return []
+    }
+  },
+  computed: {
+    // 验证字段映射（只验证坐标字段）
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.longitude && 
+             this.fieldMapping.latitude
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults
+      } else if (this.importedData.length > 0) {
+        // 将导入数据转换为统一格式，保留公共参数信息
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          coordinateSystem: this.commonParams.coordinateSystem,
+          band: this.commonParams.band,
+          bandwidth: this.commonParams.bandwidth,
+          longitude: item.longitude,
+          latitude: item.latitude,
+          gaussX: undefined,
+          gaussY: undefined,
+          meridianConvergence: undefined
+        }))
+      }
+      return []
+    }
+  },
   methods: {
     // 打开导入对话框 
     handleImport() {
@@ -256,41 +402,104 @@ export default {
       const formData = new FormData()
       formData.append('file', this.importFile)
       
-        const response = await importExcel(formData)
+      const response = await importExcel(formData)
+      
+      if (response.code === 200) {
+        const result = response.data
         
-        if (response.code === 200) {
-          const result = response.data
-          
-          // 将后端返回的数据转换为前端格式
-          this.importedData = (result.data || []).map(item => ({
-            pointNumber: item.pointNumber,
-            coordinateSystem: item.coordinateSystem,
-            longitude: item.longitude,
-            longitudePosition: item.longitudePosition,
-            latitude: item.latitude,
-            latitudePosition: item.latitudePosition,
-            band: item.band,
-            bandwidth: item.bandwidth
-          }))
-          
-          // 清空之前的计算结果
-          this.calculationResults = []
-          
-          this.$message.success(`${response.msg}`)
-          this.importDialogVisible = false
-          this.importLoading = false
-        } else {
-          this.$message.error(response.msg)
+        // 保存原始数据和列名
+        this.rawImportedData = result.data || []
+        this.excelColumns = result.columns || []
+        
+        // 尝试自动匹配字段
+        this.autoMatchFields()
+        
+        // 清空之前的计算结果
+        this.calculationResults = []
+        
+        this.importDialogVisible = false
+        this.importLoading = false
+        this.fieldMappingVisible = true
+      } else {
+        this.$message.error(response.msg)
+        this.importLoading = false
+      }
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      const matchKeywords = {
+        pointNumber: ['点号', '待求点', '点名', '名称', 'pointNumber', 'ID'],
+        longitude: ['经度', '大地经度', 'lon', 'longitude', 'X'],
+        latitude: ['纬度', '大地纬度', 'lat', 'latitude', 'Y']
+      }
+      
+      Object.keys(matchKeywords).forEach(key => {
+        for (const keyword of matchKeywords[key]) {
+          const matchedCol = this.excelColumns.find(col => 
+            col.includes(keyword) || col.toLowerCase().includes(keyword.toLowerCase())
+          )
+          if (matchedCol) {
+            this.fieldMapping[key] = matchedCol
+            break
+          }
         }
+      })
     },
     
-    // 预览数据 - 显示导入的原始数据
-    handlePreview() {
-      if (!this.importedData || this.importedData.length === 0) {
-        this.$message.warning('没有可预览的数据')
+    // 确认映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有字段映射和参数设置')
         return
       }
-      this.previewDialogVisible = true
+      
+      // 根据映射关系转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        longitude: item[this.fieldMapping.longitude],
+        latitude: item[this.fieldMapping.latitude],
+        coordinateSystem: this.commonParams.coordinateSystem,
+        longitudePosition: this.commonParams.longitudePosition,
+        latitudePosition: this.commonParams.latitudePosition,
+        band: this.commonParams.band,
+        bandwidth: this.commonParams.bandwidth
+      }))
+      
+      this.fieldMappingVisible = false
+      this.$message.success('数据导入成功')
+    },
+    
+    // 取消映射
+    cancelMapping() {
+      this.fieldMappingVisible = false
+      this.rawImportedData = []
+      this.excelColumns = []
+      this.resetFieldMapping()
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        longitude: '',
+        latitude: ''
+      }
+      this.commonParams = {
+        coordinateSystem: 'CGCS2000',
+        longitudePosition: 'E',
+        latitudePosition: 'N',
+        band: 3,
+        bandwidth: 3
+      }
+    },
+    
+    // 参数变化时清除计算结果，提示用户重新计算
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已变更，请重新执行计算')
+      }
     },
     
     // 下载模板
@@ -306,22 +515,21 @@ export default {
         return
       }
       
-      this.calculating = true
-      const results = []
-      let successCount = 0
-      let failCount = 0
+      // 清除之前的计算结果，确保显示最新数据
+      this.calculationResults = []
       
-      // 构建请求参数
+      this.calculating = true
+      // 构建请求参数（使用主界面设置的公共参数）
       const requestData = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
-        coordinateSystem: item.coordinateSystem,
-        longitude: parseFloat(item.longitude),
-        longitudePosition: item.longitudePosition,
-        latitude: parseFloat(item.latitude),
-        latitudePosition: item.latitudePosition,
-        band: parseInt(item.band),
-        bandwidth: parseInt(item.bandwidth),
-        projectionHeight: this.projectionHeight
+        coordinateSystem: this.commonParams.coordinateSystem,
+        longitude: item.longitude,
+        longitudePosition: this.commonParams.longitudePosition,
+        latitude: item.latitude,
+        latitudePosition: this.commonParams.latitudePosition,
+        band: this.commonParams.band,
+        bandwidth: this.commonParams.bandwidth,
+        projectionHeight: this.commonParams.projectionHeight
       }))
       
       const response = await calculate(requestData)
@@ -333,12 +541,12 @@ export default {
         this.calculationResults = results.map(item => ({
           pointNumber: item.pointNumber,
           coordinateSystem: item.coordinateSystem,
-          longitude: parseFloat(item.longitude),
+          longitude: item.longitude,
           longitudePosition: item.longitudePosition,
-          latitude: parseFloat(item.latitude),
+          latitude: item.latitude,
           latitudePosition: item.latitudePosition,
-          band: parseInt(item.band),
-          bandwidth: parseInt(item.bandwidth),
+          band: item.band,
+          bandwidth: item.bandwidth,
           projectionHeight: this.projectionHeight,
           gaussX: item.gaussX,
           gaussY: item.gaussY,
@@ -360,6 +568,7 @@ export default {
         this.calculating = false
         } else {
           this.$message.error(response.msg)
+          this.calculating = false
         }
     },
     
@@ -445,17 +654,37 @@ export default {
   flex-wrap: wrap;
 }
 
-/* 投影面高程设置样式 */
-.height-setting {
+/* 参数设置区域样式 */
+.params-area {
   background: #f5f7fa;
   border-radius: 8px;
-  padding: 12px 20px;
+  padding: 16px 20px;
   margin-bottom: 20px;
   border: 1px solid #e4e7ed;
+}
+
+.params-row {
   display: flex;
-  align-items: center;
-  gap: 20px;
   flex-wrap: wrap;
+  gap: 24px;
+  align-items: center;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-weight: 500;
+  color: #606266;
+  min-width: 40px;
+}
+
+.unit {
+  color: #909399;
+  font-size: 13px;
 }
 
 .result-section {
@@ -562,4 +791,36 @@ export default {
   padding-top: 12px;
   border-top: 1px dashed #e4e7ed;
 }
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 80px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
 </style>

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

@@ -8,14 +8,6 @@
           导入 Excel
         </el-button>
 
-        <el-button 
-          type="success" 
-          @click="handlePreview" 
-          size="small" 
-          :disabled="!importedData || importedData.length === 0"
-          icon="el-icon-view">
-          预览数据
-        </el-button>
         <el-button 
           type="warning" 
           @click="handleCalculate" 
@@ -36,37 +28,101 @@
         </el-button>
       </div>
     </div>
+    
+    <!-- 参数设置区域 -->
+    <div class="params-area">
+      <div class="params-row">
+        <div class="params-group">
+          <label class="param-label">投影面高程</label>
+          <el-input 
+            v-model="commonParams.projectionHeight" 
+            size="small" 
+            style="width: 120px;"
+            @change="onParamsChange">
+          </el-input>
+          <span class="unit">米 (m)</span>
+        </div>
 
-    <!-- 计算结果展示区 -->
-    <div v-if="calculationResults.length > 0" class="result-section">
+        <div class="params-group">
+          <label class="param-label">坐标系</label>
+          <el-select v-model="commonParams.coordinateSystem" size="small" style="width: 140px;" @change="onParamsChange">
+            <el-option label="WGS84" value="WGS84"></el-option>
+            <el-option label="CGCS2000" value="CGCS2000"></el-option>
+            <el-option label="Beijing54" value="Beijing54"></el-option>
+            <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.longitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="E" value="E"></el-option>
+            <el-option label="W" value="W"></el-option>
+          </el-select>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">纬度位置</label>
+          <el-select v-model="commonParams.latitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="N" value="N"></el-option>
+            <el-option label="S" value="S"></el-option>
+          </el-select>
+        </div>
+      </div>
+    </div>
+
+    <!-- 数据展示区域 - 合并显示导入数据和计算结果 -->
+    <div v-if="displayData.length > 0" class="result-section">
       <div class="section-header">
         <span class="section-title">
           <i class="el-icon-tickets"></i>
-          计算结果
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
         </span>
         <span class="section-info">
-          共 {{ calculationResults.length }} 条计算结果
+          共 {{ displayData.length }} 条数据
+          <span v-if="calculationResults.length > 0" style="margin-left: 10px;">
+            | 坐标系：{{ commonParams.coordinateSystem }} | 投影面高程：{{ commonParams.projectionHeight }}m
+          </span>
         </span>
-        <el-button type="text" size="small" @click="handleExport" icon="el-icon-download">
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
           导出结果
         </el-button>
       </div>
       
-      <el-table :data="calculationResults" style="width: 100%" border stripe>
+      <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="spatialX" label="空间直角坐标 X(m)" width="200" align="center">
+        <el-table-column prop="longitude" label="大地经度(° ′ ″)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.spatialX, 4) }}</span>
+            <span>{{ formatNumber(scope.row.longitude, 10) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="spatialY" label="空间直角坐标 Y(m)" width="200" align="center">
+        <el-table-column prop="latitude" label="大地纬度(° ′ ″)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.spatialY, 4) }}</span>
+            <span>{{ formatNumber(scope.row.latitude, 10) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="spatialZ" label="空间直角坐标 Z(m)" width="200" align="center">
+        <el-table-column prop="height" label="大地高(m)" width="120" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.spatialZ, 4) }}</span>
+            <span>{{ formatNumber(scope.row.height, 4) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="spatialX" label="空间直角坐标 X(m)" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.spatialX" class="result-value">{{ formatNumber(scope.row.spatialX, 4) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="spatialY" label="空间直角坐标 Y(m)" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.spatialY" class="result-value">{{ formatNumber(scope.row.spatialY, 4) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="spatialZ" label="空间直角坐标 Z(m)" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.spatialZ" class="result-value">{{ formatNumber(scope.row.spatialZ, 4) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -75,37 +131,12 @@
     <!-- 空状态 -->
     <div v-else class="empty-state">
       <i class="el-icon-document"></i>
-      <p>暂无计算结果</p>
-      <p class="empty-tip">请先导入 Excel 数据，然后点击"执行计算"</p>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入 Excel 数据</p>
     </div>
     
     <!-- 导入 Excel 对话框 -->
     <el-dialog title="导入 Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
-      <div class="import-tips">
-        <el-alert
-          title="Excel 模板格式说明"
-          type="info"
-          :closable="false"
-          show-icon>
-          <div class="template-info">
-            <p>请确保 Excel 文件包含以下列（第一行为表头）：</p>
-            <ul>
-              <li><strong>待求点</strong> - 点号</li>
-              <li><strong>坐标系</strong> - WGS84/CGCS2000/Beijing54/Xian80</li>
-              <li><strong>大地经度</strong> - 经度数值 (°)</li>
-              <li><strong>经度位置</strong> - E/W</li>
-              <li><strong>大地纬度</strong> - 纬度数值 (°)</li>
-              <li><strong>纬度位置</strong> - N/S</li>
-              <li><strong>大地高</strong> - 高程数值 (m)</li>
-            </ul>
-          </div>
-        </el-alert>
-         <div class="template-download-wrapper">
-            <el-button type="primary" plain size="small" @click="handleDownloadTemplate" icon="el-icon-download">
-              下载 Excel 模板
-            </el-button>
-          </div>
-      </div>
       <div style="text-align: center;">
         <el-upload
           class="upload-area"
@@ -132,49 +163,54 @@
       </span>
     </el-dialog>
     
-    <!-- 预览数据对话框 -->
-    <el-dialog title="导入数据预览" :visible.sync="previewDialogVisible" width="80%">
-      <div class="preview-info">
-        <span>共 {{ importedData.length }} 条数据</span>
-        <span style="margin-left: 20px;">状态：{{ importedData.filter(item => item.calculated).length }} 条已计算，{{ importedData.filter(item => !item.calculated).length }} 条未计算</span>
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
       </div>
-      <el-table :data="importedData" border stripe max-height="500">
-        <el-table-column prop="pointNumber" label="待求点号" width="120" fixed="left" align="center"></el-table-column>
-        <el-table-column prop="coordinateSystem" label="坐标系" width="110" align="center">
-          <template slot-scope="scope">
-            <el-tag size="small" :type="getCoordinateType(scope.row.coordinateSystem)">
-              {{ scope.row.coordinateSystem }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="longitude" label="大地经度" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.longitude }}
-          </template>
-        </el-table-column>
-         <el-table-column prop="longitudePosition" label="经度位置" width="100" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.longitudePosition}}
-          </template>
-        </el-table-column>
-        <el-table-column prop="latitude" label="大地纬度" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.latitude }}
-          </template>
-        </el-table-column>
-         <el-table-column prop="latitudePosition" label="纬度位置" width="100" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.latitudePosition}}
-          </template>
-        </el-table-column>
-        <el-table-column prop="height" label="大地高 (m)" width="100" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.height, 4) }}
-          </template>
-        </el-table-column>
-      </el-table>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">大地经度字段</label>
+          <el-select v-model="fieldMapping.longitude" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">大地纬度字段</label>
+          <el-select v-model="fieldMapping.latitude" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">大地高字段</label>
+          <el-select v-model="fieldMapping.height" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="previewDialogVisible = false">关闭</el-button>
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
       </span>
     </el-dialog>
   </div>
@@ -193,7 +229,25 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
-      previewDialogVisible: false,
+      
+      // 公共参数
+      commonParams: {
+        coordinateSystem: 'WGS84',
+        projectionHeight: 0,
+        longitudePosition: 'E',
+        latitudePosition: 'N'
+      },
+      
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        longitude: '',
+        latitude: '',
+        height: ''
+      },
+      rawImportedData: []
     }
   },
   methods: {
@@ -219,40 +273,113 @@ export default {
       const formData = new FormData()
       formData.append('file', this.importFile)
       
-      const response = await importExcel(formData)
-      
-      if (response.code === 200) {
-        const result = response.data
+      try {
+        const response = await importExcel(formData)
         
-        // 将后端返回的数据转换为前端格式
-        this.importedData = (result.data || []).map(item => ({
-          pointNumber: item.pointNumber,
-          coordinateSystem: item.coordinateSystem,
-          longitude: item.longitude,
-          longitudePosition: item.longitudePosition,
-          latitude: item.latitude,
-          latitudePosition: item.latitudePosition,
-          height: item.height
-        }))
-        
-        // 清空之前的计算结果
-        this.calculationResults = []
-        
-        this.$message.success(`${response.msg}`)
-        this.importDialogVisible = false
+        if (response.code === 200) {
+          const result = response.data
+          
+          // 获取Excel列名
+          this.excelColumns = result.columns || this.extractColumns(result.data)
+          
+          // 保存原始数据
+          this.rawImportedData = result.data || []
+          
+          // 清空之前的计算结果
+          this.calculationResults = []
+          
+          // 自动匹配字段
+          this.autoMatchFields()
+          
+          // 显示字段映射对话框
+          this.mappingDialogVisible = true
+          
+          this.$message.success(`${response.msg}`)
+          this.importDialogVisible = false
+          this.importLoading = false
+        } else {
+          this.$message.error(response.msg)
+          this.importLoading = false
+        }
+      } catch (error) {
+        this.$message.error('导入失败')
         this.importLoading = false
-      } else {
-        this.$message.error(response.msg)
       }
     },
     
-    // 预览数据 - 显示导入的原始数据
-    handlePreview() {
-      if (!this.importedData || this.importedData.length === 0) {
-        this.$message.warning('没有可预览的数据')
+    // 提取列名
+    extractColumns(data) {
+      if (!data || data.length === 0) return []
+      return Object.keys(data[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      this.resetFieldMapping()
+      
+      const keywordMap = {
+        pointNumber: ['点号', '待求点', '点', '编号', '序号', 'ID'],
+        longitude: ['大地经度', '经度', 'longitude', 'L', 'B', '经'],
+        latitude: ['大地纬度', '纬度', 'latitude', 'B', '纬'],
+        height: ['大地高', '高程', 'height', 'H', '高']
+      }
+      
+      this.excelColumns.forEach(col => {
+        const lowerCol = col.toLowerCase()
+        Object.keys(keywordMap).forEach(field => {
+          if (!this.fieldMapping[field]) {
+            keywordMap[field].forEach(keyword => {
+              if (col.includes(keyword) || lowerCol.includes(keyword.toLowerCase())) {
+                this.fieldMapping[field] = col
+              }
+            })
+          }
+        })
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有必填字段的映射')
         return
       }
-      this.previewDialogVisible = true
+      
+      // 根据映射转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        longitude: item[this.fieldMapping.longitude],
+        latitude: item[this.fieldMapping.latitude],
+        height: item[this.fieldMapping.height]
+      }))
+      
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+      this.rawImportedData = []
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        longitude: '',
+        latitude: '',
+        height: ''
+      }
+    },
+    
+    // 参数变化时清空计算结果
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已更新，请重新执行计算')
+      }
     },
     
     // 下载模板
@@ -272,11 +399,12 @@ export default {
       // 构建请求参数
       const requestData = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
-        coordinateSystem: item.coordinateSystem,
+        coordinateSystem: this.commonParams.coordinateSystem,
+        projectionHeight: parseFloat(this.commonParams.projectionHeight) || 0,
         longitude: parseFloat(item.longitude),
-        longitudePosition: item.longitudePosition,
+        longitudePosition: this.commonParams.longitudePosition,
         latitude: parseFloat(item.latitude),
-        latitudePosition: item.latitudePosition,
+        latitudePosition: this.commonParams.latitudePosition,
         height: parseFloat(item.height) || 0
       }))
       
@@ -290,31 +418,26 @@ export default {
           pointNumber: item.pointNumber,
           coordinateSystem: item.coordinateSystem,
           longitude: item.longitude,
-          longitudePosition: item.longitudePosition,
           latitude: item.latitude,
-          latitudePosition: item.latitudePosition,
           height: item.height,
+          band: item.band,
+          longitudePosition: item.longitudePosition,
+          latitudePosition: item.latitudePosition,
           spatialX: item.spatialX,
           spatialY: item.spatialY,
-          spatialZ: item.spatialZ
+          spatialZ: item.spatialZ,
+          projectionHeight: item.projectionHeight,
         }))
         
-        // 更新导入数据的计算状态
-        this.importedData.forEach(importItem => {
-          const found = results.find(r => r.pointNumber === importItem.pointNumber)
-          if (found && found.spatialX !== -1) {
-            importItem.calculated = true
-          }
-        })
-        
-        const successCount = results.filter(r => r.spatialX !== -1).length
+        const successCount = results.filter(r => r.spatialX !== undefined && r.spatialX !== -1).length
         const failCount = results.length - successCount
         
         this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
-        this.calculating = false
       } else {
         this.$message.error(response.msg)
       }
+      
+      this.calculating = false
     },
     
     // 导出结果
@@ -370,17 +493,58 @@ export default {
     },
     
     // 获取坐标系标签类型
-    getCoordinateType(system) {
-      const types = {
-        'WGS84': 'primary',
-        'CGCS2000': 'success',
-        'Beijing54': 'warning',
-        'Xian80': 'info'
-      }
-      return types[system] || 'info'
+  getCoordinateType(system) {
+    const types = {
+      'WGS84': 'primary',
+      'CGCS2000': 'success',
+      'Beijing54': 'warning',
+      'Xian80': 'info'
     }
+    return types[system] || 'info'
   }
+},
+
+computed: {
+  // 验证字段映射
+  validateMapping() {
+    if (!this.fieldMapping) {
+      return false
+    }
+    return this.fieldMapping.pointNumber && 
+           this.fieldMapping.longitude && 
+           this.fieldMapping.latitude && 
+           this.fieldMapping.height
+  },
+  
+  // 显示数据：优先显示计算结果，否则显示导入数据
+  displayData() {
+    if (this.calculationResults.length > 0) {
+      return this.calculationResults.map(item => ({
+        pointNumber: item.pointNumber,
+        longitude: item.longitude,
+        latitude: item.latitude,
+        height: item.height,
+        spatialX: item.spatialX,
+        spatialY: item.spatialY,
+        spatialZ: item.spatialZ
+      }))
+    } else if (this.importedData.length > 0) {
+      return this.importedData.map(item => ({
+        pointNumber: item.pointNumber,
+        longitude: item.longitude,
+        latitude: item.latitude,
+        height: item.height,
+        spatialX: undefined,
+        spatialY: undefined,
+        spatialZ: undefined
+      }))
+    }
+    return []
+  }
+}
 }
+
+
 </script>
 
 <style scoped>
@@ -398,6 +562,43 @@ export default {
   flex-wrap: wrap;
 }
 
+/* 参数设置区域样式 */
+.params-area {
+  background: #f5f7fa;
+  border-radius: 8px;
+  padding: 16px 20px;
+  margin-bottom: 20px;
+  border: 1px solid #e4e7ed;
+}
+
+.params-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 24px;
+  align-items: center;
+}
+
+.params-row + .params-row {
+  margin-top: 12px;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-weight: 500;
+  color: #606266;
+  min-width: 40px;
+}
+
+.unit {
+  color: #909399;
+  font-size: 13px;
+}
+
 .result-section {
   margin-top: 10px;
 }
@@ -435,6 +636,10 @@ export default {
   font-weight: 500;
 }
 
+.empty-cell {
+  color: #c0c4cc;
+}
+
 .empty-state {
   text-align: center;
   padding: 60px 20px;
@@ -502,4 +707,41 @@ export default {
   padding-top: 12px;
   border-top: 1px dashed #e4e7ed;
 }
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 120px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
 </style>

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

@@ -8,14 +8,6 @@
           导入 Excel
         </el-button>
 
-        <el-button 
-          type="success" 
-          @click="handlePreview" 
-          size="small" 
-          :disabled="!importedData || importedData.length === 0"
-          icon="el-icon-view">
-          预览数据
-        </el-button>
         <el-button 
           type="warning" 
           @click="handleCalculate" 
@@ -36,47 +28,96 @@
         </el-button>
       </div>
     </div>
+    
+    <!-- 参数设置区域 -->
+    <div class="params-area">
+      <div class="params-row">
+        <div class="params-group">
+          <label class="param-label">投影面高程</label>
+          <el-input 
+            v-model="commonParams.projectionHeight" 
+            size="small" 
+            style="width: 120px;"
+            @change="onParamsChange">
+          </el-input>
+          <span class="unit">米 (m)</span>
+        </div>
+
+        <div class="params-group">
+          <label class="param-label">坐标系</label>
+          <el-select v-model="commonParams.coordinateSystem" size="small" style="width: 140px;" @change="onParamsChange">
+            <el-option label="WGS84" value="WGS84"></el-option>
+            <el-option label="CGCS2000" value="CGCS2000"></el-option>
+            <el-option label="Beijing54" value="Beijing54"></el-option>
+            <el-option label="Xian80" value="Xian80"></el-option>
+          </el-select>
+        </div>
+      </div>
+    </div>
 
-    <!-- 计算结果展示区 -->
-    <div v-if="calculationResults.length > 0" class="result-section">
+    <!-- 数据展示区域 - 合并显示导入数据和计算结果 -->
+    <div v-if="displayData.length > 0" class="result-section">
       <div class="section-header">
         <span class="section-title">
           <i class="el-icon-tickets"></i>
-          计算结果
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
         </span>
         <span class="section-info">
-          共 {{ calculationResults.length }} 条计算结果
+          共 {{ displayData.length }} 条数据
+          <span v-if="calculationResults.length > 0" style="margin-left: 10px;">
+            | 坐标系：{{ commonParams.coordinateSystem }} | 投影面高程：{{ commonParams.projectionHeight }}m
+          </span>
         </span>
-        <el-button type="text" size="small" @click="handleExport" icon="el-icon-download">
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
           导出结果
         </el-button>
       </div>
       
-      <el-table :data="calculationResults" style="width: 100%" border stripe>
+      <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="180" align="center">
+        <el-table-column prop="spatialX" label="空间直角坐标 X(m)" width="150" align="center">
+          <template slot-scope="scope">
+            <span>{{ formatNumber(scope.row.spatialX, 4) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="spatialY" label="空间直角坐标 Y(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.longitude, 9) }}</span>
+            <span>{{ formatNumber(scope.row.spatialY, 4) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="longitudePosition" label="经度位置" width="100" align="center">
+        <el-table-column prop="spatialZ" label="空间直角坐标 Z(m)" width="150" align="center">
           <template slot-scope="scope">
-            <el-tag size="small" type="primary">{{ scope.row.longitudePosition }}</el-tag>
+            <span>{{ formatNumber(scope.row.spatialZ, 4) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="latitude" label="大地纬度(°)" width="180" align="center">
+        <el-table-column prop="longitude" label="大地经度(° ′ ″)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.latitude, 9) }}</span>
+            <span v-if="scope.row.longitude" class="result-value">{{ formatNumber(scope.row.longitude, 10) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
-        <el-table-column prop="latitudePosition" label="纬度位置" width="100" align="center">
+        <el-table-column prop="longitudePosition" label="经度位置" width="150" align="center">
           <template slot-scope="scope">
-            <el-tag size="small" type="success">{{ scope.row.latitudePosition }}</el-tag>
+            <span v-if="scope.row.longitudePosition" class="result-value">{{ scope.row.longitudePosition }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitude" label="大地纬度(° ′ ″)" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.latitude" class="result-value">{{ formatNumber(scope.row.latitude, 10) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitudePosition" label="纬度位置" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.latitudePosition" class="result-value">{{ scope.row.latitudePosition }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
         <el-table-column prop="height" label="大地高(m)" width="120" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.height, 4) }}</span>
+            <span v-if="scope.row.height" class="result-value">{{ formatNumber(scope.row.height, 4) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -85,35 +126,12 @@
     <!-- 空状态 -->
     <div v-else class="empty-state">
       <i class="el-icon-document"></i>
-      <p>暂无计算结果</p>
-      <p class="empty-tip">请先导入 Excel 数据，然后点击"执行计算"</p>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入 Excel 数据</p>
     </div>
     
     <!-- 导入 Excel 对话框 -->
     <el-dialog title="导入 Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
-      <div class="import-tips">
-        <el-alert
-          title="Excel 模板格式说明"
-          type="info"
-          :closable="false"
-          show-icon>
-          <div class="template-info">
-            <p>请确保 Excel 文件包含以下列（第一行为表头）：</p>
-            <ul>
-              <li><strong>待求点</strong> - 点号</li>
-              <li><strong>坐标系</strong> - WGS84/CGCS2000/Beijing54/Xian80</li>
-              <li><strong>空间直角坐标X</strong> - X坐标值 (m)</li>
-              <li><strong>空间直角坐标Y</strong> - Y坐标值 (m)</li>
-              <li><strong>空间直角坐标Z</strong> - Z坐标值 (m)</li>
-            </ul>
-          </div>
-        </el-alert>
-         <div class="template-download-wrapper">
-            <el-button type="primary" plain size="small" @click="handleDownloadTemplate" icon="el-icon-download">
-              下载 Excel 模板
-            </el-button>
-          </div>
-      </div>
       <div style="text-align: center;">
         <el-upload
           class="upload-area"
@@ -140,39 +158,54 @@
       </span>
     </el-dialog>
     
-    <!-- 预览数据对话框 -->
-    <el-dialog title="导入数据预览" :visible.sync="previewDialogVisible" width="80%">
-      <div class="preview-info">
-        <span>共 {{ importedData.length }} 条数据</span>
-        <span style="margin-left: 20px;">状态：{{ importedData.filter(item => item.calculated).length }} 条已计算，{{ importedData.filter(item => !item.calculated).length }} 条未计算</span>
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
       </div>
-      <el-table :data="importedData" border stripe max-height="500">
-        <el-table-column prop="pointNumber" label="待求点号" width="120" fixed="left" align="center"></el-table-column>
-        <el-table-column prop="coordinateSystem" label="坐标系" width="110" align="center">
-          <template slot-scope="scope">
-            <el-tag size="small" :type="getCoordinateType(scope.row.coordinateSystem)">
-              {{ scope.row.coordinateSystem }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="spatialX" label="空间X坐标" width="150" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.spatialX, 4) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="spatialY" label="空间Y坐标" width="150" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.spatialY, 4) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="spatialZ" label="空间Z坐标" width="150" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.spatialZ, 4) }}
-          </template>
-        </el-table-column>
-      </el-table>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">空间X坐标字段</label>
+          <el-select v-model="fieldMapping.spatialX" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">空间Y坐标字段</label>
+          <el-select v-model="fieldMapping.spatialY" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">空间Z坐标字段</label>
+          <el-select v-model="fieldMapping.spatialZ" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="previewDialogVisible = false">关闭</el-button>
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
       </span>
     </el-dialog>
   </div>
@@ -191,7 +224,23 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
-      previewDialogVisible: false,
+      
+      // 公共参数
+      commonParams: {
+        projectionHeight: 0,
+        coordinateSystem: 'WGS84'
+      },
+      
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        spatialX: '',
+        spatialY: '',
+        spatialZ: ''
+      },
+      rawImportedData: []
     }
   },
   methods: {
@@ -217,38 +266,113 @@ export default {
       const formData = new FormData()
       formData.append('file', this.importFile)
       
-      const response = await importExcel(formData)
-      
-      if (response.code === 200) {
-        const result = response.data
+      try {
+        const response = await importExcel(formData)
         
-        // 将后端返回的数据转换为前端格式
-        this.importedData = (result.data || []).map(item => ({
-          pointNumber: item.pointNumber,
-          coordinateSystem: item.coordinateSystem,
-          spatialX: item.spatialX,
-          spatialY: item.spatialY,
-          spatialZ: item.spatialZ
-        }))
-        
-        // 清空之前的计算结果
-        this.calculationResults = []
-        
-        this.$message.success(`${response.msg}`)
-        this.importDialogVisible = false
+        if (response.code === 200) {
+          const result = response.data
+          
+          // 获取Excel列名
+          this.excelColumns = result.columns || this.extractColumns(result.data)
+          
+          // 保存原始数据
+          this.rawImportedData = result.data || []
+          
+          // 清空之前的计算结果
+          this.calculationResults = []
+          
+          // 自动匹配字段
+          this.autoMatchFields()
+          
+          // 显示字段映射对话框
+          this.mappingDialogVisible = true
+          
+          this.$message.success(`${response.msg}`)
+          this.importDialogVisible = false
+          this.importLoading = false
+        } else {
+          this.$message.error(response.msg)
+          this.importLoading = false
+        }
+      } catch (error) {
+        this.$message.error('导入失败')
         this.importLoading = false
-      } else {
-        this.$message.error(response.msg)
       }
     },
     
-    // 预览数据 - 显示导入的原始数据
-    handlePreview() {
-      if (!this.importedData || this.importedData.length === 0) {
-        this.$message.warning('没有可预览的数据')
+    // 提取列名
+    extractColumns(data) {
+      if (!data || data.length === 0) return []
+      return Object.keys(data[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      this.resetFieldMapping()
+      
+      const keywordMap = {
+        pointNumber: ['点号', '待求点', '点', '编号', '序号', 'ID'],
+        spatialX: ['空间直角坐标X', '空间X', 'X坐标', 'X', 'x'],
+        spatialY: ['空间直角坐标Y', '空间Y', 'Y坐标', 'Y', 'y'],
+        spatialZ: ['空间直角坐标Z', '空间Z', 'Z坐标', 'Z', 'z']
+      }
+      
+      this.excelColumns.forEach(col => {
+        const lowerCol = col.toLowerCase()
+        Object.keys(keywordMap).forEach(field => {
+          if (!this.fieldMapping[field]) {
+            keywordMap[field].forEach(keyword => {
+              if (col.includes(keyword) || lowerCol.includes(keyword.toLowerCase())) {
+                this.fieldMapping[field] = col
+              }
+            })
+          }
+        })
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有必填字段的映射')
         return
       }
-      this.previewDialogVisible = true
+      
+      // 根据映射转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        spatialX: item[this.fieldMapping.spatialX],
+        spatialY: item[this.fieldMapping.spatialY],
+        spatialZ: item[this.fieldMapping.spatialZ]
+      }))
+      
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+      this.rawImportedData = []
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        spatialX: '',
+        spatialY: '',
+        spatialZ: ''
+      }
+    },
+    
+    // 参数变化时清空计算结果
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已更新，请重新执行计算')
+      }
     },
     
     // 下载模板
@@ -268,7 +392,8 @@ export default {
       // 构建请求参数
       const requestData = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
-        coordinateSystem: item.coordinateSystem,
+        projectionHeight: parseFloat(this.commonParams.projectionHeight) || 0,
+        coordinateSystem: this.commonParams.coordinateSystem,
         spatialX: parseFloat(item.spatialX),
         spatialY: parseFloat(item.spatialY),
         spatialZ: parseFloat(item.spatialZ)
@@ -282,33 +407,27 @@ export default {
         // 更新计算结果
         this.calculationResults = results.map(item => ({
           pointNumber: item.pointNumber,
-          coordinateSystem: item.coordinateSystem,
           spatialX: item.spatialX,
           spatialY: item.spatialY,
           spatialZ: item.spatialZ,
           longitude: item.longitude,
-          longitudePosition: item.longitudePosition,
           latitude: item.latitude,
+          height: item.height,
+          coordinateSystem: item.coordinateSystem,
+          longitudePosition: item.longitudePosition,
           latitudePosition: item.latitudePosition,
-          height: item.height
+          projectionHeight: item.projectionHeight,
         }))
         
-        // 更新导入数据的计算状态
-        this.importedData.forEach(importItem => {
-          const found = results.find(r => r.pointNumber === importItem.pointNumber)
-          if (found && found.longitude !== -1) {
-            importItem.calculated = true
-          }
-        })
-        
-        const successCount = results.filter(r => r.longitude !== -1).length
+        const successCount = results.filter(r => r.longitude !== undefined && r.longitude !== -1).length
         const failCount = results.length - successCount
         
         this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
-        this.calculating = false
       } else {
         this.$message.error(response.msg)
       }
+      
+      this.calculating = false
     },
     
     // 导出结果
@@ -373,6 +492,47 @@ export default {
       }
       return types[system] || 'info'
     }
+  },
+  
+  computed: {
+    // 验证字段映射
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.spatialX && 
+             this.fieldMapping.spatialY && 
+             this.fieldMapping.spatialZ
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    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 []
+    }
   }
 }
 </script>
@@ -496,4 +656,78 @@ export default {
   padding-top: 12px;
   border-top: 1px dashed #e4e7ed;
 }
+
+/* 参数设置区域样式 */
+.params-area {
+  background: #f5f7fa;
+  border-radius: 8px;
+  padding: 16px 20px;
+  margin-bottom: 20px;
+  border: 1px solid #e4e7ed;
+}
+
+.params-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 24px;
+  align-items: center;
+}
+
+.params-row + .params-row {
+  margin-top: 12px;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-weight: 500;
+  color: #606266;
+  min-width: 40px;
+}
+
+.unit {
+  color: #909399;
+  font-size: 13px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 120px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
 </style>

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

@@ -8,14 +8,6 @@
           导入Excel
         </el-button>
 
-        <el-button 
-          type="success" 
-          @click="handlePreview" 
-          size="small" 
-          :disabled="!importedData || importedData.length === 0"
-          icon="el-icon-view">
-          预览数据
-        </el-button>
         <el-button 
           type="warning" 
           @click="handleCalculate" 
@@ -37,47 +29,99 @@
       </div>
     </div>
     
-    <!-- 投影面高程设置 -->
-    <div class="height-setting">
-      <div class="setting-label">
-        <span>投影面高程</span>
-      </div>
-      <div class="setting-content">
-        <el-input 
-          v-model="projectionHeight" 
-          size="small" 
-          style="width: 120px; margin-right: 10px;">
-        </el-input>
-        <span class="unit">米 (m)</span>
+    <!-- 参数设置区域 -->
+    <div class="params-area">
+      <div class="params-row">
+        <div class="params-group">
+          <label class="param-label">投影面高程</label>
+          <el-input 
+            v-model="projectionHeight" 
+            size="small" 
+            style="width: 120px;">
+          </el-input>
+          <span class="unit">米 (m)</span>
+        </div>
         
+        <div class="params-group">
+          <label class="param-label">坐标系</label>
+          <el-select v-model="commonParams.coordinateSystem" size="small" style="width: 140px;" @change="onParamsChange">
+            <el-option label="WGS84" value="WGS84"></el-option>
+            <el-option label="CGCS2000" value="CGCS2000"></el-option>
+            <el-option label="Beijing54" value="Beijing54"></el-option>
+            <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.longitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="E" value="E"></el-option>
+            <el-option label="W" value="W"></el-option>
+          </el-select>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">纬度位置</label>
+          <el-select v-model="commonParams.latitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="N" value="N"></el-option>
+            <el-option label="S" value="S"></el-option>
+          </el-select>
+        </div>
+        
+        <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>
+        </div>
+        
+        <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>
+        </div>
       </div>
     </div>
 
-    <!-- 计算结果展示区 - 只显示计算结果，不包含原始数据 -->
-    <div v-if="calculationResults.length > 0" class="result-section">
+    <!-- 数据展示区域 - 合并显示导入数据和计算结果 -->
+    <div v-if="displayData.length > 0" class="result-section">
       <div class="section-header">
         <span class="section-title">
           <i class="el-icon-tickets"></i>
-          计算结果
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
         </span>
         <span class="section-info">
-          共 {{ calculationResults.length }} 条计算结果
+          共 {{ displayData.length }} 条数据
+          <span v-if="calculationResults.length > 0" style="margin-left: 10px;">
+            | 坐标系：{{ commonParams.coordinateSystem }}
+            | 原带号：{{ commonParams.band }}
+            | 新带号：{{ commonParams.newBand }}
+          </span>
         </span>
-        <el-button type="text" size="small" @click="handleExport" icon="el-icon-download">
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
           导出结果
         </el-button>
       </div>
       
-      <el-table :data="calculationResults" style="width: 100%" border stripe>
+      <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="newUtmX" label="UTM坐标x(m)" width="180" align="center">
+        <el-table-column prop="utmX" label="原UTM坐标X(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.newUtmX,4) }}</span>
+            <span>{{ formatNumber(scope.row.utmX, 4) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="newUtmY" label="UTM坐标y(m)" width="180" align="center">
+        <el-table-column prop="utmY" label="原UTM坐标Y(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.newUtmY,4) }}</span>
+            <span>{{ formatNumber(scope.row.utmY, 4) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="newUtmX" label="新UTM坐标X(m)" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.newUtmX" class="result-value">{{ formatNumber(scope.row.newUtmX, 4) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="newUtmY" label="新UTM坐标Y(m)" width="150" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.newUtmY" class="result-value">{{ formatNumber(scope.row.newUtmY, 4) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -86,38 +130,12 @@
     <!-- 空状态 -->
     <div v-else class="empty-state">
       <i class="el-icon-document"></i>
-      <p>暂无计算结果</p>
-      <p class="empty-tip">请先导入Excel数据，然后点击"执行计算"</p>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入Excel数据</p>
     </div>
     
     <!-- 导入Excel对话框 -->
     <el-dialog title="导入Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
-      <div class="import-tips">
-        <el-alert
-          title="Excel模板格式说明"
-          type="info"
-          :closable="false"
-          show-icon>
-          <div class="template-info">
-            <p>请确保Excel文件包含以下列（第一行为表头）：</p>
-            <ul>
-              <li><strong>待求点</strong> - 点号</li>
-              <li><strong>坐标系</strong> - WGS84/CGCS2000/Beijing54/Xian80</li>
-              <li><strong>UTM坐标X</strong> - (m)</li>
-              <li><strong>UTM坐标Y</strong> - (m)</li>
-              <li><strong>带号</strong> - 带号数值</li>
-              <li><strong>新带号</strong> - 新带号数值</li>
-              <li><strong>经度位置</strong> - E/W</li>
-              <li><strong>纬度位置</strong> - N/S</li>
-            </ul>
-          </div>
-        </el-alert>
-         <div class="template-download-wrapper">
-            <el-button type="primary" plain size="small" @click="handleDownloadTemplate" icon="el-icon-download">
-              下载Excel模板
-            </el-button>
-          </div>
-      </div>
       <div style="text-align: center;">
         <el-upload
           class="upload-area"
@@ -144,54 +162,47 @@
       </span>
     </el-dialog>
     
-    <!-- 预览数据对话框 - 显示导入的原始数据 -->
-    <el-dialog title="导入数据预览" :visible.sync="previewDialogVisible" width="80%">
-      <div class="preview-info">
-        <span>共 {{ importedData.length }} 条数据</span>
-        <span style="margin-left: 20px;">状态：{{ importedData.filter(item => item.calculated).length }} 条已计算，{{ importedData.filter(item => !item.calculated).length }} 条未计算</span>
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
       </div>
-      <el-table :data="importedData" border stripe max-height="500">
-        <el-table-column prop="pointNumber" label="待求点号" width="120" fixed="left" align="center"></el-table-column>
-        <el-table-column prop="coordinateSystem" label="坐标系" width="110" align="center">
-          <template slot-scope="scope">
-            <el-tag size="small" :type="getCoordinateType(scope.row.coordinateSystem)">
-              {{ scope.row.coordinateSystem }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="utmX" label="UTM X坐标(m)" width="130" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.utmX,4) }}
-          </template>
-        </el-table-column>
-         <el-table-column prop="utmY" label="UTM Y坐标(m)" width="130" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.utmY,4) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="band" label="带号" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.band}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="newBand" label="新带号" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.newBand}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="longitudePosition" label="经度位置" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.longitudePosition}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="latitudePosition" label="纬度位置" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.latitudePosition}}
-                   </template>
-        </el-table-column>
-      </el-table>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">UTM坐标X字段</label>
+          <el-select v-model="fieldMapping.utmX" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">UTM坐标Y字段</label>
+          <el-select v-model="fieldMapping.utmY" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="previewDialogVisible = false">关闭</el-button>
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
       </span>
     </el-dialog>
   </div>
@@ -201,7 +212,7 @@
 import { calculate, importExcel,exportExcel,downloadTemplate } from '@/api/calculate/utmbandchange'
 
 export default {
-  name: 'UTMBandChangeTool',    
+  name: 'UTMBandChangeTool',
   data() {
     return {
       importedData: [],        // 导入的原始数据
@@ -210,8 +221,27 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
-      previewDialogVisible: false,
-      projectionHeight: 0
+      projectionHeight: 0,
+      heightTimer: null,
+      
+      // 公共参数
+      commonParams: {
+        coordinateSystem: 'WGS84',
+        longitudePosition: 'E',
+        latitudePosition: 'N',
+        band: 0,
+        newBand: 0
+      },
+      
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        utmX: '',
+        utmY: ''
+      },
+      rawImportedData: []
     }
   },
   watch: {
@@ -254,40 +284,110 @@ export default {
       const formData = new FormData()
       formData.append('file', this.importFile)
       
+      try {
         const response = await importExcel(formData)
         
         if (response.code === 200) {
           const result = response.data
-          // 将后端返回的数据转换为前端格式
-          this.importedData = (result.data || []).map(item => ({
-            pointNumber: item.pointNumber,
-            coordinateSystem: item.coordinateSystem,
-            utmX: item.utmX,
-            utmY: item.utmY,
-            band: item.band,
-            newBand: item.newBand,
-            longitudePosition: item.longitudePosition,
-            latitudePosition: item.latitudePosition
-          }))
+          
+          // 获取Excel列名
+          this.excelColumns = result.columns || this.extractColumns(result.data)
+          
+          // 保存原始数据
+          this.rawImportedData = result.data || []
           
           // 清空之前的计算结果
           this.calculationResults = []
           
+          // 自动匹配字段
+          this.autoMatchFields()
+          
+          // 显示字段映射对话框
+          this.mappingDialogVisible = true
+          
           this.$message.success(`${response.msg}`)
           this.importDialogVisible = false
           this.importLoading = false
         } else {
           this.$message.error(response.msg)
+          this.importLoading = false
         }
+      } catch (error) {
+        this.$message.error('导入失败')
+        this.importLoading = false
+      }
     },
     
-    // 预览数据 - 显示导入的原始数据
-    handlePreview() {
-      if (!this.importedData || this.importedData.length === 0) {
-        this.$message.warning('没有可预览的数据')
+    // 提取列名
+    extractColumns(data) {
+      if (!data || data.length === 0) return []
+      return Object.keys(data[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      this.resetFieldMapping()
+      
+      const keywordMap = {
+        pointNumber: ['点号', '待求点', '点', '编号', '序号', 'ID'],
+        utmX: ['UTM坐标X', 'utmX', 'X坐标', 'x', 'X', '东坐标'],
+        utmY: ['UTM坐标Y', 'utmY', 'Y坐标', 'y', 'Y', '北坐标']
+      }
+      
+      this.excelColumns.forEach(col => {
+        const lowerCol = col.toLowerCase()
+        Object.keys(keywordMap).forEach(field => {
+          if (!this.fieldMapping[field]) {
+            keywordMap[field].forEach(keyword => {
+              if (col.includes(keyword) || lowerCol.includes(keyword.toLowerCase())) {
+                this.fieldMapping[field] = col
+              }
+            })
+          }
+        })
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有必填字段的映射')
         return
       }
-      this.previewDialogVisible = true
+      
+      // 根据映射转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        utmX: item[this.fieldMapping.utmX],
+        utmY: item[this.fieldMapping.utmY]
+      }))
+      
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+      this.rawImportedData = []
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        utmX: '',
+        utmY: ''
+      }
+    },
+    
+    // 参数变化时清空计算结果
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已更新，请重新执行计算')
+      }
     },
     
     // 下载模板
@@ -304,20 +404,17 @@ export default {
       }
       
       this.calculating = true
-      const results = []
-      let successCount = 0
-      let failCount = 0
       
       // 构建请求参数
       const requestData = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
-        coordinateSystem: item.coordinateSystem,
-        utmX: item.utmX,
-        utmY: item.utmY,
-        band: item.band,
-        newBand: item.newBand,
-        longitudePosition: item.longitudePosition,
-        latitudePosition: item.latitudePosition,
+        coordinateSystem: this.commonParams.coordinateSystem,
+        utmX: parseFloat(item.utmX),
+        utmY: parseFloat(item.utmY),
+        band: this.commonParams.band,
+        newBand: this.commonParams.newBand,
+        longitudePosition: this.commonParams.longitudePosition,
+        latitudePosition: this.commonParams.latitudePosition,
         projectionHeight: this.projectionHeight
       }))
       
@@ -332,31 +429,24 @@ export default {
           coordinateSystem: item.coordinateSystem,
           utmX: item.utmX,
           utmY: item.utmY,
+          newUtmX: item.newUtmX,
+          newUtmY: item.newUtmY,
           band: item.band,
           newBand: item.newBand,
           longitudePosition: item.longitudePosition,
           latitudePosition: item.latitudePosition,
-          newUtmX: item.newUtmX,
-          newUtmY: item.newUtmY,
-          projectionHeight: this.projectionHeight
+          projectionHeight: item.projectionHeight,
         }))
         
-        // 更新导入数据的计算状态
-        this.importedData.forEach(importItem => {
-          const found = results.find(r => r.pointNumber === importItem.pointNumber)
-          if (found && found.utmX !== -1) {
-            importItem.calculated = true
-          }
-        })
-        
-        const successCount = results.filter(r => r.utmX !== -1).length
+        const successCount = results.filter(r => r.newUtmX !== undefined && r.newUtmX !== -1).length
         const failCount = results.length - successCount
         
         this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
-        this.calculating = false
-        } else {
-          this.$message.error(response.msg)
-        }
+      } else {
+        this.$message.error(response.msg)
+      }
+      
+      this.calculating = false
     },
     
     
@@ -422,6 +512,40 @@ export default {
     }
     return types[system] || 'info'
   }
+  },
+  
+  computed: {
+    // 验证字段映射
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.utmX && 
+             this.fieldMapping.utmY
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      if (this.calculationResults.length > 0) {
+        return this.calculationResults.map(item => ({
+          pointNumber: item.pointNumber,
+          utmX: item.utmX,
+          utmY: item.utmY,
+          newUtmX: item.newUtmX,
+          newUtmY: item.newUtmY
+        }))
+      } else if (this.importedData.length > 0) {
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          utmX: item.utmX,
+          utmY: item.utmY,
+          newUtmX: undefined,
+          newUtmY: undefined
+        }))
+      }
+      return []
+    }
   }
 }
 </script>
@@ -441,17 +565,41 @@ export default {
   flex-wrap: wrap;
 }
 
-/* 投影面高程设置样式 */
-.height-setting {
+/* 参数设置区域样式 */
+.params-area {
   background: #f5f7fa;
   border-radius: 8px;
-  padding: 12px 20px;
+  padding: 16px 20px;
   margin-bottom: 20px;
   border: 1px solid #e4e7ed;
+}
+
+.params-row {
   display: flex;
-  align-items: center;
-  gap: 20px;
   flex-wrap: wrap;
+  gap: 24px;
+  align-items: center;
+}
+
+.params-row + .params-row {
+  margin-top: 12px;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-weight: 500;
+  color: #606266;
+  min-width: 40px;
+}
+
+.unit {
+  color: #909399;
+  font-size: 13px;
 }
 
 .result-section {
@@ -491,6 +639,10 @@ export default {
   font-weight: 500;
 }
 
+.empty-cell {
+  color: #c0c4cc;
+}
+
 .empty-state {
   text-align: center;
   padding: 60px 20px;
@@ -558,4 +710,40 @@ export default {
   padding-top: 12px;
   border-top: 1px dashed #e4e7ed;
 }
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 120px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
 </style>

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

@@ -8,14 +8,6 @@
           导入Excel
         </el-button>
 
-        <el-button 
-          type="success" 
-          @click="handlePreview" 
-          size="small" 
-          :disabled="!importedData || importedData.length === 0"
-          icon="el-icon-view">
-          预览数据
-        </el-button>
         <el-button 
           type="warning" 
           @click="handleCalculate" 
@@ -37,47 +29,93 @@
       </div>
     </div>
     
-    <!-- 投影面高程设置 -->
-    <div class="height-setting">
-      <div class="setting-label">
-        <span>投影面高程</span>
-      </div>
-      <div class="setting-content">
-        <el-input 
-          v-model="projectionHeight" 
-          size="small" 
-          style="width: 120px; margin-right: 10px;">
-        </el-input>
-        <span class="unit">米 (m)</span>
+    <!-- 参数设置区域 -->
+    <div class="params-area">
+      <div class="params-row">
+        <div class="params-group">
+          <label class="param-label">投影面高程</label>
+          <el-input 
+            v-model="projectionHeight" 
+            size="small" 
+            style="width: 120px;">
+          </el-input>
+          <span class="unit">米 (m)</span>
+        </div>
         
+        <div class="params-group">
+          <label class="param-label">坐标系</label>
+          <el-select v-model="commonParams.coordinateSystem" size="small" style="width: 140px;" @change="onParamsChange">
+            <el-option label="WGS84" value="WGS84"></el-option>
+            <el-option label="CGCS2000" value="CGCS2000"></el-option>
+            <el-option label="Beijing54" value="Beijing54"></el-option>
+            <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.longitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="E" value="E"></el-option>
+            <el-option label="W" value="W"></el-option>
+          </el-select>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">纬度位置</label>
+          <el-select v-model="commonParams.latitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="N" value="N"></el-option>
+            <el-option label="S" value="S"></el-option>
+          </el-select>
+        </div>
+        
+        <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>
+        </div>
       </div>
     </div>
 
-    <!-- 计算结果展示区 - 只显示计算结果，不包含原始数据 -->
-    <div v-if="calculationResults.length > 0" class="result-section">
+    <!-- 数据展示区域 - 合并显示导入数据和计算结果 -->
+    <div v-if="displayData.length > 0" class="result-section">
       <div class="section-header">
         <span class="section-title">
           <i class="el-icon-tickets"></i>
-          计算结果
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
         </span>
         <span class="section-info">
-          共 {{ calculationResults.length }} 条计算结果
+          共 {{ displayData.length }} 条数据
+          <span v-if="calculationResults.length > 0" style="margin-left: 10px;">
+            | 坐标系：{{ commonParams.coordinateSystem }}
+            | 带号：{{ commonParams.band }}
+          </span>
         </span>
-        <el-button type="text" size="small" @click="handleExport" icon="el-icon-download">
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
           导出结果
         </el-button>
       </div>
       
-      <el-table :data="calculationResults" style="width: 100%" border stripe>
+      <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="160" align="center">
+        <el-table-column prop="utmX" label="UTM坐标X(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.longitude,10) }}</span>
+            <span>{{ formatNumber(scope.row.utmX, 4) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="latitude" label="大地纬度(°)" width="160" align="center">
+        <el-table-column prop="utmY" label="UTM坐标Y(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.latitude,10) }}</span>
+            <span>{{ formatNumber(scope.row.utmY, 4) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="longitude" label="大地经度(° ′ ″)" width="160" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.longitude" class="result-value">{{ formatNumber(scope.row.longitude, 10) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="latitude" label="大地纬度(° ′ ″)" width="160" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.latitude" class="result-value">{{ formatNumber(scope.row.latitude, 10) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -86,37 +124,12 @@
     <!-- 空状态 -->
     <div v-else class="empty-state">
       <i class="el-icon-document"></i>
-      <p>暂无计算结果</p>
-      <p class="empty-tip">请先导入Excel数据，然后点击"执行计算"</p>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入Excel数据</p>
     </div>
     
     <!-- 导入Excel对话框 -->
     <el-dialog title="导入Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
-      <div class="import-tips">
-        <el-alert
-          title="Excel模板格式说明"
-          type="info"
-          :closable="false"
-          show-icon>
-          <div class="template-info">
-            <p>请确保Excel文件包含以下列（第一行为表头）：</p>
-            <ul>
-              <li><strong>待求点</strong> - 点号</li>
-              <li><strong>坐标系</strong> - WGS84/CGCS2000/Beijing54/Xian80</li>
-              <li><strong>UTM坐标x</strong> - X坐标值(米)</li>
-              <li><strong>UTM坐标y</strong> - Y坐标值(米)</li>
-              <li><strong>带号</strong> - 带号数值（UTM使用6度带）</li>
-              <li><strong>经度位置</strong> - E/W（东/西）</li>
-              <li><strong>纬度位置</strong> - N/S（北/南）</li>
-            </ul>
-          </div>
-        </el-alert>
-         <div class="template-download-wrapper">
-            <el-button type="primary" plain size="small" @click="handleDownloadTemplate" icon="el-icon-download">
-              下载Excel模板
-            </el-button>
-          </div>
-      </div>
       <div style="text-align: center;">
         <el-upload
           class="upload-area"
@@ -142,45 +155,48 @@
         </el-button>
       </span>
     </el-dialog>
-    <!-- 预览数据对话框 - 显示导入的原始数据 -->
-    <el-dialog title="导入数据预览"  :visible.sync="previewDialogVisible" width="80%">
-      <div class="preview-info">
-        <span>共 {{ importedData.length }} 条数据</span>
-        <span style="margin-left: 20px;">状态：{{ importedData.filter(item => item.calculated).length }} 条已计算，{{ importedData.filter(item => !item.calculated).length }} 条未计算</span>
+    
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
       </div>
-      <el-table :data="importedData" border stripe max-height="500">
-        <el-table-column prop="pointNumber" label="待求点号" width="120" fixed="left" align="center"></el-table-column>
-        <el-table-column prop="coordinateSystem" label="坐标系" width="110" align="center">
-          <template slot-scope="scope">
-            <el-tag size="small" :type="getCoordinateType(scope.row.coordinateSystem)">
-              {{ scope.row.coordinateSystem }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="utmX" label="UTM坐标X(m)" width="150" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.utmX,4) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="utmY" label="UTM坐标Y(m)" width="150" align="center">
-          <template slot-scope="scope">
-            {{ formatNumber(scope.row.utmY,4) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="band" label="带号" width="80" align="center"></el-table-column>
-        <el-table-column prop="longitudePosition" label="经度位置" width="100" align="center">
-          <template slot-scope="scope">
-            {{scope.row.longitudePosition}}
-          </template>
-        </el-table-column>
-        <el-table-column prop="latitudePosition" label="纬度位置" width="100" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.latitudePosition }}
-          </template>
-        </el-table-column>
-      </el-table>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">UTM坐标X字段</label>
+          <el-select v-model="fieldMapping.utmX" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">UTM坐标Y字段</label>
+          <el-select v-model="fieldMapping.utmY" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="previewDialogVisible = false">关闭</el-button>
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
       </span>
     </el-dialog>
  </div>
@@ -199,9 +215,26 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
-      previewDialogVisible: false,
       projectionHeight: 0,
       heightTimer: null,
+      
+      // 公共参数
+      commonParams: {
+        coordinateSystem: 'WGS84',
+        longitudePosition: 'E',
+        latitudePosition: 'N',
+        band: 0
+      },
+      
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        utmX: '',
+        utmY: ''
+      },
+      rawImportedData: []
     }
   },
   watch: {
@@ -244,40 +277,110 @@ export default {
       const formData = new FormData()
       formData.append('file', this.importFile)
       
+      try {
         const response = await importExcel(formData)
         
         if (response.code === 200) {
           const result = response.data
           
-          // 将后端返回的数据转换为前端格式
-          this.importedData = (result.data || []).map(item => ({
-            pointNumber: item.pointNumber,
-            coordinateSystem: item.coordinateSystem,
-            utmX: item.utmX,
-            utmY: item.utmY,
-            band: item.band,
-            longitudePosition: item.longitudePosition,
-            latitudePosition: item.latitudePosition
-          }))
+          // 获取Excel列名
+          this.excelColumns = result.columns || this.extractColumns(result.data)
+          
+          // 保存原始数据
+          this.rawImportedData = result.data || []
           
           // 清空之前的计算结果
           this.calculationResults = []
           
+          // 自动匹配字段
+          this.autoMatchFields()
+          
+          // 显示字段映射对话框
+          this.mappingDialogVisible = true
+          
           this.$message.success(`${response.msg}`)
           this.importDialogVisible = false
           this.importLoading = false
         } else {
           this.$message.error(response.msg)
+          this.importLoading = false
         }
+      } catch (error) {
+        this.$message.error('导入失败')
+        this.importLoading = false
+      }
     },
     
-    // 预览数据 - 显示导入的原始数据
-    handlePreview() {
-      if (!this.importedData || this.importedData.length === 0) {
-        this.$message.warning('没有可预览的数据')
+    // 提取列名
+    extractColumns(data) {
+      if (!data || data.length === 0) return []
+      return Object.keys(data[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      this.resetFieldMapping()
+      
+      const keywordMap = {
+        pointNumber: ['点号', '待求点', '点', '编号', '序号', 'ID'],
+        utmX: ['UTM坐标X', 'utmX', 'X坐标', 'x', 'X', '东坐标'],
+        utmY: ['UTM坐标Y', 'utmY', 'Y坐标', 'y', 'Y', '北坐标']
+      }
+      
+      this.excelColumns.forEach(col => {
+        const lowerCol = col.toLowerCase()
+        Object.keys(keywordMap).forEach(field => {
+          if (!this.fieldMapping[field]) {
+            keywordMap[field].forEach(keyword => {
+              if (col.includes(keyword) || lowerCol.includes(keyword.toLowerCase())) {
+                this.fieldMapping[field] = col
+              }
+            })
+          }
+        })
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有必填字段的映射')
         return
       }
-      this.previewDialogVisible = true
+      
+      // 根据映射转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        utmX: item[this.fieldMapping.utmX],
+        utmY: item[this.fieldMapping.utmY]
+      }))
+      
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+      this.rawImportedData = []
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        utmX: '',
+        utmY: ''
+      }
+    },
+    
+    // 参数变化时清空计算结果
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已更新，请重新执行计算')
+      }
     },
     
     // 下载模板
@@ -294,19 +397,16 @@ export default {
       }
       
       this.calculating = true
-      const results = []
-      let successCount = 0
-      let failCount = 0
       
       // 构建请求参数
       const requestData = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
-        coordinateSystem: item.coordinateSystem,
+        coordinateSystem: this.commonParams.coordinateSystem,
         utmX: parseFloat(item.utmX),
         utmY: parseFloat(item.utmY),
-        band: parseInt(item.band),
-        longitudePosition: item.longitudePosition,
-        latitudePosition: item.latitudePosition,
+        band: this.commonParams.band,
+        longitudePosition: this.commonParams.longitudePosition,
+        latitudePosition: this.commonParams.latitudePosition,
         projectionHeight: this.projectionHeight
       }))
       
@@ -321,29 +421,23 @@ export default {
           coordinateSystem: item.coordinateSystem,
           utmX: item.utmX,
           utmY: item.utmY,
-          band: parseInt(item.band),
           longitude: item.longitude,
-          longitudePosition: item.longitudePosition,
           latitude: item.latitude,
-          latitudePosition: item.latitudePosition
+          band: item.band,
+          longitudePosition: item.longitudePosition,
+          latitudePosition: item.latitudePosition,
+          projectionHeight: item.projectionHeight,
         }))
         
-        // 更新导入数据的计算状态
-        this.importedData.forEach(importItem => {
-          const found = results.find(r => r.pointNumber === importItem.pointNumber)
-          if (found && found.longitude !== -1) {
-            importItem.calculated = true
-          }
-        })
-        
-        const successCount = results.filter(r => r.longitude !== -1).length
+        const successCount = results.filter(r => r.longitude !== undefined && r.longitude !== -1).length
         const failCount = results.length - successCount
         
         this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
-        this.calculating = false
-        } else {
-          this.$message.error(response.msg)
-        }
+      } else {
+        this.$message.error(response.msg)
+      }
+      
+      this.calculating = false
     },
     
     
@@ -409,6 +503,40 @@ export default {
     }
     return types[system] || 'info'
   }
+  },
+  
+  computed: {
+    // 验证字段映射
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.utmX && 
+             this.fieldMapping.utmY
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      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
+        }))
+      } else if (this.importedData.length > 0) {
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          utmX: item.utmX,
+          utmY: item.utmY,
+          longitude: undefined,
+          latitude: undefined
+        }))
+      }
+      return []
+    }
   }
 }
 </script>
@@ -428,17 +556,37 @@ export default {
   flex-wrap: wrap;
 }
 
-/* 投影面高程设置样式 */
-.height-setting {
+/* 参数设置区域样式 */
+.params-area {
   background: #f5f7fa;
   border-radius: 8px;
-  padding: 12px 20px;
+  padding: 16px 20px;
   margin-bottom: 20px;
   border: 1px solid #e4e7ed;
+}
+
+.params-row {
   display: flex;
-  align-items: center;
-  gap: 20px;
   flex-wrap: wrap;
+  gap: 24px;
+  align-items: center;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-weight: 500;
+  color: #606266;
+  min-width: 40px;
+}
+
+.unit {
+  color: #909399;
+  font-size: 13px;
 }
 
 .result-section {
@@ -545,4 +693,41 @@ export default {
   padding-top: 12px;
   border-top: 1px dashed #e4e7ed;
 }
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 120px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
 </style>

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

@@ -8,14 +8,6 @@
           导入Excel
         </el-button>
 
-        <el-button 
-          type="success" 
-          @click="handlePreview" 
-          size="small" 
-          :disabled="!importedData || importedData.length === 0"
-          icon="el-icon-view">
-          预览数据
-        </el-button>
         <el-button 
           type="warning" 
           @click="handleCalculate" 
@@ -37,52 +29,99 @@
       </div>
     </div>
     
-    <!-- 投影面高程设置 -->
-    <div class="height-setting">
-      <div class="setting-label">
-        <span>投影面高程</span>
-      </div>
-      <div class="setting-content">
-        <el-input 
-          v-model="projectionHeight" 
-          size="small" 
-          style="width: 120px; margin-right: 10px;">
-        </el-input>
-        <span class="unit">米 (m)</span>
+    <!-- 参数设置区域 -->
+    <div class="params-area">
+      <div class="params-row">
+        <div class="params-group">
+          <label class="param-label">投影面高程</label>
+          <el-input 
+            v-model="projectionHeight" 
+            size="small" 
+            style="width: 120px;">
+          </el-input>
+          <span class="unit">米 (m)</span>
+        </div>
         
+        <div class="params-group">
+          <label class="param-label">坐标系</label>
+          <el-select v-model="commonParams.coordinateSystem" size="small" style="width: 140px;" @change="onParamsChange">
+            <el-option label="WGS84" value="WGS84"></el-option>
+            <el-option label="CGCS2000" value="CGCS2000"></el-option>
+            <el-option label="Beijing54" value="Beijing54"></el-option>
+            <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.longitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="E" value="E"></el-option>
+            <el-option label="W" value="W"></el-option>
+          </el-select>
+        </div>
+        
+        <div class="params-group">
+          <label class="param-label">纬度位置</label>
+          <el-select v-model="commonParams.latitudePosition" size="small" style="width: 80px;" @change="onParamsChange">
+            <el-option label="N" value="N"></el-option>
+            <el-option label="S" value="S"></el-option>
+          </el-select>
+        </div>
+        
+        <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>
+        </div>
       </div>
     </div>
 
-    <!-- 计算结果展示区 - 只显示计算结果，不包含原始数据 -->
-    <div v-if="calculationResults.length > 0" class="result-section">
+    <!-- 数据展示区域 - 合并显示导入数据和计算结果 -->
+    <div v-if="displayData.length > 0" class="result-section">
       <div class="section-header">
         <span class="section-title">
           <i class="el-icon-tickets"></i>
-          计算结果
+          {{ calculationResults.length > 0 ? '计算结果' : '导入数据' }}
         </span>
         <span class="section-info">
-          共 {{ calculationResults.length }} 条计算结果
+          共 {{ displayData.length }} 条数据
+          <span v-if="calculationResults.length > 0" style="margin-left: 10px;">
+            | 坐标系：{{ commonParams.coordinateSystem }}
+            | 带号：{{ commonParams.band }}
+          </span>
         </span>
-        <el-button type="text" size="small" @click="handleExport" icon="el-icon-download">
+        <el-button v-if="calculationResults.length > 0" type="text" size="small" @click="handleExport" icon="el-icon-download">
           导出结果
         </el-button>
       </div>
       
-      <el-table :data="calculationResults" style="width: 100%" border stripe>
+      <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="utmX" label="UTM 坐标X(m)" width="180" 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">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.utmX,4) }}</span>
+            <span>{{ formatNumber(scope.row.latitude, 6) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="utmY" label="UTM 坐标Y(m)" width="180" align="center">
+        <el-table-column prop="utmX" label="UTM 坐标X(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.utmY,4) }}</span>
+            <span v-if="scope.row.utmX" class="result-value">{{ formatNumber(scope.row.utmX,4) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
-        <el-table-column prop="meridianConvergence" label="子午线收敛角γ(°)" width="200" align="center">
+        <el-table-column prop="utmY" label="UTM 坐标Y(m)" width="150" align="center">
           <template slot-scope="scope">
-            <span class="result-value">{{ formatNumber(scope.row.meridianConvergence, 7) }}</span>
+            <span v-if="scope.row.utmY" class="result-value">{{ formatNumber(scope.row.utmY,4) }}</span>
+            <span v-else class="empty-cell">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="meridianConvergence" label="子午线收敛角γ(°)" width="180" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.meridianConvergence" class="result-value">{{ formatNumber(scope.row.meridianConvergence, 7) }}</span>
+            <span v-else class="empty-cell">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -91,37 +130,12 @@
     <!-- 空状态 -->
     <div v-else class="empty-state">
       <i class="el-icon-document"></i>
-      <p>暂无计算结果</p>
-      <p class="empty-tip">请先导入Excel数据，然后点击"执行计算"</p>
+      <p>暂无数据</p>
+      <p class="empty-tip">请先导入Excel数据</p>
     </div>
     
     <!-- 导入Excel对话框 -->
     <el-dialog title="导入Excel" :visible.sync="importDialogVisible" width="550px" @close="resetImport">
-      <div class="import-tips">
-        <el-alert
-          title="Excel模板格式说明"
-          type="info"
-          :closable="false"
-          show-icon>
-          <div class="template-info">
-            <p>请确保Excel文件包含以下列（第一行为表头）：</p>
-            <ul>
-              <li><strong>待求点</strong> - 点号</li>
-              <li><strong>坐标系</strong> - WGS84/CGCS2000/Beijing54/Xian80</li>
-              <li><strong>大地经度</strong> - 经度数值(° ′ ″)</li>
-              <li><strong>经度位置</strong> - E/W</li>
-              <li><strong>大地纬度</strong> - 纬度数值(° ′ ″)</li>
-              <li><strong>纬度位置</strong> - N/S</li>
-              <li><strong>带号</strong> - 带号数值（UTM使用6度带）</li>
-            </ul>
-          </div>
-        </el-alert>
-         <div class="template-download-wrapper">
-            <el-button type="primary" plain size="small" @click="handleDownloadTemplate" icon="el-icon-download">
-              下载Excel模板
-            </el-button>
-          </div>
-      </div>
       <div style="text-align: center;">
         <el-upload
           class="upload-area"
@@ -147,45 +161,48 @@
         </el-button>
       </span>
     </el-dialog>
-    <!-- 预览数据对话框 - 显示导入的原始数据 -->
-    <el-dialog title="导入数据预览"  :visible.sync="previewDialogVisible" width="80%">
-      <div class="preview-info">
-        <span>共 {{ importedData.length }} 条数据</span>
-        <span style="margin-left: 20px;">状态：{{ importedData.filter(item => item.calculated).length }} 条已计算，{{ importedData.filter(item => !item.calculated).length }} 条未计算</span>
+    
+    <!-- 字段映射对话框 -->
+    <el-dialog title="字段映射" :visible.sync="mappingDialogVisible" width="500px">
+      <div class="mapping-tips">
+        <el-alert
+          title="字段映射说明"
+          type="info"
+          :closable="false"
+          show-icon>
+          请将Excel中的列映射到对应的坐标字段。
+        </el-alert>
       </div>
-      <el-table :data="importedData" border stripe max-height="500">
-        <el-table-column prop="pointNumber" label="待求点号" width="120" fixed="left" align="center"></el-table-column>
-        <el-table-column prop="coordinateSystem" label="坐标系" width="110" align="center">
-          <template slot-scope="scope">
-            <el-tag size="small" :type="getCoordinateType(scope.row.coordinateSystem)">
-              {{ scope.row.coordinateSystem }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="longitude" label="大地经度" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.longitude }}
-          </template>
-        </el-table-column>
-         <el-table-column prop="longitudePosition" label="经度位置" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.longitudePosition}}
-          </template>
-        </el-table-column>
-        <el-table-column prop="latitude" label="大地纬度" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.latitude }}
-          </template>
-        </el-table-column>
-         <el-table-column prop="latitudePosition" label="纬度位置" width="130" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.latitudePosition}}
-                   </template>
-        </el-table-column>
-        <el-table-column prop="band" label="带号" width="80" align="center"></el-table-column>
-      </el-table>
+      
+      <div class="mapping-section">
+        <div class="mapping-row">
+          <label class="mapping-label">点号字段</label>
+          <el-select v-model="fieldMapping.pointNumber" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">经度字段</label>
+          <el-select v-model="fieldMapping.longitude" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+        <div class="mapping-row">
+          <label class="mapping-label">纬度字段</label>
+          <el-select v-model="fieldMapping.latitude" class="mapping-select" size="small">
+            <el-option label="请选择" value=""></el-option>
+            <el-option v-for="col in excelColumns" :key="col" :label="col" :value="col"></el-option>
+          </el-select>
+        </div>
+      </div>
+      
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="previewDialogVisible = false">关闭</el-button>
+        <el-button @click="cancelMapping">取消</el-button>
+        <el-button type="primary" @click="confirmMapping" :disabled="!validateMapping">
+          确认映射
+        </el-button>
       </span>
     </el-dialog>
  </div>
@@ -204,9 +221,26 @@ export default {
       importLoading: false,
       importFile: null,
       calculating: false,
-      previewDialogVisible: false,
       projectionHeight: 0,
       heightTimer: null,
+      
+      // 公共参数
+      commonParams: {
+        coordinateSystem: 'WGS84',
+        longitudePosition: 'E',
+        latitudePosition: 'N',
+        band: 0
+      },
+      
+      // 字段映射相关
+      mappingDialogVisible: false,
+      excelColumns: [],
+      fieldMapping: {
+        pointNumber: '',
+        longitude: '',
+        latitude: ''
+      },
+      rawImportedData: []
     }
   },
   watch: {
@@ -249,40 +283,110 @@ export default {
       const formData = new FormData()
       formData.append('file', this.importFile)
       
+      try {
         const response = await importExcel(formData)
         
         if (response.code === 200) {
           const result = response.data
+
+          // 获取Excel列名
+          this.excelColumns = result.columns || this.extractColumns(result.data)
           
-          // 将后端返回的数据转换为前端格式
-          this.importedData = (result.data || []).map(item => ({
-            pointNumber: item.pointNumber,
-            coordinateSystem: item.coordinateSystem,
-            longitude: item.longitude,
-            longitudePosition: item.longitudePosition,
-            latitude: item.latitude,
-            latitudePosition: item.latitudePosition,
-            band: item.band
-          }))
+          // 保存原始数据
+          this.rawImportedData = result.data || []
           
           // 清空之前的计算结果
           this.calculationResults = []
           
+          // 自动匹配字段
+          this.autoMatchFields()
+          
+          // 显示字段映射对话框
+          this.mappingDialogVisible = true
+          
           this.$message.success(`${response.msg}`)
           this.importDialogVisible = false
           this.importLoading = false
         } else {
           this.$message.error(response.msg)
+          this.importLoading = false
         }
+      } catch (error) {
+        this.$message.error('导入失败')
+        this.importLoading = false
+      }
     },
     
-    // 预览数据 - 显示导入的原始数据
-    handlePreview() {
-      if (!this.importedData || this.importedData.length === 0) {
-        this.$message.warning('没有可预览的数据')
+    // 提取列名
+    extractColumns(data) {
+      if (!data || data.length === 0) return []
+      return Object.keys(data[0])
+    },
+    
+    // 自动匹配字段
+    autoMatchFields() {
+      this.resetFieldMapping()
+      
+      const keywordMap = {
+        pointNumber: ['点号', '待求点', '点', '编号', '序号', 'ID'],
+        longitude: ['大地经度', 'lon', 'Longitude', 'L', '东经', '西经'],
+        latitude: ['大地纬度', 'lat', 'Latitude', 'B', '北纬', '南纬']
+      }
+      
+      this.excelColumns.forEach(col => {
+        const lowerCol = col.toLowerCase()
+        Object.keys(keywordMap).forEach(field => {
+          if (!this.fieldMapping[field]) {
+            keywordMap[field].forEach(keyword => {
+              if (col.includes(keyword) || lowerCol.includes(keyword.toLowerCase())) {
+                this.fieldMapping[field] = col
+              }
+            })
+          }
+        })
+      })
+    },
+    
+    // 确认字段映射
+    confirmMapping() {
+      if (!this.validateMapping) {
+        this.$message.warning('请完成所有必填字段的映射')
         return
       }
-      this.previewDialogVisible = true
+      
+      // 根据映射转换数据
+      this.importedData = this.rawImportedData.map(item => ({
+        pointNumber: item[this.fieldMapping.pointNumber],
+        longitude: item[this.fieldMapping.longitude],
+        latitude: item[this.fieldMapping.latitude]
+      }))
+      
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+    },
+    
+    // 取消字段映射
+    cancelMapping() {
+      this.mappingDialogVisible = false
+      this.resetFieldMapping()
+      this.rawImportedData = []
+    },
+    
+    // 重置字段映射
+    resetFieldMapping() {
+      this.fieldMapping = {
+        pointNumber: '',
+        longitude: '',
+        latitude: ''
+      }
+    },
+    
+    // 参数变化时清空计算结果
+    onParamsChange() {
+      if (this.calculationResults.length > 0) {
+        this.calculationResults = []
+        this.$message.info('参数已更新，请重新执行计算')
+      }
     },
     
     // 下载模板
@@ -299,19 +403,16 @@ export default {
       }
       
       this.calculating = true
-      const results = []
-      let successCount = 0
-      let failCount = 0
       
       // 构建请求参数
       const requestData = this.importedData.map(item => ({
         pointNumber: item.pointNumber,
-        coordinateSystem: item.coordinateSystem,
+        coordinateSystem: this.commonParams.coordinateSystem,
         longitude: parseFloat(item.longitude),
-        longitudePosition: item.longitudePosition,
+        longitudePosition: this.commonParams.longitudePosition,
         latitude: parseFloat(item.latitude),
-        latitudePosition: item.latitudePosition,
-        band: parseInt(item.band),
+        latitudePosition: this.commonParams.latitudePosition,
+        band: this.commonParams.band,
         projectionHeight: this.projectionHeight
       }))
       
@@ -325,32 +426,25 @@ export default {
           pointNumber: item.pointNumber,
           coordinateSystem: item.coordinateSystem,
           longitude: parseFloat(item.longitude),
-          longitudePosition: item.longitudePosition,
           latitude: parseFloat(item.latitude),
-          latitudePosition: item.latitudePosition,
-          band: parseInt(item.band),
-          projectionHeight: this.projectionHeight,
           utmX: item.utmX,
           utmY: item.utmY,
-          meridianConvergence: item.meridianConvergence
+          meridianConvergence: item.meridianConvergence,
+          band: item.band,
+          longitudePosition: item.longitudePosition,
+          latitudePosition: item.latitudePosition,
+          projectionHeight: item.projectionHeight,
         }))
         
-        // 更新导入数据的计算状态
-        this.importedData.forEach(importItem => {
-          const found = results.find(r => r.pointNumber === importItem.pointNumber)
-          if (found && found.utmX !== -1) {
-            importItem.calculated = true
-          }
-        })
-        
-        const successCount = results.filter(r => r.utmX !== -1).length
+        const successCount = results.filter(r => r.utmX !== undefined && r.utmX !== -1).length
         const failCount = results.length - successCount
         
         this.$message.success(`计算完成，成功 ${successCount} 条${failCount > 0 ? `，失败 ${failCount} 条` : ''}`)
-        this.calculating = false
-        } else {
-          this.$message.error(response.msg)
-        }
+      } else {
+        this.$message.error(response.msg)
+      }
+      
+      this.calculating = false
     },
     
     
@@ -375,47 +469,83 @@ export default {
         window.URL.revokeObjectURL(url)
   },
     
-  // 清空全部
-  clearAll() {
-    if ((!this.importedData || this.importedData.length === 0) && this.calculationResults.length === 0) {
-      return
-    }
+    // 清空全部
+    clearAll() {
+      if ((!this.importedData || this.importedData.length === 0) && this.calculationResults.length === 0) {
+        return
+      }
+      
+      this.$confirm('确定清空所有数据吗？此操作不可恢复！', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.importedData = []
+        this.calculationResults = []
+        this.$message.success('已清空所有数据')
+      }).catch(() => {})
+    },
     
-    this.$confirm('确定清空所有数据吗？此操作不可恢复！', '警告', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    }).then(() => {
-      this.importedData = []
-      this.calculationResults = []
-      this.$message.success('已清空所有数据')
-    }).catch(() => {})
-  },
-  
-  // 重置导入状态
-  resetImport() {
-    this.importFile = null
-    if (this.$refs.upload) {
-      this.$refs.upload.clearFiles()
-    }
-  },
-  
-  // 格式化数字显示
-  formatNumber(value, decimals = 3) {
-    if (value === null || value === undefined) return '--'
-    return Number(value).toFixed(decimals)
+    // 重置导入状态
+    resetImport() {
+      this.importFile = null
+      if (this.$refs.upload) {
+        this.$refs.upload.clearFiles()
+      }
+    },
+    
+    // 格式化数字显示
+    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'
+    },
   },
   
-  // 获取坐标系标签类型
-  getCoordinateType(system) {
-    const types = {
-      'WGS84': 'primary',
-      'CGCS2000': 'success',
-      'Beijing54': 'warning',
-      'Xian80': 'info'
+  computed: {
+    // 验证字段映射
+    validateMapping() {
+      if (!this.fieldMapping) {
+        return false
+      }
+      return this.fieldMapping.pointNumber && 
+             this.fieldMapping.longitude && 
+             this.fieldMapping.latitude
+    },
+    
+    // 显示数据：优先显示计算结果，否则显示导入数据
+    displayData() {
+      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
+        }))
+      } else if (this.importedData.length > 0) {
+        return this.importedData.map(item => ({
+          pointNumber: item.pointNumber,
+          longitude: item.longitude,
+          latitude: item.latitude,
+          utmX: undefined,
+          utmY: undefined,
+          meridianConvergence: undefined
+        }))
+      }
+      return []
     }
-    return types[system] || 'info'
-  }
   }
 }
 </script>
@@ -435,17 +565,37 @@ export default {
   flex-wrap: wrap;
 }
 
-/* 投影面高程设置样式 */
-.height-setting {
+/* 参数设置区域样式 */
+.params-area {
   background: #f5f7fa;
   border-radius: 8px;
-  padding: 12px 20px;
+  padding: 16px 20px;
   margin-bottom: 20px;
   border: 1px solid #e4e7ed;
+}
+
+.params-row {
   display: flex;
-  align-items: center;
-  gap: 20px;
   flex-wrap: wrap;
+  gap: 24px;
+  align-items: center;
+}
+
+.params-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.param-label {
+  font-weight: 500;
+  color: #606266;
+  min-width: 40px;
+}
+
+.unit {
+  color: #909399;
+  font-size: 13px;
 }
 
 .result-section {
@@ -552,4 +702,41 @@ export default {
   padding-top: 12px;
   border-top: 1px dashed #e4e7ed;
 }
+
+/* 字段映射对话框样式 */
+.mapping-tips {
+  margin-bottom: 20px;
+}
+
+.mapping-section {
+  background: #f9fafb;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.mapping-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.mapping-row:last-child {
+  margin-bottom: 0;
+}
+
+.mapping-label {
+  width: 80px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.mapping-select {
+  flex: 1;
+  min-width: 200px;
+}
+
+.empty-cell {
+  color: #C0C4CC;
+  font-style: italic;
+}
 </style>