From 802775bedc996ba45946ed09b52d60e19fddd1b0 Mon Sep 17 00:00:00 2001
From: renhao02 <huxin02@aisino.com>
Date: Fri, 5 Sep 2025 16:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=A3=85=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95=E4=BB=AA=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/big-screen/bigdata.vue                   | 7 +++++++
 client/src/views/zbgl/zfzbgl.vue                          | 8 +++++++-
 .../iles/lawenforcement/controller/ZfzbglController.java  | 1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue
index ca44a73..b53fa2c 100644
--- a/client/src/views/big-screen/bigdata.vue
+++ b/client/src/views/big-screen/bigdata.vue
@@ -127,6 +127,7 @@
       <div class="item">
         <div class="top_title">
           <div class="bg"></div>
+          <div class="label">执法装备概览</div>
         </div>
         <div class="content enterprise_content">
           <img src="../../assets/bigscreen/59.png">
@@ -190,6 +191,12 @@
       <div class="item">
         <div class="top_title">
           <div class="bg"></div>
+          <div class="label">非现场执法统计<span class="detail" @click="skipPage">(<label>详情</label>)</span></div>
+          <div class="time">
+            <span :class="{ active: isMonthActive }" @click="toggleTimeRange('1')">月</span>
+            <span :class="{ active: !isMonthActive }" @click="toggleTimeRange('2')">年</span>
+          </div>
+        </div>
 
     </div>
     <div class="bottom_content">
diff --git a/client/src/views/zbgl/zfzbgl.vue b/client/src/views/zbgl/zfzbgl.vue
index 07961c5..e84ede4 100644
--- a/client/src/views/zbgl/zfzbgl.vue
+++ b/client/src/views/zbgl/zfzbgl.vue
@@ -9,7 +9,12 @@
            @update:dialog-config="dialogConfig = $event">
     <template #queryPanel="{ queryParams: qp }">
       <el-form ref="queryForm" :model="qp" label-width="80px">
-
+        <el-row class="query-condition">
+          <el-col :span="6"><el-form-item label="属地"><AgencySelector v-model="qp.agency" :lazy-load="true" :multiple="false" placeholder="请选择"/></el-form-item></el-col>
+          <el-col :span="6"><el-form-item label="装备名称"><el-input v-model="qp.zbmc" clearable/></el-form-item></el-col>
+          <el-col :span="6"><el-form-item label="装备类型"><el-select v-model="qp.zblxdm" placeholder="请选择" clearable><el-option v-for="item in DICTITEMS.ZFZBZBLX_OPTIONS" :key="item.value" :label="item.label" :value="item.value"></el-option></el-select></el-form-item></el-col>
+        </el-row>
+      </el-form>
     </template>
     <el-table-column header-align="center" align="center" prop="sdmc" label="属地" min-width="200"/>
     <el-table-column header-align="center" align="center" prop="zbmc" label="装备名称" min-width="200" show-overflow-tooltip/>
@@ -28,6 +33,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="装备名称" prop="zbmc">
+
           </el-form-item>
         </el-col>
         <el-col :span="8">
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/ZfzbglController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/ZfzbglController.java
index 9df0894..c45fe8a 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/ZfzbglController.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/ZfzbglController.java
@@ -78,6 +78,7 @@ public class ZfzbglController {
 
     /**
      * 执法装备统计
+     *
      * @param query 查询参数
      * @param user  用户
      * @return 统计结果