From 2bf0f1cb8066f1f691e6093318771438e7fd7868 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Mon, 22 Jan 2024 11:37:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GnssCalcDataController.java      |  8 +++++++-
 .../templates/page/gnss_data_calc.html          | 17 ++++++++++++++---
 .../resources/templates/page/gnss_data_raw.html |  6 ++++--
 .../main/resources/templates/page/gnss_msg.html |  6 ++++--
 .../templates/page/gnss_msg_status.html         |  6 ++++--
 .../resources/templates/page/gnss_msg_trx.html  |  6 ++++--
 .../main/resources/templates/page/warning.html  |  6 ++++--
 7 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
index 44c1f83d..98e81ad6 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
@@ -2,6 +2,8 @@ package com.imdroid.beidou.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.imdroid.beidou.entity.Tenant;
+import com.imdroid.beidou.entity.TenantMapper;
 import com.imdroid.beidou.service.CommonExcelService;
 import com.imdroid.secapi.dto.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 /**
  * gnss设备解算数据 控制器
@@ -21,10 +24,13 @@ import javax.servlet.http.HttpSession;
 public class GnssCalcDataController extends BasicController implements CommonExcelService<GnssCalcData, GnssCalcData> {
     @Autowired
     GnssCalcDataMapper dataMapper;
-
+    @Autowired
+    TenantMapper tenantMapper;
     @RequestMapping("/page/gnss_data_calc")
     public String gnssData(Model m, HttpSession session) {
         initModel(m, session);
+        List<Tenant> tenants = tenantMapper.selectList(null);
+        m.addAttribute("tenant_list", tenants);
         return "/page/gnss_data_calc";
     }
 
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 a8897319..30df9573 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
@@ -24,7 +24,16 @@
                                 <input type="text" name="sl_deviceid" id="deviceid" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-						<div class="layui-inline">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">所属部门</label>
+                            <div class="layui-input-inline">
+                                <select name="n_tenantid" id="n_tenantid" lay-search="">
+                                    <option value="">全部</option>
+                                    <option th:each="item : ${tenant_list}" th:text="${item.name}" th:value="${item.id}"></option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
 						    <label class="layui-form-label">范围</label>
 						    <div class="layui-input-inline">
 								<input type="text" name="dgt_createtime" autocomplete="off" id="ID-laydate-start-date" class="layui-input" placeholder="开始日期">
@@ -73,10 +82,12 @@
 		form.render();
 
         laydate.render({
-            elem: '#ID-laydate-start-date'
+            elem: '#ID-laydate-start-date',
+            type: 'datetime'
         });
         laydate.render({
-            elem: '#ID-laydate-end-date'
+            elem: '#ID-laydate-end-date',
+            type: 'datetime'
         });
 
         table.render({
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_data_raw.html b/sec-beidou/src/main/resources/templates/page/gnss_data_raw.html
index d4118373..331112b4 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_data_raw.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_data_raw.html
@@ -63,10 +63,12 @@
 		form.render();
 
         laydate.render({
-            elem: '#ID-laydate-start-date'
+            elem: '#ID-laydate-start-date',
+            type: 'datetime'
         });
         laydate.render({
-            elem: '#ID-laydate-end-date'
+            elem: '#ID-laydate-end-date',
+            type: 'datetime'
         });
 
         table.render({
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 6bd3933c..fdc52bb2 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_msg.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_msg.html
@@ -59,10 +59,12 @@
 		form.render();
 
         laydate.render({
-            elem: '#ID-laydate-start-date'
+            elem: '#ID-laydate-start-date',
+            type: 'datetime'
         });
         laydate.render({
-            elem: '#ID-laydate-end-date'
+            elem: '#ID-laydate-end-date',
+            type: 'datetime'
         });
 
         table.render({
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_msg_status.html b/sec-beidou/src/main/resources/templates/page/gnss_msg_status.html
index 98bfd4f4..3ffc93b7 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_msg_status.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_msg_status.html
@@ -59,10 +59,12 @@
         form.render();
 
         laydate.render({
-            elem: '#ID-laydate-start-date'
+            elem: '#ID-laydate-start-date',
+            type: 'datetime'
         });
         laydate.render({
-            elem: '#ID-laydate-end-date'
+            elem: '#ID-laydate-end-date',
+            type: 'datetime'
         });
 
         table.render({
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html b/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
index 54936c27..7e8934dd 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
@@ -59,10 +59,12 @@
         form.render();
 
         laydate.render({
-            elem: '#ID-laydate-start-date'
+            elem: '#ID-laydate-start-date',
+            type: 'datetime'
         });
         laydate.render({
-            elem: '#ID-laydate-end-date'
+            elem: '#ID-laydate-end-date',
+            type: 'datetime'
         });
 
         table.render({
diff --git a/sec-beidou/src/main/resources/templates/page/warning.html b/sec-beidou/src/main/resources/templates/page/warning.html
index b78e3c50..0483caa3 100644
--- a/sec-beidou/src/main/resources/templates/page/warning.html
+++ b/sec-beidou/src/main/resources/templates/page/warning.html
@@ -79,10 +79,12 @@
 		 */
 		form.render();
         laydate.render({
-            elem: '#ID-laydate-start-date'
+            elem: '#ID-laydate-start-date',
+            type: 'datetime'
         });
         laydate.render({
-            elem: '#ID-laydate-end-date'
+            elem: '#ID-laydate-end-date',
+            type: 'datetime'
         });
 		
         table.render({