From 2a041d4fcbeda8541b7f1f4e99b9e1a3b41dfdc1 Mon Sep 17 00:00:00 2001
From: songxudong <huxin02@aisino.com>
Date: Fri, 16 May 2025 18:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=B0=83=E6=95=B4=E6=89=A7=E6=B3=95=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BB=AA=E9=80=9A=E8=AF=9D=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                | 10 ----------
 .../lawenforcement/controller/BigScreenController.java |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/client/src/layouts/header/index-svi.vue b/client/src/layouts/header/index-svi.vue
index ab214ed..311c13c 100644
--- a/client/src/layouts/header/index-svi.vue
+++ b/client/src/layouts/header/index-svi.vue
@@ -26,16 +26,6 @@
         </template>
       </el-dropdown>
     </div>
-
-    <div class="menu-conten" v-if="topMenuList[projectName].length">
-      <div class="menu-conten-item" v-for="(item, index) in topMenuList[projectName]" :key="index" :title="item.name"
-           @click="handleTo(item)" :class="{ isActive: item.path == topActive }">
-        <span>
-          {{ item.name }}
-        </span>
-      </div>
-    </div>
-
     <div class="right-profile">
       <span class="zyt" @click="skipPage"><i>综合执法一张图</i></span>
       <span class="el-dropdown-link">
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 1f811dc..6353ea6 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
@@ -48,8 +48,8 @@ public class BigScreenController {
      */
     @GetMapping("/qytj")
     public Result<Map> getEnterpriseStatistics(@CurrentUser RemoteUserInfo user) {
-        // return Ok.of(bigScreenService.getEnterpriseStatistics(user));
-        return Ok.of(bigScreenService.getEnterpriseStatistics2(user));
+        return Ok.of(bigScreenService.getEnterpriseStatistics(user));
+        Ok.of(bigScreenService.getEnterpriseStatistics2(user));
     }
 
     /**