diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssCalcData.java b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssCalcData.java
index a14c2b44..f698ba24 100644
--- a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssCalcData.java
+++ b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssCalcData.java
@@ -46,22 +46,22 @@ public class GnssCalcData {
     @ExcelProperty("原始位置天")
     Double b562d;
 
-    @ExcelProperty("融合位置东")
+    @ExcelProperty("拟合平滑东")
     Double r9250e;
 
-    @ExcelProperty("融合位置北")
+    @ExcelProperty("拟合平滑北")
     Double r9250n;
 
-    @ExcelProperty("融合位置天")
+    @ExcelProperty("拟合平滑天")
     Double r9250d;
 
-    @ExcelProperty("相对位置东")
+    @ExcelProperty("平滑位置东")
     Double rpose;
 
-    @ExcelProperty("相对位置北")
+    @ExcelProperty("平滑位置北")
     Double rposn;
 
-    @ExcelProperty("相对位置天")
+    @ExcelProperty("平滑位置天")
     Double rposd;
 
     @ExcelProperty("辅助位置东")
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html b/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html
index 6d4e9b5e..b9d29c95 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html
@@ -126,14 +126,15 @@
             {field: 'rpose', title: '滤波东', templet: "<div>{{d.rpose==null?'':d.rpose.toFixed(2)}}</div>"},
             {field: 'rposn', title: '滤波北', templet: "<div>{{d.rposn==null?'':d.rposn.toFixed(2)}}</div>"},
             {field: 'rposd', title: '滤波天', templet: "<div>{{d.rposd==null?'':d.rposd.toFixed(2)}}</div>"},
-            //{field: 'auxe', title: '辅助东', templet: "<div>{{d.auxe==null?'':d.auxe.toFixed(2)}}</div>"},
-            //{field: 'auxn', title: '辅助北', templet: "<div>{{d.auxn==null?'':d.auxn.toFixed(2)}}</div>"},
-            //{field: 'auxd', title: '辅助天', templet: "<div>{{d.auxd==null?'':d.auxd.toFixed(2)}}</div>"},
-            {field: 'enabled', title: '有效',templet: '#enabledTrans'},
-            {field: 'pps', title: '平均延迟'}
+            {field: 'r9250e', title: '拟合东', templet: "<div>{{d.r9250e==null?'':d.r9250e.toFixed(2)}}</div>"},
+            {field: 'r9250n', title: '拟合北', templet: "<div>{{d.r9250n==null?'':d.r9250n.toFixed(2)}}</div>"},
+            {field: 'r9250d', title: '拟合天', templet: "<div>{{d.r9250d==null?'':d.r9250d.toFixed(2)}}</div>"},
+            {field: 'enabled', title: '有效',templet: '#enabledTrans'}
         ];
         if([[${role}]] != "SUPER_ADMIN") {
+            data_cols[9].hide = true;
             data_cols[10].hide = true;
+            data_cols[11].hide = true;
         }
 		/**
 		 * 初始化表单，要加上，不然刷新部分组件可能会不加载
@@ -163,7 +164,12 @@
             skin: 'line',
             done: function (result, curr, count) {
                 if(searchDeviceId){
-                    showChart(result.data);
+                    if([[${role}]] != "SUPER_ADMIN"){
+                        showChart(result.data);
+                    }
+                    else{
+                        showChart2(result.data);
+                    }
                 }
             }
         });
@@ -300,9 +306,9 @@
                 if(chartData[i].rpose!=null) {
                     if(isBaseSet) {
                         t[count] = chartData[i].createtime;
-                        e[count] = chartData[i].b562e-baseE;
-                        n[count] = chartData[i].b562n-baseN;
-                        d[count] = chartData[i].b562d-baseD;
+                        e[count] = Number(chartData[i].b562e)-baseE;
+                        n[count] = Number(chartData[i].b562n)-baseN;
+                        d[count] = Number(chartData[i].b562d)-baseD;
                         fe[count] = Number(chartData[i].rpose) - baseFE;
                         fn[count] = Number(chartData[i].rposn) - baseFN;
                         fd[count] = Number(chartData[i].rposd) - baseFD;
@@ -399,6 +405,154 @@
                 echartsDevice.resize();
             }
         }
+
+        function showChart2(chartData){
+            var t = [];
+            var e = [];
+            var n = [];
+            var d = [];
+            var fe = [];
+            var fn = [];
+            var fd = [];
+            var fe2 = []; //拟合滤波
+            var fn2 = [];
+            var fu2 = [];
+            var count = 0;
+            var isBaseSet = false;
+            var baseE = 0;
+            var baseN = 0;
+            var baseD = 0;
+            var baseFE = 0;
+            var baseFN = 0;
+            var baseFD = 0;
+            var baseFE2 = 0;
+            var baseFN2 = 0;
+            var baseFU2 = 0;
+
+            for(var i=chartData.length-1; i>=0; i--){
+                if(chartData[i].rpose!=null && chartData[i].r9250e!=null) {
+                    if(isBaseSet) {
+                        t[count] = chartData[i].createtime;
+                        e[count] = Number(chartData[i].b562e)-baseE;
+                        n[count] = Number(chartData[i].b562n)-baseN;
+                        d[count] = Number(chartData[i].b562d)-baseD;
+                        fe[count] = Number(chartData[i].rpose) - baseFE;
+                        fn[count] = Number(chartData[i].rposn) - baseFN;
+                        fd[count] = Number(chartData[i].rposd) - baseFD;
+                        fe2[count] = Number(chartData[i].r9250e) - baseFE2;
+                        fn2[count] = Number(chartData[i].r9250n) - baseFN2;
+                        fu2[count] = Number(chartData[i].r9250d) - baseFU2;
+                        count++;
+                    }
+                    else{
+                        isBaseSet = true;
+                        baseE = Number(chartData[i].b562e);
+                        baseN = Number(chartData[i].b562n);
+                        baseD = Number(chartData[i].b562d);
+                        baseFE = Number(chartData[i].rpose);
+                        baseFN = Number(chartData[i].rposn);
+                        baseFD = Number(chartData[i].rposd);
+                        baseFE2 = Number(chartData[i].r9250e);
+                        baseFN2 = Number(chartData[i].r9250n);
+                        baseFU2 = Number(chartData[i].r9250d);
+                    }
+                }
+            }
+
+            var optionDevice = {
+                title: {
+                    text: '位移曲线'
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'cross',
+                        label: {
+                            backgroundColor: '#6a7985'
+                        }
+                    }
+                },
+                legend: {
+                    data: ['东', '北', '天','平滑东', '平滑北', '平滑天','拟合东', '拟合北', '拟合天']
+                },
+                toolbox: {
+                    feature: {
+                        saveAsImage: {}
+                    }
+                },
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        boundaryGap: false,
+                        data: t
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value'
+                    }
+                ],
+                series: [
+                    {
+                        name: '东',
+                        type: 'line',
+                        data: e
+                    },
+                    {
+                        name: '北',
+                        type: 'line',
+                        data: n
+                    },
+                    {
+                        name: '天',
+                        type: 'line',
+                        data: d
+                    },
+                    {
+                        name: '平滑东',
+                        type: 'line',
+                        data: fe
+                    },
+                    {
+                        name: '平滑北',
+                        type: 'line',
+                        data: fn
+                    },
+                    {
+                        name: '平滑天',
+                        type: 'line',
+                        data: fd
+                    },
+                    {
+                        name: '拟合东',
+                        type: 'line',
+                        data: fe2
+                    },
+                    {
+                        name: '拟合北',
+                        type: 'line',
+                        data: fn2
+                    },
+                    {
+                        name: '拟合天',
+                        type: 'line',
+                        data: fu2
+                    }
+                ]
+            };
+            echartsDevice.setOption(optionDevice);
+
+            // echarts 窗口缩放自适应
+            window.onresize = function () {
+                echartsDevice.resize();
+            }
+        }
     });
 
 </script>