diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue
index 7e061aa2..70bfabb9 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue
@@ -369,7 +369,7 @@ const loadBasisList = () => {
{
pageSize: basisPageSize.value,
pageNum: basisPageNum.value,
- name: basisSearchKeyword.value || undefined,
+ lawName: basisSearchKeyword.value || undefined,
},
(res) => {
console.log(res)
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js
index aff537fd..375ea03a 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js
@@ -124,6 +124,24 @@ const routes = [
isKeepAlive: false,
},
},
+ // 执法端-执法任务列表
+ {
+ path: "/enforcement/enforcementTaskList",
+ name: "enforcementTaskList",
+ component: () => import("@/views/enforcement/message/enforcementTaskList.vue"),
+ meta: {
+ isKeepAlive: false,
+ },
+ },
+ // 执法端-执法预约列表
+ {
+ path: "/enforcement/enforcementReserveList",
+ name: "enforcementReserveList",
+ component: () => import("@/views/enforcement/message/enforcementReserveList.vue"),
+ meta: {
+ isKeepAlive: false,
+ },
+ },
// 执法端-我的(tabbar)
{
path: "/enforcement/my",
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceList.vue
index 4cac3511..9181da94 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceList.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceList.vue
@@ -19,7 +19,7 @@
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementReserveList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementReserveList.vue
new file mode 100644
index 00000000..b7e6f41b
--- /dev/null
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementReserveList.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
{{ item.time }}
+
+
+
待执行任务:
+
+
+ {{ item.reserveUnit ? '预约单位' : '执法单位' }}
+ {{ item.reserveUnit || item.enforcementUnit || '-' }}
+
+
+ 企业名称
+ {{ item.enterpriseName || '-' }}
+
+
+ 检查时间
+ {{ item.checkTime || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue
new file mode 100644
index 00000000..9e77eb39
--- /dev/null
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
{{ item.time }}
+
+
+
待执行任务:
+
+
+ 企业名称
+ {{ item.enterpriseName || '-' }}
+
+
+ 检查时间
+ {{ item.checkTime || '-' }}
+
+
+ 执法事项
+ {{ item.enforcementItem || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue
index 0dcbb9af..1f066868 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue
@@ -31,6 +31,7 @@
{{ item.desc }}
+ >
@@ -56,6 +57,7 @@
{{ item.desc }}
+
@@ -150,6 +152,14 @@ const initMessageList = () => {
icon: 'law',
iconBg: 'icon-blue',
unreadCount: messageStats.value.zfpjcount,
+ },{
+ id: 4,
+ title: '非现场执法评价',
+ desc: '',
+ time: '',
+ icon: 'law',
+ iconBg: 'icon-blue',
+ unreadCount: messageStats.value.zfpjcount,
},{
id: 2,
title: '计划通知',
@@ -288,6 +298,11 @@ const onMessageClick = (item) => {
router.push({
path: '/enforcement/enforcementEvaluateList',
});
+ }else if(item.title === '非现场执法评价'){
+ sessionStorage.setItem('messageReturnTab', '0');
+ router.push({
+ path: '/enforcement/nos/evaluate',
+ });
} else {
showToast(`点击了:${item.title}`);
}
@@ -300,6 +315,16 @@ const onTodoClick = (item) => {
router.push({
path: '/enforcement/enforcementNoticeList',
});
+ } else if (item.title === '执法任务') {
+ sessionStorage.setItem('messageReturnTab', '1');
+ router.push({
+ path: '/enforcement/enforcementTaskList',
+ });
+ } else if (item.title === '执法预约') {
+ sessionStorage.setItem('messageReturnTab', '1');
+ router.push({
+ path: '/enforcement/enforcementReserveList',
+ });
} else if (item.title === '待评价执法') {
sessionStorage.setItem('messageReturnTab', '1');
router.push({
@@ -404,7 +429,7 @@ onMounted(() => {
/* ===== 消息列表项 ===== */
.message-item {
display: flex;
- align-items: flex-start;
+ align-items: center;
background: #fff;
border-radius: 12px;
padding: 14px 16px;
@@ -429,7 +454,10 @@ onMounted(() => {
color: #fff;
}
}
-
+.item-right{
+ font-size: 22px;
+ color: #a6a6a6;
+}
/* 图标背景色 */
.icon-blue {
background: url('@/assets/images/icon_pffw.jpg') center center no-repeat;
@@ -473,7 +501,6 @@ onMounted(() => {
display: flex;
justify-content: space-between;
align-items: center;
- margin-bottom: 6px;
}
.item-title {
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosEvaluateList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosEvaluateList.vue
index 8742fa0f..aae92dc7 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosEvaluateList.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosEvaluateList.vue
@@ -6,7 +6,7 @@