diff --git a/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust b/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust
index d36d7b90..5d47cfdf 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust
+++ b/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust
@@ -1,7 +1,8 @@
# VITE_APP_PROXY_TARGET = 'http://139.186.148.21:8080'
# VITE_APP_PROXY_TARGET = 'http://10.132.108.3:85/efcode20-sup-web/prod-api'
-# VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080'
-VITE_APP_PROXY_TARGET = 'http://172.16.21.93:8080'
+VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080'
+# VITE_APP_PROXY_TARGET = 'http://172.16.21.93:8080'
+# VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
# 页面标题
VITE_APP_TITLE = 执法监督码•执法监督
VITE_APP_LOGO_TITLE = 执法监督码•执法监督
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/statistics_enterprise/index.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/statistics_enterprise/index.vue
index d95e52bd..182b9a28 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/statistics_enterprise/index.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/statistics_enterprise/index.vue
@@ -143,18 +143,52 @@ const handleStreetChange = (val: string) => {
const loadTab1Data = async () => {
loading1.value = true;
try {
- const [overviewRes, areaRes] = await Promise.all([
- getOverview(queryParams),
- listByArea(queryParams)
- ]);
- overviewData.value = overviewRes.data;
- areaStatList.value = areaRes.data || [];
+ // TODO: 后续放开真实接口
+ // const [overviewRes, areaRes] = await Promise.all([
+ // getOverview(queryParams),
+ // listByArea(queryParams)
+ // ]);
+ // overviewData.value = overviewRes.data;
+ // areaStatList.value = areaRes.data || [];
+
+ // 写死数据(区域企业数量统计)
+ overviewData.value = {
+ total: 4439216,
+ existCount: 0,
+ cancelledCount: 0,
+ areaLabel: '全市'
+ };
+ areaStatList.value = [
+ { name: '宝安区', totalNumber: 984119, existNumber: 0, sort: 1 },
+ { name: '龙岗区', totalNumber: 966252, existNumber: 0, sort: 2 },
+ { name: '福田区', totalNumber: 615441, existNumber: 0, sort: 3 },
+ { name: '南山区', totalNumber: 601902, existNumber: 0, sort: 4 },
+ { name: '龙华区', totalNumber: 572932, existNumber: 0, sort: 5 },
+ { name: '罗湖区', totalNumber: 311483, existNumber: 0, sort: 6 },
+ { name: '光明区', totalNumber: 192114, existNumber: 0, sort: 7 },
+ { name: '坪山区', totalNumber: 92084, existNumber: 0, sort: 8 },
+ { name: '盐田区', totalNumber: 62220, existNumber: 0, sort: 9 },
+ { name: '大鹏新区', totalNumber: 29258, existNumber: 0, sort: 10 },
+ { name: '深汕特别合作区', totalNumber: 11411, existNumber: 0, sort: 11 }
+ ];
areaPageNum.value = 1;
} finally {
loading1.value = false;
}
};
+/** 区域汇总表合计行 */
+const getAreaSummary = ({ columns, data }: { columns: any[]; data: EnterpriseAreaStatVo[] }) => {
+ return columns.map((col, index) => {
+ if (index === 0) return '总计';
+ if (index === 1) {
+ const total = data.reduce((sum, item) => sum + (item.totalNumber || 0), 0);
+ return `${(total / 10000)} 万家`;
+ }
+ return '';
+ });
+};
+
/** 搜索 */
const handleQuery = () => {
if (viewLevel.value === 1) {
@@ -406,13 +440,13 @@ const handleExportType = async () => {
企业数量{{ overviewData.total }}
- 续存企业数量{{ overviewData.existCount }}
- 注销企业数量{{ overviewData.cancelledCount }}
+
+
-
+
{{ row.name }}
@@ -420,7 +454,7 @@ const handleExportType = async () => {
-
+
详情
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue
index 1c45c74f..ed5f0464 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue
@@ -54,6 +54,12 @@
入企时间
{{ formatTime(activityDetail.enforcementTime) }}
+
原因
{{ activityDetail.reason }}
@@ -190,6 +196,20 @@ onMounted(() => {
flex-direction: column;
}
+ .basis-list {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .basis-item {
+ padding-bottom: 6px;
+ line-height: 1.5;
+
+ &:last-child {
+ padding-bottom: 0;
+ }
+ }
+
.enforcer-line {
display: flex;
align-items: baseline;
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue
index b1d54528..3957a53f 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue
@@ -750,10 +750,11 @@ const onSubmit = () => {
bottom: 0;
left: 0;
right: 0;
- padding: 0.2rem 0.4rem;
+ padding: 0.2rem 0.4rem calc(0.2rem + env(safe-area-inset-bottom));
background: #fff;
box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05);
z-index: 10;
+ -webkit-tap-highlight-color: transparent;
}
/* ===== 只读状态可点击元素设置不可交互光标 ===== */
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
index 15ec3878..24a79c3f 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
@@ -34,11 +34,11 @@
@add-basis="handleAddBasis" @remove-basis="handleRemoveBasis" @add-person="handleAddPerson" />
-
+
保存
提交
提交并转办案
-
+
@@ -891,11 +891,11 @@ onMounted(() => {
right: 0;
display: flex;
gap: 0.2rem;
- padding: 0.28rem 0.32rem;
+ padding: 0.28rem 0.32rem calc(0.28rem + env(safe-area-inset-bottom));
background: #fff;
box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.08);
z-index: 99;
-
+ -webkit-tap-highlight-color: transparent;
.btn-save,
.btn-submit,
.btn-transfer {
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue
index 56d0be47..34b43cdb 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue
@@ -227,7 +227,7 @@ const onPublish = (item) => {
.add-btn {
position: fixed;
right: 22px;
- bottom: 28px;
+ bottom: calc(28px + env(safe-area-inset-bottom));
width: 56px;
height: 56px;
border-radius: 50%;
@@ -237,6 +237,7 @@ const onPublish = (item) => {
justify-content: center;
box-shadow: 0 8px 20px rgba(24, 144, 255, 0.38);
z-index: 100;
+ -webkit-tap-highlight-color: transparent;
&:active {
transform: scale(0.96);