diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js
index d3a5b602..0fdc7154 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js
@@ -168,15 +168,13 @@ const getDeviceType = () =>{
const formatEnforcer = (item) => {
const enforcers = [];
if (item.lawEnforcer) {
- // 处理逗号分隔的多个执法人员
const names = item.lawEnforcer.split(',').map(n => n.trim()).filter(n => n);
const ids = item.lawEnforcerId ? item.lawEnforcerId.split(',').map(id => id.trim()).filter(id => id) : [];
names.forEach((name, index) => {
const id = ids[index] || '';
- enforcers.push(id ? `${name} ${id}` : name);
+ enforcers.push({ name, id });
});
}
- // 支持两种字段名:lawEnforcerTwo 或 lawEnforcerOther
const secondName = item.lawEnforcerTwo || item.lawEnforcerOther;
const secondId = item.lawEnforcerIdTwo || item.lawEnforcerIdOther;
if (secondName) {
@@ -184,7 +182,7 @@ const formatEnforcer = (item) => {
const ids = secondId ? secondId.split(',').map(id => id.trim()).filter(id => id) : [];
names.forEach((name, index) => {
const id = ids[index] || '';
- enforcers.push(id ? `${name} ${id}` : name);
+ enforcers.push({ name, id });
});
}
return enforcers;
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 4e6e7821..4a1da6de 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
@@ -28,8 +28,9 @@
执法人员
-
- {{ enforcer }}
+
+ {{ enforcer.name }}
+ {{ enforcer.id }}
@@ -535,6 +536,23 @@ const onSubmit = () => {
flex-direction: column;
}
+.enforcer-line {
+ display: flex;
+ align-items: baseline;
+ white-space: nowrap;
+}
+
+.enforcer-name {
+ display: inline-block;
+ min-width: 3em;
+ text-align: justify;
+ text-align-last: justify;
+}
+
+.enforcer-id {
+ margin-left: 0.4em;
+}
+
.result-row {
align-items: center;
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
index 4972a7fc..d4f6b3b8 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
@@ -25,9 +25,10 @@
执法人员:
-
-
- {{ enforcer }}
+
+
+ {{ enforcer.name }}
+ {{ enforcer.id }}
@@ -295,6 +296,28 @@ onMounted(() => {
white-space: nowrap;
}
}
+
+ .enforcer-list {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .enforcer-line {
+ display: flex;
+ align-items: baseline;
+ white-space: nowrap;
+ }
+
+ .enforcer-name {
+ display: inline-block;
+ min-width: 3em;
+ text-align: justify;
+ text-align-last: justify;
+ }
+
+ .enforcer-id {
+ margin-left: 0.4em;
+ }
}
.enforcer-block {
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue
index 415fc7ab..089fa4f4 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue
@@ -4,10 +4,13 @@
-
+
+
+
+
-
-
-
+
没有更多了
@@ -194,6 +195,17 @@ defineExpose({ refresh });
gap: 14px;
}
+.notice-empty {
+ padding: 40px 0;
+}
+
+.list-finished {
+ text-align: center;
+ font-size: 13px;
+ color: #969799;
+ padding: 16px 0;
+}
+
.notice-card {
background: #fff;
border-radius: 14px;