Merge branch 'dev-V1.10.0' into dev

zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/trend/scan-district/index.vue

@@ -158,10 +158,10 @@ const buildTimeParams = (): ScanTimeParams => {
   return { startTime: queryParams.beginTime, endTime: queryParams.endTime };
 };
 
-/** 当前选中的所属区（字典 dictValue→districtCode，dictLabel→districtName） */
+/** 当前选中的所属区（dictLabel→districtName，不再传 districtCode） */
 const currentDistrict = () => {
   const item = areaOptions.value.find((i: any) => i.dictValue === queryParams.area);
-  return { districtCode: queryParams.area, districtName: item?.dictLabel };
+  return { districtName: item?.dictLabel };
 };
 
 const getList = async () => {
@@ -263,7 +263,6 @@ const getDetailList = async () => {
     if (!detailArea.value) return;
     const res = await listScanAreaDetails({
       ...buildTimeParams(),
-      districtCode: detailArea.value.districtCode || queryParams.area,
       districtName: detailArea.value.districtName || detailArea.value.areaName || currentDistrict().districtName
     });
     detailTableData.value = (res as any)?.rows || (Array.isArray(res) ? res : []);

zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/trend/scan-enforcer/index.vue

@@ -110,7 +110,14 @@ const calcTableHeight = () => {
 const getList = async () => {
   loading.value = true;
   try {
-    const res = await listLawEnforcer(queryParams);
+    // 接口字段：区 → districtName（下拉绑定的是 dictLabel），领域 → bureauDeptName（传 domainName）
+    const { area, field, ...rest } = queryParams;
+    const domain = fieldOptions.value.find((i) => i.domainId === field);
+    const res = await listLawEnforcer({
+      ...rest,
+      districtName: area,
+      bureauDeptName: domain?.domainName
+    });
     tableData.value = (res as any)?.rows || [];
     total.value = (res as any)?.total || 0;
   } catch (e) {

zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/trend/scan-field/index.vue

@@ -123,10 +123,10 @@ const currentField = () => {
   return { domainId: queryParams.field, domainName: item?.domainName };
 };
 
-/** 当前选中的所属区（dictValue→districtCode，dictLabel→districtName） */
+/** 当前选中的所属区（dictLabel→districtName，不再传 districtCode） */
 const currentArea = () => {
   const item = areaOptions.value.find((i: any) => i.dictValue === queryParams.area);
-  return { districtCode: queryParams.area, districtName: item?.dictLabel };
+  return { districtName: item?.dictLabel };
 };
 
 const getList = async () => {