diff --git a/client/src/router/index.js b/client/src/router/index.js index e4ad0df..fae3d3b 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -450,7 +450,6 @@ const baseRoutes = [ // title: '扫码入企', // }, // }, - { path: 'jcbgl', name: '_jcbgl', diff --git a/client/src/views/fxczfgl/dzzxxc.vue b/client/src/views/fxczfgl/dzzxxc.vue index bf5e1e4..80ebf43 100644 --- a/client/src/views/fxczfgl/dzzxxc.vue +++ b/client/src/views/fxczfgl/dzzxxc.vue @@ -55,7 +55,9 @@ - + diff --git a/client/src/views/xzzfgl/smrq.vue b/client/src/views/xzzfgl/smrq.vue index 69aea3f..69a6e72 100644 --- a/client/src/views/xzzfgl/smrq.vue +++ b/client/src/views/xzzfgl/smrq.vue @@ -198,6 +198,7 @@ const { queryParams } = toRefs(state) +// 扫码入企 function handleMask(row) { maskConfig.value.show = true maskConfig.value.data = row 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 79ee09b..76d25ce 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 @@ -38,6 +38,7 @@ public class BigScreenController { public Result getDataOverview() { return Ok.of(bigScreenService.getDataOverview()); } + /** * 企业信息统计 * diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java index 208c7bd..111fd71 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java @@ -109,6 +109,7 @@ public class EnterpriseJoinScheduleService { @Transactional(propagation = Propagation.REQUIRES_NEW) public void scheduledUpdateEnterpriseTask2() { log.info("===== 开始执行企业感知设备信息同步任务 ====="); + int page = 0; final int limit = 2000; Page pageResult;