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 @@
- + 综合执法一张图 + + +
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 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;