diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java
index eb94fd01..7453c974 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java
@@ -15,7 +15,7 @@ import static com.imdroid.sideslope.bd.GeoCoordConverterUtil.*;
  */
 public class FocusCalculator3 extends FocusCalculator1{
     //final static long scale = 100000000L;//地球1°：111km，放大到mm乘以100,000,000
-    final static int bad_change_mm = 500;//固定解跳变连续10次超过500mm，认为是周跳
+    final static int bad_change_mm = 300;//固定解跳变连续10次超过500mm，认为是周跳
     final static int bad_duration = 10;
 
     int bad_count = 0;
@@ -61,10 +61,10 @@ public class FocusCalculator3 extends FocusCalculator1{
         if(gga.isFixed()) {
             counterFixedResult++;
             if(pointList.size()>0){
-                double[] lastXyz = pointList.get(pointList.size()-1);
-                if(Math.abs(end[0]-lastXyz[0])>bad_change_mm ||
-                        Math.abs(end[1]-lastXyz[1])>bad_change_mm ||
-                        Math.abs(end[2]-lastXyz[2])>bad_change_mm){
+                //double[] lastXyz = pointList.get(pointList.size()-1);
+                if(Math.abs(end[0]-referPoint[0])>bad_change_mm ||
+                        Math.abs(end[1]-referPoint[1])>bad_change_mm ||
+                        Math.abs(end[2]-referPoint[2])>bad_change_mm){
                     bad_count++;
                     return;
                 }
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 b9d29c95..1872d338 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
@@ -97,10 +97,12 @@
             </div>
         </div>
 
-		<script type="text/html" id="currentTableBar">
-		    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="cmd">命令行</a>
-		</script>
-		
+        <script type="text/html" id="currentTableBar">
+            <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">状态修改</a>
+<!--            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>-->
+<!--            <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="cmd"></a>-->
+        </script>
+
     </div>
 
 </div>
@@ -129,7 +131,8 @@
             {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'}
+            {field: 'enabled', title: '有效',templet: '#enabledTrans'},
+            {title: '操作', toolbar: '#currentTableBar', fixed: "right", width: 120}
         ];
         if([[${role}]] != "SUPER_ADMIN") {
             data_cols[9].hide = true;
@@ -174,6 +177,63 @@
             }
         });
 
+        // 监听工具条事件
+        table.on('tool(currentTableFilter)', function(obj) {
+            var data = obj.data;
+            if (obj.event === 'edit') {
+                // 当前状态取反
+                var newEnabled = !data.enabled;
+
+                layer.confirm('确定要修改状态吗？', {
+                    btn: ['确定', '取消']
+                }, function(index) {
+                    $.ajax({
+                        url: '/page/gnssUpdateEnabled',
+                        type: 'POST',
+                        data: {
+                            deviceid: data.deviceid,
+                            createtime: data.createtime,
+                            enabled: newEnabled ? 1 : 0
+                        },
+                        success: function(res) {
+                            if (res === 'success') {
+                                layer.msg('修改成功');
+                                // 更新表格数据
+                                table.reload('currentTableId');
+                            } else {
+                                layer.msg('修改失败：' + res);
+                            }
+                            layer.close(index);
+                        },
+                        error: function(xhr) {
+                            layer.msg('操作失败');
+                            layer.close(index);
+                        }
+                    });
+                });
+            }
+        });
+            // else if (obj.event === 'delete') {
+            //     layer.confirm('确定删除'+data.deviceid+"?", function(index){
+            //         $.ajax({
+            //             type:"POST",
+            //             url:"/gnss/device/delete",
+            //             data:{
+            //                 'del_id':data.deviceid
+            //             },
+            //             success: function (data) {
+            //                 //data是cotroller相应处理函数的返回值
+            //                 table.reload('currentTableId');
+            //             },
+            //             error: function () {
+            //                 console.log("ajax error");
+            //             }
+            //         });
+            //         layer.close(index);
+            //     });
+            // }
+        // });
+
         // 监听搜索操作
         form.on('submit(data-search-btn)', function (data) {
             var result = JSON.stringify(data.field);