优化用户登录、一张图功能

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>

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
         }
     },
     {

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));
+    }
 
     /**
      * 执法检查统计

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;