From f7cd4674f2feae628480a103139f6098530d925a Mon Sep 17 00:00:00 2001
From: yuyan02 <huxin02@aisino.com>
Date: Fri, 29 Aug 2025 20:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E3=80=81=E4=B8=80=E5=BC=A0=E5=9B=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/layouts/header/index-svi.vue                   | 5 ++++-
 client/src/router/index.js                                | 8 +-------
 .../lawenforcement/controller/BigScreenController.java    | 6 +++++-
 .../iles/lawenforcement/service/BigScreenService.java     | 3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/client/src/layouts/header/index-svi.vue b/client/src/layouts/header/index-svi.vue
index 69cff52..2c28304 100644
--- a/client/src/layouts/header/index-svi.vue
+++ b/client/src/layouts/header/index-svi.vue
@@ -36,7 +36,10 @@
       </div>
     </div>
     <div class="right-profile">
-
+      <span class="zyt" @click="skipPage"><i>综合执法一张图</i></span>
+      <i class="iconfont icon-zngzt_zfdc" v-if="projectName == 'gzt'" title="编辑桌面"></i>
+      <i class="iconfont icon-zngzt_syfw" v-if="projectName != 'gzt'" @click="handleTo({ path: 'gzt' })" title="首页"></i>
+      <NotificationBell/>
       <public-full-screen></public-full-screen>
       <i class="iconfont icon-zngzt_tcdl" @click="handleLogout" title="退出"></i>
     </div>
diff --git a/client/src/router/index.js b/client/src/router/index.js
index e68a068..f8fd562 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -66,13 +66,7 @@ const baseRoutes = [
         openInNewTab: true
         },
         beforeEnter: (to) => {
-        const inNewTab = to.query._nw === '1'
-        if (to.meta && to.meta.openInNewTab && !inNewTab) {
-            const newUrl = `${window.location.origin}${window.location.pathname}#${to.fullPath}${to.fullPath.includes('?') ? '&' : '?'}_nw=1`
-            window.open(newUrl, '_blank')
-            return false
-        }
-        return true
+
         }
     },
     {
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
index 52ab1b4..a6c37d0 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
@@ -45,7 +45,11 @@ public class BigScreenController {
      * @param
      * @return 企业信息统计
      */
-
+    @GetMapping("/qytj")
+    public Result<Map> getEnterpriseStatistics(@CurrentUser RemoteUserInfo user) {
+        // return Ok.of(bigScreenService.getEnterpriseStatistics(user));
+        return Ok.of(bigScreenService.getEnterpriseStatistics2(user));
+    }
 
     /**
      * 执法检查统计
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java
index fa0eec4..9cc23b3 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java
@@ -39,7 +39,8 @@ public class BigScreenService {
 Repository;
     private final EnforcementInfoService enforcementInfoService;
     private final EnforceCheckRepository enforceCheckRepository;
-
+    private final OfficerRepository officerRepository;
+    private final CaseRepository caseRepository;
     private final AutoEnforcementPlanRepository autoEnforcementPlanRepository;
     private final SupervisionCheckRepository supervisionCheckRepository;
     private final ReportCheckOperRepository reportCheckOperRepository;