Merge branch 'dev-V1.10.0' into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelCityController.java

@@ -64,11 +64,9 @@ public class StatisticalPanelCityController {
 
 
     /** 监督端-市数据 */
-
-    @SaIgnore
     @PostMapping("/collectStatistics")
     @ResponseBody
-    public R<Map<String, Object>> analysisLawUnion( SixAnalysisParamsBo params){
+    public R<Map<String, Object>> analysisLawUnion(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
         Map<String, Object> resMap = statisticalPaneCityService.collectStatistics(params);
         return R.ok("联合检查", resMap);

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue

@@ -550,6 +550,9 @@ onBeforeUnmount(() => {
 
     .warp_body {
         position: relative;
+        flex: 1;
+        overflow-y: auto;
+        -webkit-overflow-scrolling: touch;
         background-image: linear-gradient(to bottom, #ebf3fb, transparent);
     }
 
@@ -580,6 +583,9 @@ onBeforeUnmount(() => {
     margin: 0 3%;
     width: 94%;
     height: 99%;
+    box-sizing: border-box;
+    /* 为底部固定的补录栏预留空间，避免内容被遮挡 */
+    padding-bottom: 2rem;
     background-color: #fff;
     border-radius: 0.27rem;
 }
@@ -602,18 +608,25 @@ onBeforeUnmount(() => {
 }
 
 .record {
-    position: absolute;
+    /* 固定在页面底部，内容滚动时始终可见，避免被上方区域覆盖导致点击失效 */
+    position: fixed;
+    left: 3%;
+    right: 3%;
     bottom: 2rem;
+    z-index: 200;
     color: #bbbaba;
     font-size: 0.35rem;
-    width: 100%;
     text-align: center;
     white-space: nowrap;
+    background-color: #fff;
 }
 
 .record div {
+    position: relative;
+    z-index: 200;
     color: #287eef;
     display: inline-block;
+    cursor: pointer;
 }
 
 /* ========== html5-qrcode 扫码弹层样式 ========== */