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 faa28b21..6642db14 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
@@ -89,12 +89,12 @@
             cols: [[
                 {field: 'deviceid', title: '设备号'},
                 {field: 'createtime', title: '上报时间', width:'18%', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
-                {field: 'b562e', title: '原始东'},
-                {field: 'b562n', title: '原始北'},
-                {field: 'b562d', title: '原始天'},
-                {field: 'rb562e', title: '相对东'},
-                {field: 'rb562n', title: '相对北'},
-                {field: 'rb562d', title: '相对天'},
+                {field: 'b562e', title: '原始东', templet: "<div>{{d.b562e.toFixed(2)}}</div>"},
+                {field: 'b562n', title: '原始北', templet: "<div>{{d.b562n.toFixed(2)}}</div>"},
+                {field: 'b562d', title: '原始天', templet: "<div>{{d.b562d.toFixed(2)}}</div>"},
+                {field: 'rb562e', title: '相对东', templet: "<div>{{d.rb562e==null?'':d.rb562e.toFixed(2)}}</div>"},
+                {field: 'rb562n', title: '相对北', templet: "<div>{{d.rb562n==null?'':d.rb562n.toFixed(2)}}</div>"},
+                {field: 'rb562d', title: '相对天', templet: "<div>{{d.rb562d==null?'':d.rb562d.toFixed(2)}}</div>"},
                 {field: 'enabled', title: '有效',templet: '#enabledTrans'},
                 {field: 'pps', title: '平均延迟'}
             ]],
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_group_cfg.html b/sec-beidou/src/main/resources/templates/page/gnss_group_cfg.html
index def36d1e..b32d562d 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_group_cfg.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_group_cfg.html
@@ -66,7 +66,7 @@
                 {field: 'active_time', title: '激活时长(分钟)'},
                 {field: 'active_offset', title: '偏置(分钟)'},
                 {field: 'rs_adv', title: '基准站提前时间（分钟）'},
-                {field: 'power_mode', title: '功耗模式',templet: '#modeTrans'},
+                {field: 'power_mode', title: '功耗模式',templet: "<div>{{d.power_mode==0?'低功耗':'普通'}}</div>"},
                 {field: 'device_num', title: '关联设备数'},
                 {title: '操作', toolbar: '#currentTableBar', align: "center"}
             ]],
@@ -145,10 +145,10 @@
 		        {field: 'filter_hour', title: '滤波周期(小时)'},
 		        {field: 'xy_threshold', title: '水平异常门限(mm)'},
 		        {field: 'z_threshold', title: '垂直异常门限(mm)'},
-		        {field: 'auto_filter', title: '自适应滤波', templet: '#autoFilterTrans'},
+		        {field: 'auto_filter', title: '自适应滤波', templet: "<div>{{d.auto_filter==1?'启用':'禁用'}}</div>"},
 		        {field: 'filter_min_hour', title: '最小滤波周期'},
 				{field: 'auto_threshold', title: '触发门限(mm)'},
-				{field: 'auto_upload', title: '自动补传', templet: '#autoUploadTrans'},
+				{field: 'auto_upload', title: '自动补传', templet: "<div>{{d.auto_upload==1?'启用':'禁用'}}</div>"},
 				{field: 'device_num', title: '关联设备数'},
 		        {title: '操作', toolbar: '#currentTableBar', align: "center"}
 		    ]],
@@ -311,30 +311,6 @@
 	}
 </script>
 
-<script type="text/html" id="autoFilterTrans">
-	{{#  if(d.auto_filter == 1){ }}
-	<span>启用</span>
-	{{# } else { }}
-	<span>禁用</span>
-	{{#  } }}
-</script>
-
-<script type="text/html" id="autoUploadTrans">
-	{{#  if(d.auto_upload == 1){ }}
-	<span>启用</span>
-	{{# } else { }}
-	<span>禁用</span>
-	{{#  } }}
-</script>
-
-<script type="text/html" id="modeTrans">
-	{{#  if(d.power_mode == 0){ }}
-	<span>低功耗</span>
-	{{# } else { }}
-	<span>正常</span>
-	{{#  } }}
-</script>
-
 <script type="text/html" id="type1Trans">
 	{{#  if(d.type1 == 0){ }}
 	<span>禁用</span>
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_msg.html b/sec-beidou/src/main/resources/templates/page/gnss_msg.html
index 30b895c5..6cf91312 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_msg.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_msg.html
@@ -71,7 +71,7 @@
                 {field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
                 {field: 'msgtype', title: '消息类型', templet: "<div>{{d.msgtype.toString(16)}}</div>"},
                 {field: 'msglen', title: '消息长度'},
-                {field: 'tx', title: '收发', templet: '#trxTrans'},
+                {field: 'tx', title: '收发', templet: "<div>{{d.tx==1?'发':'收'}}</div>"},
                 {field: 'content', title: '内容', width: '50%'}
             ]],
             limits: [10, 15, 20, 25, 50, 100],
@@ -100,13 +100,5 @@
     });
 </script>
 
-<script type="text/html" id="trxTrans">
-    {{#  if(d.tx == 1){ }}
-    <span>发</span>
-    {{# } else { }}
-    <span>收</span>
-    {{#  } }}
-</script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/sec-beidou/src/main/resources/templates/page/table/gnss_add_group.html b/sec-beidou/src/main/resources/templates/page/table/gnss_add_group.html
index b26094b1..6c503c92 100644
--- a/sec-beidou/src/main/resources/templates/page/table/gnss_add_group.html
+++ b/sec-beidou/src/main/resources/templates/page/table/gnss_add_group.html
@@ -52,7 +52,7 @@
             <div class="layui-input-inline">
                 <select name="power_mode" id="power_mode" lay-filter="power_mode">
                     <option value="0">低功耗</option>
-                    <option value="1">正常</option>
+                    <option value="1">普通</option>
                 </select>
             </div>
         </div>
diff --git a/sec-beidou/src/main/resources/templates/page/table/gnss_add_group_calc.html b/sec-beidou/src/main/resources/templates/page/table/gnss_add_group_calc.html
index c70948bd..910d74ec 100644
--- a/sec-beidou/src/main/resources/templates/page/table/gnss_add_group_calc.html
+++ b/sec-beidou/src/main/resources/templates/page/table/gnss_add_group_calc.html
@@ -44,9 +44,9 @@
         <div class="layui-form-item">
             <label class="layui-form-label">自适应滤波</label>
             <div class="layui-input-inline">
-                <select name="auto_filter" id="auto_filter" lay-filter="type1">
-                    <option value=0>禁用</option>
-                    <option value=1>启用</option>
+                <select name="auto_filter" id="auto_filter" lay-filter="auto_filter">
+                    <option value="0">禁用</option>
+                    <option value="1">启用</option>
                 </select>
             </div>
         </div>
@@ -65,9 +65,9 @@
         <div class="layui-form-item">
             <label class="layui-form-label">自动补传</label>
             <div class="layui-input-inline">
-                <select name="auto_upload" id="auto_upload" lay-filter="type1">
-                    <option value=0>禁用</option>
-                    <option value=1>启用</option>
+                <select name="auto_upload" id="auto_upload" lay-filter="auto_upload">
+                    <option value="0">禁用</option>
+                    <option value="1">启用</option>
                 </select>
             </div>
         </div>
@@ -119,10 +119,10 @@
         $('#filter_hour').val(data.filter_hour);
         $('#xy_threshold').val(data.xy_threshold);
         $('#z_threshold').val(data.z_threshold);
-        $('#auto_filter').val(data.auto_filter);
+        $('#auto_filter').val(data.auto_filter?'1':'0');
         $('#filter_min_hour').val(data.filter_min_hour);
         $('#auto_threshold').val(data.auto_threshold);
-        $('#auto_upload').val(data.auto_upload);
+        $('#auto_upload').val(data.auto_upload?'1':'0');
         form.render();
     }
 </script>
diff --git a/sec-beidou/src/main/resources/templates/page/warning.html b/sec-beidou/src/main/resources/templates/page/warning.html
index 400a8cae..d7b3fc13 100644
--- a/sec-beidou/src/main/resources/templates/page/warning.html
+++ b/sec-beidou/src/main/resources/templates/page/warning.html
@@ -95,7 +95,7 @@
                 {field: 'createtime', title: '上报时间', width: '15%', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
                 {field: 'deviceid', title: '设备号'},
                 {field: 'devicetype', title: '设备类型'},
-                {field: 'level', title: '告警级别'},
+                {field: 'level', title: '告警级别',templet: "<div>{{d.level==2?'严重':'一般'}}</div>"},
                 {field: 'code', title: '告警类型'},
                 {field: 'info', title: '告警内容', width: '35%'}
             ]],