From 7abf19650e14ffbe82d43545edd90bd50acb910a Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sun, 10 Dec 2023 23:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E7=AE=97=E7=BB=93=E6=9E=9C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0enabled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/page/gnss_data_calc.html    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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 a7d3424e..de5f8ae8 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
@@ -74,16 +74,14 @@
             }],
             cols: [[
                 {field: 'deviceid', title: '设备号'},
-                {field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
+                {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: 'resulte', title: '融合东'},
-                {field: 'resultn', title: '融合北'},
-                {field: 'resultd', title: '融合天'},
+                {field: 'enabled', title: '有效',templet: '#enabledTrans'},
                 {field: 'pps', title: '平均延迟'}
             ]],
             limits: [10, 15, 20, 25, 50, 100],
@@ -246,4 +244,11 @@
 
 </script>
 
+<script type="text/html" id="enabledTrans">
+    {{#  if(d.enabled == false){ }}
+    <span class="layui-badge layui-bg-gray">无效</span>
+    {{# } else { }}
+    <span class="layui-badge layui-bg-green">有效</span>
+    {{#  } }}
+</script>