From cd5476e57b37feb6f9e5ffb8bfb995219e69efe0 Mon Sep 17 00:00:00 2001 From: wangmingyong Date: Mon, 6 Jul 2026 10:41:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=99=AE=E6=B3=95?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=EF=BC=8C=E8=BD=AE=E6=92=AD=E5=9B=BE=EF=BC=8C?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=AE=A1=E7=90=86=E7=9A=84=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/nos/legalTech.vue | 74 +++++++++++-------- .../views/supervision/carouselBanner/add.vue | 11 ++- .../supervision/carouselBanner/detail.vue | 2 +- .../supervision/carouselBanner/draft.vue | 10 +-- .../views/supervision/carouselBanner/edit.vue | 11 ++- .../supervision/carouselBanner/index.vue | 11 +-- .../supervision/educationServices/add.vue | 12 ++- .../supervision/educationServices/detail.vue | 2 +- .../supervision/educationServices/draft.vue | 12 +-- .../supervision/educationServices/edit.vue | 10 ++- .../supervision/educationServices/index.vue | 6 +- .../supervision/educationServices/repost.vue | 12 ++- 12 files changed, 109 insertions(+), 64 deletions(-) diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/nos/legalTech.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/nos/legalTech.vue index 3010834f..10872267 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/nos/legalTech.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/nos/legalTech.vue @@ -4,20 +4,14 @@
- + - + @@ -28,19 +22,27 @@ 重置 - 新增 + +
+
+
+ 新增 +
-
- + --> + + + + +
@@ -77,6 +85,7 @@ const refreshing = ref(false); const pageNum = ref(1); const pageSize = ref(10); const isFetching = ref(false); // 防重复请求标志位 +const searchText = ref(''); // ========== 格式化时间 ========== const formatTime = (val) => { @@ -109,6 +118,9 @@ const fetchList = () => { pageNum: pageNum.value, pageSize: pageSize.value, }; + if (searchText.value) { + params.searchValue = searchText.value; + } getEducationServicesList(params, (res) => { if (res.code === 200) { const rows = res.rows || res.data?.rows || []; @@ -163,6 +175,21 @@ const onClickLeft = () => { router.back(); }; +// ========== 搜索 ========== +const onSearch = () => { + pageNum.value = 1; + list.value = []; + finished.value = false; + loading.value = true; + fetchList(); +}; + +// ========== 清空搜索 ========== +const onClear = () => { + searchText.value = ''; + onSearch(); +}; + // ========== 筛选点击 ========== const onFilterClick = () => { showToast('筛选功能开发中'); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue index b5ee604c..fdd64e3f 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue @@ -4,6 +4,14 @@ + + + + +
@@ -71,6 +79,7 @@ const finished = ref(false); const refreshing = ref(false); const pageNum = ref(1); const pageSize = ref(10); +const searchText = ref(''); // ========== 获取状态文本 ========== const getStatusText = (status) => { @@ -99,6 +108,9 @@ const fetchList = () => { pageSize: pageSize.value, hasEvaluate: 1, }; + if (searchText.value) { + params.searchValue = searchText.value; + } queryEvaluateList(params, (res) => { if (res.code === 200) { const rows = res.rows || res.data?.rows || res.data?.list || res.data || []; @@ -146,6 +158,21 @@ const onRefresh = () => { fetchList(); }; +// ========== 搜索 ========== +const onSearch = () => { + pageNum.value = 1; + list.value = []; + finished.value = false; + loading.value = true; + fetchList(); +}; + +// ========== 清空搜索 ========== +const onClear = () => { + searchText.value = ''; + onSearch(); +}; + // ========== 跳转详情页面 ========== const toDetail = (item) => { router.push({ @@ -287,4 +314,22 @@ onMounted(() => { :deep(.van-empty) { padding: 60px 0; } +/* ===== Vant 搜索框样式覆盖 ===== */ +:deep(.van-search__content) { + height: 0.9rem; + border: 1px solid #ececec; + border-radius: 0.15rem 0 0 0.15rem; +} + +:deep(.van-search__action) { + margin: 0 3% 0 0; + width: 10%; + height: 0.9rem; + background: #1367fe; + border: 0.01rem solid #1367fe; + border-radius: 0 0.15rem 0.15rem 0; + color: #fff; + text-align: center; + line-height: 0.9rem; +} \ No newline at end of file From 99fc540df2424f35a77f18a41bf805da26915817 Mon Sep 17 00:00:00 2001 From: wangmingyong Date: Tue, 7 Jul 2026 10:07:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E8=BD=AC=E8=BD=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/FooterBar.vue | 11 +-- .../src/store/messageState.js | 17 ++++ .../enforcement/law/lawServiceDetail.vue | 88 ++++++++++++++++- .../enforcement/message/messageCenter.vue | 97 ++++++++++++------- 4 files changed, 168 insertions(+), 45 deletions(-) diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue index 602c4a91..dc69f70f 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue @@ -20,6 +20,7 @@ import { onMounted } from 'vue'; import { getMessageUnreadCount } from '@/api/enforcement/index'; import nosIcon from '@/assets/images/nos/off_site_bottom_icon.png'; import tabBarBg from '@/assets/images/nos/tab_bar_bg.png'; +import { messageUnread, setMessageStats } from '@/store/messageState'; const props = defineProps({ active: { @@ -30,8 +31,6 @@ const props = defineProps({ const router = useRouter(); -const messageUnread = ref(0); - const tabs = [ { key: 'home', label: '首页', route: '/enforcement/enforcementHome', @@ -64,16 +63,16 @@ const onTabClick = (item) => { if (item.key === props.active) return; if (router.currentRoute.value.path !== item.route) { router.replace(item.route); - } - fetchMessageUnreadCount(); + } + // console.log('获取消息未读数量2222'); + // fetchMessageUnreadCount(); }; // ========== 获取消息未读数量 ========== const fetchMessageUnreadCount = () => { getMessageUnreadCount({}, (res) => { if (res && res.code === 200 && res.data) { - const totalCount = Number(res.data.totalCount) || 0; - messageUnread.value = totalCount; + setMessageStats(res.data); } }, () => { // 接口调用失败不处理 diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/messageState.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/messageState.js index 2883364c..d1423237 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/messageState.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/messageState.js @@ -6,6 +6,12 @@ import { ref, computed } from 'vue'; * - 消息中心页面负责写入；其他页面仅读取用于 footer-bar 角标展示 */ export const messageUnread = ref(0); +export const pffwCount = ref(0); // 普法服务未读数量 +export const zfpjcount = ref(0); // 执法评价未读数量 +export const zfygCount = ref(0); // 执法预告未读数量 +export const jhtzcount = ref(0); // 计划通知未读数量 +export const zfywCount = ref(0); // 执法任务未读数量 +export const zfyyCount = ref(0); // 执法预约未读数量 /** 格式化为角标展示值（0 显示空） */ export const messageUnreadBadge = computed(() => (messageUnread.value > 0 ? messageUnread.value : '')); @@ -15,6 +21,17 @@ export const setMessageUnread = (count) => { messageUnread.value = Number(count) || 0; }; +/** 设置所有消息数量 */ +export const setMessageStats = (data) => { + pffwCount.value = Number(data.pffwCount) || 0; + zfpjcount.value = Number(data.zfpjcount) || 0; + zfygCount.value = Number(data.zfygCount) || 0; + jhtzcount.value = Number(data.jhtzcount) || 0; + zfywCount.value = Number(data.zfywCount) || 0; + zfyyCount.value = Number(data.zfyyCount) || 0; + messageUnread.value = Number(data.totalCount) || 0; +}; + // 占位 default 导出：src/store 目录会被 globalStore.js 通过 import.meta.glob // 以 { import: 'default' } 的方式扫描，缺少 default 会触发 // "does not provide an export named 'default'" 错误。 diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceDetail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceDetail.vue index a12b9512..1230aa6f 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceDetail.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceDetail.vue @@ -24,8 +24,8 @@ {{ detail.time }}
- -