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 98117ad2..d36d7b90 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,6 +1,7 @@
# 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.213:8080'
+VITE_APP_PROXY_TARGET = 'http://172.16.21.93:8080'
# 页面标题
VITE_APP_TITLE = 执法监督码•执法监督
VITE_APP_LOGO_TITLE = 执法监督码•执法监督
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue
index dd11926b..e84c00aa 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue
@@ -309,7 +309,8 @@ const timePeriodText = computed(() => {
const formatDate = (row: any) => {
if (!row.enforcementTime) return '';
const d = new Date(row.enforcementTime);
- return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+ const pad = (n: number) => String(n).padStart(2, '0');
+ return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
};
/** 排序变更 */
@@ -456,7 +457,7 @@ const closeDetailDialog = () => {
-
+
@@ -466,7 +467,7 @@ const closeDetailDialog = () => {
-
+
{{ formatDate(row) }}
@@ -531,8 +532,8 @@ const closeDetailDialog = () => {
/>
-
-
+
+
{{ detailRow.bureauDeptName || '-' }}
{{ detailRow.enterpriseName || '-' }}
{{ detailRow.district || '-' }}
@@ -548,8 +549,10 @@ const closeDetailDialog = () => {
{{ detailRow.checkCss ? '否' : '是' }}
{{ noScanReasonOptions.find(d => d.dictValue === detailRow.checkCss)?.dictLabel || '-' }}
{{ detailRow.otherReasons || '-' }}
- {{ detailRow.isComplaint === 1 ? '是' : '否' }}
+ {{ detailRow.isComplaint === 1 ? '是' : '否' }}
+ {{ detailRow.createTime ? formatDate(detailRow) : '-' }}
+
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue
index d90ad269..28397385 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue
@@ -248,18 +248,14 @@ const loadPersonList = () => {
if (notUserId) {
params.notUserId = notUserId;
}
- // console.log(params);
getBureauUnitUsers(params, (res) => {
if (res.code === 200 || res.code === 0) {
let data = res.data || res.rows || [];
// 前端过滤:移除已选择的人员
- console.log(props.selectedPersons);
const selectedIds = props.selectedPersons.map(p => Number( p.userId || p.id)).filter(Boolean);
- console.log(selectedIds);
if (selectedIds.length > 0) {
data = data.filter(item => {
const id = item.userId || '';
- console.log(id,selectedIds.includes(id),'333');
return !selectedIds.includes(id);
});
}
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue
index dd7e6f56..305417f2 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue
@@ -208,10 +208,10 @@ onMounted(() => {
isLoading.value = useCommon.firstLoad;
- // 安全超时:20秒后强制关闭loading,防止异常导致一直转圈
- setTimeout(() => {
- isLoading.value = false;
- }, 20000);
+ // // 安全超时:20秒后强制关闭loading,防止异常导致一直转圈
+ // setTimeout(() => {
+ // isLoading.value = false;
+ // }, 20000);
if (useCommon.token) {
isLoading.value = false;
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
index 0a4366db..3a964ab6 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
@@ -16,9 +16,9 @@
-
-