diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4231a40..4b32c4e 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -20,19 +20,25 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <!-- <ImagePreview
+          <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview> -->
+          ></ImagePreview>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,14 +67,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="缩略图" prop="coverPhotosFileList">
               <ImageFileUpload
                 :limit="1"
@@ -79,18 +85,17 @@
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入政策法规内容"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="技术标准内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,13 +146,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -172,52 +176,54 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改政策法规';
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改政策法规';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改政策法规';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改政策法规') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改政策法规') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4231a40..4b32c4e 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -20,19 +20,25 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <!-- <ImagePreview
+          <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview> -->
+          ></ImagePreview>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,14 +67,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="缩略图" prop="coverPhotosFileList">
               <ImageFileUpload
                 :limit="1"
@@ -79,18 +85,17 @@
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入政策法规内容"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="技术标准内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,13 +146,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -172,52 +176,54 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改政策法规';
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改政策法规';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改政策法规';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改政策法规') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改政策法规') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index f767b34..4d3fed6 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -20,10 +20,15 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="发布日期" prop="time" />
-      <el-table-column label="通知公告名称" prop="title" />
-      <el-table-column label="通知内容" prop="title1" />
-      <el-table-column label="跳转链接" prop="createBy" />>
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="通知公告名称" prop="title"> </el-table-column>
+      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -47,13 +52,13 @@
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="发布日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,9 +69,9 @@
               <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="通知内容:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+          <el-col :span="24">
+            <el-form-item label="通知内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,6 +88,7 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
+
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
 
@@ -111,24 +117,19 @@
   },
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
+    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [
-    {
-      title: '123',
-    },
-  ];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +154,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改通知公告';
-  formData.value = row;
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改通知公告';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改通知公告') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改通知公告') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4231a40..4b32c4e 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -20,19 +20,25 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <!-- <ImagePreview
+          <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview> -->
+          ></ImagePreview>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,14 +67,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="缩略图" prop="coverPhotosFileList">
               <ImageFileUpload
                 :limit="1"
@@ -79,18 +85,17 @@
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入政策法规内容"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="技术标准内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,13 +146,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -172,52 +176,54 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改政策法规';
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改政策法规';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改政策法规';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改政策法规') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改政策法规') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index f767b34..4d3fed6 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -20,10 +20,15 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="发布日期" prop="time" />
-      <el-table-column label="通知公告名称" prop="title" />
-      <el-table-column label="通知内容" prop="title1" />
-      <el-table-column label="跳转链接" prop="createBy" />>
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="通知公告名称" prop="title"> </el-table-column>
+      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -47,13 +52,13 @@
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="发布日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,9 +69,9 @@
               <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="通知内容:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+          <el-col :span="24">
+            <el-form-item label="通知内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,6 +88,7 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
+
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
 
@@ -111,24 +117,19 @@
   },
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
+    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [
-    {
-      title: '123',
-    },
-  ];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +154,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改通知公告';
-  formData.value = row;
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改通知公告';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改通知公告') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改通知公告') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
new file mode 100644
index 0000000..dd4a428
--- /dev/null
+++ b/src/views/publicService/publicmind.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="publicContainer">
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="公众意见" prop="opinion" style="width: 300px">
+        <el-input v-model="queryParams.opinion" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="年份" style="width: 200px">
+        <el-date-picker
+          type="year"
+          v-model="queryParams.publishTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="用户头像" prop="headImg">
+        <template #default="scope">
+          <el-image :src="scope.row.headImg" style="width: 100px; height: 100px"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称" prop="wechatName" />
+      <el-table-column label="日期" prop="publishTime" />
+      <el-table-column label="上传图片" prop="filelist">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column label="公众意见" prop="opinion" width="650" />
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script setup name="公众意见">
+import { peopleOpinionPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import defaultImg from '@/assets/images/login/user.png';
+
+const { proxy } = getCurrentInstance();
+
+const tableData = ref([]);
+const tableLoading = ref(true);
+const total = ref(0);
+const showSearch = ref(true);
+
+const allData = reactive({
+  a: '',
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    opinion: undefined,
+    publishTime: ref(proxy.moment(new Date()).format('YYYY')),
+  },
+});
+const { queryParams } = toRefs(allData);
+
+/** 获取查询数据列表 */
+function getDataList() {
+  tableLoading.value = true;
+  peopleOpinionPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+    // response.data.forEach(element => {
+    //   console.log(element.filelist, 'element');
+    //   element.filelist.forEach(urlimg => {
+    //     allData.a = urlimg.url;
+    //     console.log(allData.a, 'urlimg');
+    //   });
+    // });
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getDataList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef');
+  queryParams.value.publishTime = ref(proxy.moment(new Date()).format('YYYY'));
+  handleQuery();
+}
+
+onMounted(() => {
+  getDataList();
+});
+</script>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4231a40..4b32c4e 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -20,19 +20,25 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <!-- <ImagePreview
+          <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview> -->
+          ></ImagePreview>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,14 +67,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="缩略图" prop="coverPhotosFileList">
               <ImageFileUpload
                 :limit="1"
@@ -79,18 +85,17 @@
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入政策法规内容"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="技术标准内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,13 +146,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -172,52 +176,54 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改政策法规';
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改政策法规';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改政策法规';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改政策法规') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改政策法规') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index f767b34..4d3fed6 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -20,10 +20,15 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="发布日期" prop="time" />
-      <el-table-column label="通知公告名称" prop="title" />
-      <el-table-column label="通知内容" prop="title1" />
-      <el-table-column label="跳转链接" prop="createBy" />>
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="通知公告名称" prop="title"> </el-table-column>
+      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -47,13 +52,13 @@
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="发布日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,9 +69,9 @@
               <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="通知内容:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+          <el-col :span="24">
+            <el-form-item label="通知内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,6 +88,7 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
+
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
 
@@ -111,24 +117,19 @@
   },
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
+    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [
-    {
-      title: '123',
-    },
-  ];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +154,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改通知公告';
-  formData.value = row;
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改通知公告';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改通知公告') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改通知公告') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
new file mode 100644
index 0000000..dd4a428
--- /dev/null
+++ b/src/views/publicService/publicmind.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="publicContainer">
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="公众意见" prop="opinion" style="width: 300px">
+        <el-input v-model="queryParams.opinion" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="年份" style="width: 200px">
+        <el-date-picker
+          type="year"
+          v-model="queryParams.publishTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="用户头像" prop="headImg">
+        <template #default="scope">
+          <el-image :src="scope.row.headImg" style="width: 100px; height: 100px"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称" prop="wechatName" />
+      <el-table-column label="日期" prop="publishTime" />
+      <el-table-column label="上传图片" prop="filelist">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column label="公众意见" prop="opinion" width="650" />
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script setup name="公众意见">
+import { peopleOpinionPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import defaultImg from '@/assets/images/login/user.png';
+
+const { proxy } = getCurrentInstance();
+
+const tableData = ref([]);
+const tableLoading = ref(true);
+const total = ref(0);
+const showSearch = ref(true);
+
+const allData = reactive({
+  a: '',
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    opinion: undefined,
+    publishTime: ref(proxy.moment(new Date()).format('YYYY')),
+  },
+});
+const { queryParams } = toRefs(allData);
+
+/** 获取查询数据列表 */
+function getDataList() {
+  tableLoading.value = true;
+  peopleOpinionPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+    // response.data.forEach(element => {
+    //   console.log(element.filelist, 'element');
+    //   element.filelist.forEach(urlimg => {
+    //     allData.a = urlimg.url;
+    //     console.log(allData.a, 'urlimg');
+    //   });
+    // });
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getDataList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef');
+  queryParams.value.publishTime = ref(proxy.moment(new Date()).format('YYYY'));
+  handleQuery();
+}
+
+onMounted(() => {
+  getDataList();
+});
+</script>
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index aa18bdd..9e986ce 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -69,18 +69,18 @@
         <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
-        <el-form-item label="年份选择" prop="year">
+        <!-- <el-form-item label="年份选择" prop="year">
           <el-date-picker type="year" v-model="formData.year" value-format="YYYY" placeholder="请选择日期"> </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="问卷状态" prop="ifStart">
           <el-radio-group v-model="formData.ifStart">
             <el-radio :label="1">启用</el-radio>
             <el-radio :label="0">未启用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="问卷介绍" prop="introduce">
+        <!-- <el-form-item label="问卷介绍" prop="introduce">
           <el-input type="textarea" v-model="formData.introduce" />
-        </el-form-item>
+        </el-form-item> -->
         <el-divider />
         <el-button type="primary" plain icon="Plus" @click="addQues">新增标题内容</el-button>
         <el-table :data="formData.problemConfigList" style="margin-top: 10px" max-height="300">
@@ -108,13 +108,13 @@
     <!-- 问题答案编辑 -->
     <el-dialog :title="dialogTitleAns" v-model="dialogShowAns" width="500px" append-to-body>
       <el-form ref="formRefAns" :model="formDataAns" :rules="rulesFormAns" label-width="80px" class="publicForm">
-        <el-form-item label="试题名称" prop="problemName">
+        <el-form-item label="问题名称" prop="problemName">
           <el-input v-model="formDataAns.problemName" />
         </el-form-item>
         <el-form-item label="满分" prop="fullScore">
           <el-input v-model="formDataAns.fullScore" placeholder="分值" />
         </el-form-item>
-        <el-form-item label="题型" prop="problemType">
+        <el-form-item label="问题类型" prop="problemType">
           <el-select v-model="formDataAns.problemType" placeholder="请选择">
             <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
@@ -123,7 +123,7 @@
         <el-button type="primary" plain icon="Plus" @click="addAnswer">新增问题答案</el-button>
         <!-- 批量新增 可新增区域 -->
         <el-table :data="formDataAns.problemOptionList" style="margin-top: 10px">
-          <el-table-column label="选项名称" prop="optionName">
+          <el-table-column label="问题选项" prop="optionName">
             <template #default="scope">
               <el-input v-model="scope.row.optionName" />
             </template>

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4231a40..4b32c4e 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -20,19 +20,25 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <!-- <ImagePreview
+          <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview> -->
+          ></ImagePreview>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,14 +67,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="缩略图" prop="coverPhotosFileList">
               <ImageFileUpload
                 :limit="1"
@@ -79,18 +85,17 @@
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入政策法规内容"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="技术标准内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,13 +146,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -172,52 +176,54 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改政策法规';
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改政策法规';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改政策法规';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改政策法规') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改政策法规') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index f767b34..4d3fed6 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -20,10 +20,15 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="发布日期" prop="time" />
-      <el-table-column label="通知公告名称" prop="title" />
-      <el-table-column label="通知内容" prop="title1" />
-      <el-table-column label="跳转链接" prop="createBy" />>
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="通知公告名称" prop="title"> </el-table-column>
+      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -47,13 +52,13 @@
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="发布日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,9 +69,9 @@
               <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="通知内容:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+          <el-col :span="24">
+            <el-form-item label="通知内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,6 +88,7 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
+
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
 
@@ -111,24 +117,19 @@
   },
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
+    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [
-    {
-      title: '123',
-    },
-  ];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +154,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改通知公告';
-  formData.value = row;
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改通知公告';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改通知公告') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改通知公告') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
new file mode 100644
index 0000000..dd4a428
--- /dev/null
+++ b/src/views/publicService/publicmind.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="publicContainer">
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="公众意见" prop="opinion" style="width: 300px">
+        <el-input v-model="queryParams.opinion" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="年份" style="width: 200px">
+        <el-date-picker
+          type="year"
+          v-model="queryParams.publishTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="用户头像" prop="headImg">
+        <template #default="scope">
+          <el-image :src="scope.row.headImg" style="width: 100px; height: 100px"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称" prop="wechatName" />
+      <el-table-column label="日期" prop="publishTime" />
+      <el-table-column label="上传图片" prop="filelist">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column label="公众意见" prop="opinion" width="650" />
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script setup name="公众意见">
+import { peopleOpinionPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import defaultImg from '@/assets/images/login/user.png';
+
+const { proxy } = getCurrentInstance();
+
+const tableData = ref([]);
+const tableLoading = ref(true);
+const total = ref(0);
+const showSearch = ref(true);
+
+const allData = reactive({
+  a: '',
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    opinion: undefined,
+    publishTime: ref(proxy.moment(new Date()).format('YYYY')),
+  },
+});
+const { queryParams } = toRefs(allData);
+
+/** 获取查询数据列表 */
+function getDataList() {
+  tableLoading.value = true;
+  peopleOpinionPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+    // response.data.forEach(element => {
+    //   console.log(element.filelist, 'element');
+    //   element.filelist.forEach(urlimg => {
+    //     allData.a = urlimg.url;
+    //     console.log(allData.a, 'urlimg');
+    //   });
+    // });
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getDataList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef');
+  queryParams.value.publishTime = ref(proxy.moment(new Date()).format('YYYY'));
+  handleQuery();
+}
+
+onMounted(() => {
+  getDataList();
+});
+</script>
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index aa18bdd..9e986ce 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -69,18 +69,18 @@
         <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
-        <el-form-item label="年份选择" prop="year">
+        <!-- <el-form-item label="年份选择" prop="year">
           <el-date-picker type="year" v-model="formData.year" value-format="YYYY" placeholder="请选择日期"> </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="问卷状态" prop="ifStart">
           <el-radio-group v-model="formData.ifStart">
             <el-radio :label="1">启用</el-radio>
             <el-radio :label="0">未启用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="问卷介绍" prop="introduce">
+        <!-- <el-form-item label="问卷介绍" prop="introduce">
           <el-input type="textarea" v-model="formData.introduce" />
-        </el-form-item>
+        </el-form-item> -->
         <el-divider />
         <el-button type="primary" plain icon="Plus" @click="addQues">新增标题内容</el-button>
         <el-table :data="formData.problemConfigList" style="margin-top: 10px" max-height="300">
@@ -108,13 +108,13 @@
     <!-- 问题答案编辑 -->
     <el-dialog :title="dialogTitleAns" v-model="dialogShowAns" width="500px" append-to-body>
       <el-form ref="formRefAns" :model="formDataAns" :rules="rulesFormAns" label-width="80px" class="publicForm">
-        <el-form-item label="试题名称" prop="problemName">
+        <el-form-item label="问题名称" prop="problemName">
           <el-input v-model="formDataAns.problemName" />
         </el-form-item>
         <el-form-item label="满分" prop="fullScore">
           <el-input v-model="formDataAns.fullScore" placeholder="分值" />
         </el-form-item>
-        <el-form-item label="题型" prop="problemType">
+        <el-form-item label="问题类型" prop="problemType">
           <el-select v-model="formDataAns.problemType" placeholder="请选择">
             <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
@@ -123,7 +123,7 @@
         <el-button type="primary" plain icon="Plus" @click="addAnswer">新增问题答案</el-button>
         <!-- 批量新增 可新增区域 -->
         <el-table :data="formDataAns.problemOptionList" style="margin-top: 10px">
-          <el-table-column label="选项名称" prop="optionName">
+          <el-table-column label="问题选项" prop="optionName">
             <template #default="scope">
               <el-input v-model="scope.row.optionName" />
             </template>
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index 78491f7..a60aef7 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -3,12 +3,18 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="platePosition">
-        <el-input v-model="queryParams.road" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
       </el-form-item>
 
       <el-form-item style="width: 150px">
-        <el-date-picker type="year" v-model="dateYear" value-format="YYYY" placeholder="请选择年" style="width: 100%"></el-date-picker>
+        <el-date-picker
+          type="year"
+          v-model="queryParams.trainTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
       </el-form-item>
 
       <el-form-item>
@@ -25,20 +31,18 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createBy1" />
-      <el-table-column label="培训地点" prop="createTime" />
-      <el-table-column label="培训宣传标题" prop="createBy" />
-      <el-table-column label="参加人员" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="培训日期" prop="trainTime" />
+      <el-table-column label="培训地点" prop="address" />
+      <el-table-column label="请输入培训宣传名称" prop="title" />
+      <el-table-column label="参加人员" prop="people" />
+      <el-table-column label="培训内容" prop="content" width="600" />
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <!-- <el-table-column label="封面图" prop="coverPhotosFileList">
+      <el-table-column label="封面图" prop="filelist">
         <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
         </template>
-      </el-table-column> -->
+      </el-table-column>
 
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -50,53 +54,47 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <!-- <pagination
+    <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getDataList"
-    /> -->
+    />
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="110px" class="publicForm">
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择日期" />
+            <el-form-item label="培训日期:" prop="trainTime">
+              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="培训地点:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入培训地点" clearable style="width: 100%" />
+            <el-form-item label="培训地点:" prop="address">
+              <el-input type="text" v-model="formData.address" placeholder="请输入培训地点" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训宣传名称:" prop="road">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入培训宣传名称"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="培训宣传名称:" prop="title">
+              <el-input type="textarea" v-model="formData.title" placeholder="请输入培训宣传名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="参加人员:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入参加人员" clearable style="width: 100%" />
+            <el-form-item label="参加人员:" prop="people">
+              <el-input type="textarea" v-model="formData.people" placeholder="请输入参加人员" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训内容:" prop="road">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入培训内容" clearable style="width: 100%" />
+            <el-form-item label="培训内容:" prop="content">
+              <el-input type="textarea" v-model="formData.content" placeholder="请输入培训内容" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -106,13 +104,13 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="缩略图" prop="coverPhotosFileList">
+            <el-form-item label="缩略图" prop="filelist">
               <ImageFileUpload
                 :limit="1"
-                :saveFileArr="formData.coverPhotosFileList"
+                :saveFileArr="formData.filelist"
                 :listType="'picture-card'"
                 :refType="'public_special_navigation_config'"
-                :refField="'coverPhotos'"
+                :refField="'commentPhotos'"
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
@@ -132,7 +130,6 @@
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
-const dateYear = ref(proxy.moment(new Date()).format('YYYY'));
 
 const tableData = ref([]);
 const tableLoading = ref(true);
@@ -143,7 +140,7 @@
 
 const allData = reactive({
   formData: {
-    coverPhotosFileList: [],
+    filelist: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -151,26 +148,28 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    platePosition: undefined,
+    trainTime: ref(proxy.moment(new Date()).format('YYYY')),
+    title: '',
   },
   rulesForm: {
-    platePosition: [{ required: true, message: '请选择', trigger: 'change' }],
-    linkType: [{ required: true, message: '请选择', trigger: 'change' }],
-    linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
-    coverPhotosFileList: [{ required: true, message: '请选择', trigger: 'change', type: 'array' }],
+    trainTime: [{ required: true, message: '请选择培训日期', trigger: 'change' }],
+    linkUrl: [{ required: true, message: '请输入跳转链接', trigger: 'blur' }],
+    address: [{ required: true, message: '请输入培训地点', trigger: 'blur' }],
+    title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
+    people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
+    content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
+    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 /** 获取查询数据列表 */
 function getDataList() {
-  // tableLoading.value = true;
-  // specialNavPage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
-  tableLoading.value = false;
-  tableData.value = [{ createBy1: '2024-07-02' }];
+  tableLoading.value = true;
+  specialNavPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -179,8 +178,8 @@
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  // queryParams.value.pageNum = 1;
-  // getDataList();
+  queryParams.value.pageNum = 1;
+  getDataList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -190,57 +189,53 @@
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
   dialogShow.value = true;
   dialogTitle.value = '新增培训宣传';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改培训宣传';
-  formData.value = row;
-  // specialNavDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改专题导航';
-  //   setTimeout(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  specialNavDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改培训宣传';
+    setTimeout(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改专题导航') {
-  //       specialNavEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       specialNavAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改培训宣传') {
+        specialNavEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        specialNavAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return specialNavDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return specialNavDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
 onMounted(() => {

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4231a40..4b32c4e 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -20,19 +20,25 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <!-- <ImagePreview
+          <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview> -->
+          ></ImagePreview>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,14 +67,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="缩略图" prop="coverPhotosFileList">
               <ImageFileUpload
                 :limit="1"
@@ -79,18 +85,17 @@
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入政策法规内容"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="技术标准内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,13 +146,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -172,52 +176,54 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改政策法规';
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改政策法规';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改政策法规';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改政策法规') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改政策法规') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index f767b34..4d3fed6 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -20,10 +20,15 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="发布日期" prop="time" />
-      <el-table-column label="通知公告名称" prop="title" />
-      <el-table-column label="通知内容" prop="title1" />
-      <el-table-column label="跳转链接" prop="createBy" />>
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="通知公告名称" prop="title"> </el-table-column>
+      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -47,13 +52,13 @@
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="发布日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,9 +69,9 @@
               <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="通知内容:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+          <el-col :span="24">
+            <el-form-item label="通知内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,6 +88,7 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
+
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
 
@@ -111,24 +117,19 @@
   },
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
+    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [
-    {
-      title: '123',
-    },
-  ];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +154,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改通知公告';
-  formData.value = row;
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改通知公告';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改通知公告') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改通知公告') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
new file mode 100644
index 0000000..dd4a428
--- /dev/null
+++ b/src/views/publicService/publicmind.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="publicContainer">
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="公众意见" prop="opinion" style="width: 300px">
+        <el-input v-model="queryParams.opinion" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="年份" style="width: 200px">
+        <el-date-picker
+          type="year"
+          v-model="queryParams.publishTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="用户头像" prop="headImg">
+        <template #default="scope">
+          <el-image :src="scope.row.headImg" style="width: 100px; height: 100px"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称" prop="wechatName" />
+      <el-table-column label="日期" prop="publishTime" />
+      <el-table-column label="上传图片" prop="filelist">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column label="公众意见" prop="opinion" width="650" />
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script setup name="公众意见">
+import { peopleOpinionPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import defaultImg from '@/assets/images/login/user.png';
+
+const { proxy } = getCurrentInstance();
+
+const tableData = ref([]);
+const tableLoading = ref(true);
+const total = ref(0);
+const showSearch = ref(true);
+
+const allData = reactive({
+  a: '',
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    opinion: undefined,
+    publishTime: ref(proxy.moment(new Date()).format('YYYY')),
+  },
+});
+const { queryParams } = toRefs(allData);
+
+/** 获取查询数据列表 */
+function getDataList() {
+  tableLoading.value = true;
+  peopleOpinionPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+    // response.data.forEach(element => {
+    //   console.log(element.filelist, 'element');
+    //   element.filelist.forEach(urlimg => {
+    //     allData.a = urlimg.url;
+    //     console.log(allData.a, 'urlimg');
+    //   });
+    // });
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getDataList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef');
+  queryParams.value.publishTime = ref(proxy.moment(new Date()).format('YYYY'));
+  handleQuery();
+}
+
+onMounted(() => {
+  getDataList();
+});
+</script>
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index aa18bdd..9e986ce 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -69,18 +69,18 @@
         <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
-        <el-form-item label="年份选择" prop="year">
+        <!-- <el-form-item label="年份选择" prop="year">
           <el-date-picker type="year" v-model="formData.year" value-format="YYYY" placeholder="请选择日期"> </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="问卷状态" prop="ifStart">
           <el-radio-group v-model="formData.ifStart">
             <el-radio :label="1">启用</el-radio>
             <el-radio :label="0">未启用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="问卷介绍" prop="introduce">
+        <!-- <el-form-item label="问卷介绍" prop="introduce">
           <el-input type="textarea" v-model="formData.introduce" />
-        </el-form-item>
+        </el-form-item> -->
         <el-divider />
         <el-button type="primary" plain icon="Plus" @click="addQues">新增标题内容</el-button>
         <el-table :data="formData.problemConfigList" style="margin-top: 10px" max-height="300">
@@ -108,13 +108,13 @@
     <!-- 问题答案编辑 -->
     <el-dialog :title="dialogTitleAns" v-model="dialogShowAns" width="500px" append-to-body>
       <el-form ref="formRefAns" :model="formDataAns" :rules="rulesFormAns" label-width="80px" class="publicForm">
-        <el-form-item label="试题名称" prop="problemName">
+        <el-form-item label="问题名称" prop="problemName">
           <el-input v-model="formDataAns.problemName" />
         </el-form-item>
         <el-form-item label="满分" prop="fullScore">
           <el-input v-model="formDataAns.fullScore" placeholder="分值" />
         </el-form-item>
-        <el-form-item label="题型" prop="problemType">
+        <el-form-item label="问题类型" prop="problemType">
           <el-select v-model="formDataAns.problemType" placeholder="请选择">
             <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
@@ -123,7 +123,7 @@
         <el-button type="primary" plain icon="Plus" @click="addAnswer">新增问题答案</el-button>
         <!-- 批量新增 可新增区域 -->
         <el-table :data="formDataAns.problemOptionList" style="margin-top: 10px">
-          <el-table-column label="选项名称" prop="optionName">
+          <el-table-column label="问题选项" prop="optionName">
             <template #default="scope">
               <el-input v-model="scope.row.optionName" />
             </template>
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index 78491f7..a60aef7 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -3,12 +3,18 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="platePosition">
-        <el-input v-model="queryParams.road" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
       </el-form-item>
 
       <el-form-item style="width: 150px">
-        <el-date-picker type="year" v-model="dateYear" value-format="YYYY" placeholder="请选择年" style="width: 100%"></el-date-picker>
+        <el-date-picker
+          type="year"
+          v-model="queryParams.trainTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
       </el-form-item>
 
       <el-form-item>
@@ -25,20 +31,18 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createBy1" />
-      <el-table-column label="培训地点" prop="createTime" />
-      <el-table-column label="培训宣传标题" prop="createBy" />
-      <el-table-column label="参加人员" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="培训日期" prop="trainTime" />
+      <el-table-column label="培训地点" prop="address" />
+      <el-table-column label="请输入培训宣传名称" prop="title" />
+      <el-table-column label="参加人员" prop="people" />
+      <el-table-column label="培训内容" prop="content" width="600" />
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <!-- <el-table-column label="封面图" prop="coverPhotosFileList">
+      <el-table-column label="封面图" prop="filelist">
         <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
         </template>
-      </el-table-column> -->
+      </el-table-column>
 
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -50,53 +54,47 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <!-- <pagination
+    <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getDataList"
-    /> -->
+    />
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="110px" class="publicForm">
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择日期" />
+            <el-form-item label="培训日期:" prop="trainTime">
+              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="培训地点:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入培训地点" clearable style="width: 100%" />
+            <el-form-item label="培训地点:" prop="address">
+              <el-input type="text" v-model="formData.address" placeholder="请输入培训地点" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训宣传名称:" prop="road">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入培训宣传名称"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="培训宣传名称:" prop="title">
+              <el-input type="textarea" v-model="formData.title" placeholder="请输入培训宣传名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="参加人员:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入参加人员" clearable style="width: 100%" />
+            <el-form-item label="参加人员:" prop="people">
+              <el-input type="textarea" v-model="formData.people" placeholder="请输入参加人员" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训内容:" prop="road">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入培训内容" clearable style="width: 100%" />
+            <el-form-item label="培训内容:" prop="content">
+              <el-input type="textarea" v-model="formData.content" placeholder="请输入培训内容" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -106,13 +104,13 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="缩略图" prop="coverPhotosFileList">
+            <el-form-item label="缩略图" prop="filelist">
               <ImageFileUpload
                 :limit="1"
-                :saveFileArr="formData.coverPhotosFileList"
+                :saveFileArr="formData.filelist"
                 :listType="'picture-card'"
                 :refType="'public_special_navigation_config'"
-                :refField="'coverPhotos'"
+                :refField="'commentPhotos'"
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
@@ -132,7 +130,6 @@
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
-const dateYear = ref(proxy.moment(new Date()).format('YYYY'));
 
 const tableData = ref([]);
 const tableLoading = ref(true);
@@ -143,7 +140,7 @@
 
 const allData = reactive({
   formData: {
-    coverPhotosFileList: [],
+    filelist: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -151,26 +148,28 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    platePosition: undefined,
+    trainTime: ref(proxy.moment(new Date()).format('YYYY')),
+    title: '',
   },
   rulesForm: {
-    platePosition: [{ required: true, message: '请选择', trigger: 'change' }],
-    linkType: [{ required: true, message: '请选择', trigger: 'change' }],
-    linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
-    coverPhotosFileList: [{ required: true, message: '请选择', trigger: 'change', type: 'array' }],
+    trainTime: [{ required: true, message: '请选择培训日期', trigger: 'change' }],
+    linkUrl: [{ required: true, message: '请输入跳转链接', trigger: 'blur' }],
+    address: [{ required: true, message: '请输入培训地点', trigger: 'blur' }],
+    title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
+    people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
+    content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
+    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 /** 获取查询数据列表 */
 function getDataList() {
-  // tableLoading.value = true;
-  // specialNavPage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
-  tableLoading.value = false;
-  tableData.value = [{ createBy1: '2024-07-02' }];
+  tableLoading.value = true;
+  specialNavPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -179,8 +178,8 @@
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  // queryParams.value.pageNum = 1;
-  // getDataList();
+  queryParams.value.pageNum = 1;
+  getDataList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -190,57 +189,53 @@
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
   dialogShow.value = true;
   dialogTitle.value = '新增培训宣传';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改培训宣传';
-  formData.value = row;
-  // specialNavDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改专题导航';
-  //   setTimeout(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  specialNavDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改培训宣传';
+    setTimeout(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改专题导航') {
-  //       specialNavEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       specialNavAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改培训宣传') {
+        specialNavEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        specialNavAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return specialNavDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return specialNavDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
 onMounted(() => {
diff --git a/src/views/publicService/technical.vue b/src/views/publicService/technical.vue
index fed5c27..1206899 100644
--- a/src/views/publicService/technical.vue
+++ b/src/views/publicService/technical.vue
@@ -20,18 +20,23 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
       <el-table-column label="技术标准名称" prop="title" />
-      <el-table-column label="技术标准内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="技术标准内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面缩略图" prop="coverPhotosFileList">
-        <!-- <template #default="scope">
+        <template #default="scope">
           <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
           ></ImagePreview>
-        </template> -->
+        </template>
       </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -61,12 +66,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-form-item label="缩略图" prop="coverPhotosFileList">
+
+        <el-form-item label="发布日期:" prop="publishTime">
+          <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+        </el-form-item>
+
+        <el-form-item label="缩略图" prop="coverPhotosFileList">
           <ImageFileUpload
             :limit="1"
             :saveFileArr="formData.coverPhotosFileList"
@@ -74,7 +84,10 @@
             :refType="'public_special_navigation_config'"
             :refField="'coverPhotos'"
           ></ImageFileUpload>
-        </el-form-item> -->
+        </el-form-item>
+        <el-form-item label="技术标准内容" prop="content">
+          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -122,14 +135,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [{ createTime: '2024-07-02', title: '123' }];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +164,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改技术标准';
-  formData.value = { ...row };
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改技术标准';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改技术标准';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改技术标准') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改技术标准') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4231a40..4b32c4e 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -20,19 +20,25 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <!-- <ImagePreview
+          <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview> -->
+          ></ImagePreview>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,14 +67,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="缩略图" prop="coverPhotosFileList">
               <ImageFileUpload
                 :limit="1"
@@ -79,18 +85,17 @@
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入政策法规内容"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="技术标准内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,13 +146,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -172,52 +176,54 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改政策法规';
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改政策法规';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改政策法规';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改政策法规') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改政策法规') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index f767b34..4d3fed6 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -20,10 +20,15 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="发布日期" prop="time" />
-      <el-table-column label="通知公告名称" prop="title" />
-      <el-table-column label="通知内容" prop="title1" />
-      <el-table-column label="跳转链接" prop="createBy" />>
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="通知公告名称" prop="title"> </el-table-column>
+      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -47,13 +52,13 @@
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="发布日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,9 +69,9 @@
               <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="通知内容:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+          <el-col :span="24">
+            <el-form-item label="通知内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,6 +88,7 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
+
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
 
@@ -111,24 +117,19 @@
   },
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
+    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [
-    {
-      title: '123',
-    },
-  ];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +154,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改通知公告';
-  formData.value = row;
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改通知公告';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改通知公告') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改通知公告') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
new file mode 100644
index 0000000..dd4a428
--- /dev/null
+++ b/src/views/publicService/publicmind.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="publicContainer">
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="公众意见" prop="opinion" style="width: 300px">
+        <el-input v-model="queryParams.opinion" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="年份" style="width: 200px">
+        <el-date-picker
+          type="year"
+          v-model="queryParams.publishTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="用户头像" prop="headImg">
+        <template #default="scope">
+          <el-image :src="scope.row.headImg" style="width: 100px; height: 100px"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称" prop="wechatName" />
+      <el-table-column label="日期" prop="publishTime" />
+      <el-table-column label="上传图片" prop="filelist">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column label="公众意见" prop="opinion" width="650" />
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script setup name="公众意见">
+import { peopleOpinionPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import defaultImg from '@/assets/images/login/user.png';
+
+const { proxy } = getCurrentInstance();
+
+const tableData = ref([]);
+const tableLoading = ref(true);
+const total = ref(0);
+const showSearch = ref(true);
+
+const allData = reactive({
+  a: '',
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    opinion: undefined,
+    publishTime: ref(proxy.moment(new Date()).format('YYYY')),
+  },
+});
+const { queryParams } = toRefs(allData);
+
+/** 获取查询数据列表 */
+function getDataList() {
+  tableLoading.value = true;
+  peopleOpinionPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+    // response.data.forEach(element => {
+    //   console.log(element.filelist, 'element');
+    //   element.filelist.forEach(urlimg => {
+    //     allData.a = urlimg.url;
+    //     console.log(allData.a, 'urlimg');
+    //   });
+    // });
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getDataList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef');
+  queryParams.value.publishTime = ref(proxy.moment(new Date()).format('YYYY'));
+  handleQuery();
+}
+
+onMounted(() => {
+  getDataList();
+});
+</script>
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index aa18bdd..9e986ce 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -69,18 +69,18 @@
         <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
-        <el-form-item label="年份选择" prop="year">
+        <!-- <el-form-item label="年份选择" prop="year">
           <el-date-picker type="year" v-model="formData.year" value-format="YYYY" placeholder="请选择日期"> </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="问卷状态" prop="ifStart">
           <el-radio-group v-model="formData.ifStart">
             <el-radio :label="1">启用</el-radio>
             <el-radio :label="0">未启用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="问卷介绍" prop="introduce">
+        <!-- <el-form-item label="问卷介绍" prop="introduce">
           <el-input type="textarea" v-model="formData.introduce" />
-        </el-form-item>
+        </el-form-item> -->
         <el-divider />
         <el-button type="primary" plain icon="Plus" @click="addQues">新增标题内容</el-button>
         <el-table :data="formData.problemConfigList" style="margin-top: 10px" max-height="300">
@@ -108,13 +108,13 @@
     <!-- 问题答案编辑 -->
     <el-dialog :title="dialogTitleAns" v-model="dialogShowAns" width="500px" append-to-body>
       <el-form ref="formRefAns" :model="formDataAns" :rules="rulesFormAns" label-width="80px" class="publicForm">
-        <el-form-item label="试题名称" prop="problemName">
+        <el-form-item label="问题名称" prop="problemName">
           <el-input v-model="formDataAns.problemName" />
         </el-form-item>
         <el-form-item label="满分" prop="fullScore">
           <el-input v-model="formDataAns.fullScore" placeholder="分值" />
         </el-form-item>
-        <el-form-item label="题型" prop="problemType">
+        <el-form-item label="问题类型" prop="problemType">
           <el-select v-model="formDataAns.problemType" placeholder="请选择">
             <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
@@ -123,7 +123,7 @@
         <el-button type="primary" plain icon="Plus" @click="addAnswer">新增问题答案</el-button>
         <!-- 批量新增 可新增区域 -->
         <el-table :data="formDataAns.problemOptionList" style="margin-top: 10px">
-          <el-table-column label="选项名称" prop="optionName">
+          <el-table-column label="问题选项" prop="optionName">
             <template #default="scope">
               <el-input v-model="scope.row.optionName" />
             </template>
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index 78491f7..a60aef7 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -3,12 +3,18 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="platePosition">
-        <el-input v-model="queryParams.road" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
       </el-form-item>
 
       <el-form-item style="width: 150px">
-        <el-date-picker type="year" v-model="dateYear" value-format="YYYY" placeholder="请选择年" style="width: 100%"></el-date-picker>
+        <el-date-picker
+          type="year"
+          v-model="queryParams.trainTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
       </el-form-item>
 
       <el-form-item>
@@ -25,20 +31,18 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createBy1" />
-      <el-table-column label="培训地点" prop="createTime" />
-      <el-table-column label="培训宣传标题" prop="createBy" />
-      <el-table-column label="参加人员" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="培训日期" prop="trainTime" />
+      <el-table-column label="培训地点" prop="address" />
+      <el-table-column label="请输入培训宣传名称" prop="title" />
+      <el-table-column label="参加人员" prop="people" />
+      <el-table-column label="培训内容" prop="content" width="600" />
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <!-- <el-table-column label="封面图" prop="coverPhotosFileList">
+      <el-table-column label="封面图" prop="filelist">
         <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
         </template>
-      </el-table-column> -->
+      </el-table-column>
 
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -50,53 +54,47 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <!-- <pagination
+    <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getDataList"
-    /> -->
+    />
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="110px" class="publicForm">
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择日期" />
+            <el-form-item label="培训日期:" prop="trainTime">
+              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="培训地点:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入培训地点" clearable style="width: 100%" />
+            <el-form-item label="培训地点:" prop="address">
+              <el-input type="text" v-model="formData.address" placeholder="请输入培训地点" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训宣传名称:" prop="road">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入培训宣传名称"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="培训宣传名称:" prop="title">
+              <el-input type="textarea" v-model="formData.title" placeholder="请输入培训宣传名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="参加人员:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入参加人员" clearable style="width: 100%" />
+            <el-form-item label="参加人员:" prop="people">
+              <el-input type="textarea" v-model="formData.people" placeholder="请输入参加人员" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训内容:" prop="road">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入培训内容" clearable style="width: 100%" />
+            <el-form-item label="培训内容:" prop="content">
+              <el-input type="textarea" v-model="formData.content" placeholder="请输入培训内容" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -106,13 +104,13 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="缩略图" prop="coverPhotosFileList">
+            <el-form-item label="缩略图" prop="filelist">
               <ImageFileUpload
                 :limit="1"
-                :saveFileArr="formData.coverPhotosFileList"
+                :saveFileArr="formData.filelist"
                 :listType="'picture-card'"
                 :refType="'public_special_navigation_config'"
-                :refField="'coverPhotos'"
+                :refField="'commentPhotos'"
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
@@ -132,7 +130,6 @@
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
-const dateYear = ref(proxy.moment(new Date()).format('YYYY'));
 
 const tableData = ref([]);
 const tableLoading = ref(true);
@@ -143,7 +140,7 @@
 
 const allData = reactive({
   formData: {
-    coverPhotosFileList: [],
+    filelist: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -151,26 +148,28 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    platePosition: undefined,
+    trainTime: ref(proxy.moment(new Date()).format('YYYY')),
+    title: '',
   },
   rulesForm: {
-    platePosition: [{ required: true, message: '请选择', trigger: 'change' }],
-    linkType: [{ required: true, message: '请选择', trigger: 'change' }],
-    linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
-    coverPhotosFileList: [{ required: true, message: '请选择', trigger: 'change', type: 'array' }],
+    trainTime: [{ required: true, message: '请选择培训日期', trigger: 'change' }],
+    linkUrl: [{ required: true, message: '请输入跳转链接', trigger: 'blur' }],
+    address: [{ required: true, message: '请输入培训地点', trigger: 'blur' }],
+    title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
+    people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
+    content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
+    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 /** 获取查询数据列表 */
 function getDataList() {
-  // tableLoading.value = true;
-  // specialNavPage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
-  tableLoading.value = false;
-  tableData.value = [{ createBy1: '2024-07-02' }];
+  tableLoading.value = true;
+  specialNavPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -179,8 +178,8 @@
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  // queryParams.value.pageNum = 1;
-  // getDataList();
+  queryParams.value.pageNum = 1;
+  getDataList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -190,57 +189,53 @@
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
   dialogShow.value = true;
   dialogTitle.value = '新增培训宣传';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改培训宣传';
-  formData.value = row;
-  // specialNavDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改专题导航';
-  //   setTimeout(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  specialNavDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改培训宣传';
+    setTimeout(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改专题导航') {
-  //       specialNavEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       specialNavAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改培训宣传') {
+        specialNavEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        specialNavAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return specialNavDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return specialNavDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
 onMounted(() => {
diff --git a/src/views/publicService/technical.vue b/src/views/publicService/technical.vue
index fed5c27..1206899 100644
--- a/src/views/publicService/technical.vue
+++ b/src/views/publicService/technical.vue
@@ -20,18 +20,23 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
       <el-table-column label="技术标准名称" prop="title" />
-      <el-table-column label="技术标准内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="技术标准内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面缩略图" prop="coverPhotosFileList">
-        <!-- <template #default="scope">
+        <template #default="scope">
           <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
           ></ImagePreview>
-        </template> -->
+        </template>
       </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -61,12 +66,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-form-item label="缩略图" prop="coverPhotosFileList">
+
+        <el-form-item label="发布日期:" prop="publishTime">
+          <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+        </el-form-item>
+
+        <el-form-item label="缩略图" prop="coverPhotosFileList">
           <ImageFileUpload
             :limit="1"
             :saveFileArr="formData.coverPhotosFileList"
@@ -74,7 +84,10 @@
             :refType="'public_special_navigation_config'"
             :refField="'coverPhotos'"
           ></ImageFileUpload>
-        </el-form-item> -->
+        </el-form-item>
+        <el-form-item label="技术标准内容" prop="content">
+          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -122,14 +135,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [{ createTime: '2024-07-02', title: '123' }];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +164,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改技术标准';
-  formData.value = { ...row };
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改技术标准';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改技术标准';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改技术标准') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改技术标准') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index e6f9aed..632049c 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -20,7 +20,7 @@
       </div>
     </div>
     <el-dialog :title="title" v-model="open" width="1200px" append-to-body :close-on-click-modal="false">
-      <el-table :data="dataList" v-loading="loading" stripe :max-height="620">
+      <el-table :data="dataList" v-loading="loading" stripe>
         <el-table-column type="index" width="55" label="序号" />
         <el-table-column label="物资储备地点" prop="specificLocation" />
         <el-table-column label="具体位置" prop="address" />

diff --git a/src/api/publicService/index.js b/src/api/publicService/index.js
index 08c52c8..64cb50c 100644
--- a/src/api/publicService/index.js
+++ b/src/api/publicService/index.js
@@ -1,46 +1,46 @@
 import request from '@/utils/request';
 
-// 专题导航 搜索列表
-export function specialNavPage (query) {
+// 培训宣传 搜索列表
+export function specialNavPage(query) {
   return request({
-    url: '/publicService/specialNavigationConfig/page',
+    url: '/publicService/trainAndPublicize/page',
     method: 'get',
     params: query,
   });
 }
-// 专题导航 新增
-export function specialNavAdd (data) {
+// 培训宣传 新增
+export function specialNavAdd(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/add',
+    url: '/publicService/trainAndPublicize/add',
     method: 'post',
     data: data,
   });
 }
-// 专题导航 修改
-export function specialNavEdit (data) {
+// 培训宣传 修改
+export function specialNavEdit(data) {
   return request({
-    url: '/publicService/specialNavigationConfig/edit',
+    url: '/publicService/trainAndPublicize/edit',
     method: 'put',
     data: data,
   });
 }
-// 专题导航 删除
-export function specialNavDel (id) {
+// 培训宣传 删除
+export function specialNavDel(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'delete',
   });
 }
-// 专题导航 详情
-export function specialNavDetail (id) {
+// 培训宣传 详情
+export function specialNavDetail(id) {
   return request({
-    url: '/publicService/specialNavigationConfig/' + id,
+    url: '/publicService/trainAndPublicize/' + id,
     method: 'get',
   });
 }
 
 // 通知公告 技术标准 政策法规 搜索列表
-export function articlePage (query) {
+export function articlePage(query) {
   return request({
     url: '/publicService/articleConfig/page',
     method: 'get',
@@ -48,7 +48,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 新增
-export function articleAdd (data) {
+export function articleAdd(data) {
   return request({
     url: '/publicService/articleConfig/add',
     method: 'post',
@@ -56,7 +56,7 @@
   });
 }
 // 通知公告 技术标准 政策法规 修改
-export function articleEdit (data) {
+export function articleEdit(data) {
   return request({
     url: '/publicService/articleConfig/edit',
     method: 'put',
@@ -64,14 +64,14 @@
   });
 }
 // 通知公告 技术标准 政策法规 删除
-export function articleDel (id) {
+export function articleDel(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'delete',
   });
 }
 // 通知公告 技术标准 政策法规 详情
-export function articleDetail (id) {
+export function articleDetail(id) {
   return request({
     url: '/publicService/articleConfig/' + id,
     method: 'get',
@@ -79,7 +79,7 @@
 }
 
 // 科普知识类别 搜索列表全部
-export function knowledgeTypeList (query) {
+export function knowledgeTypeList(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/list',
     method: 'get',
@@ -87,7 +87,7 @@
   });
 }
 // 科普知识类别 搜索列表
-export function knowledgeTypePage (query) {
+export function knowledgeTypePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeType/page',
     method: 'get',
@@ -95,7 +95,7 @@
   });
 }
 // 科普知识类别 新增
-export function knowledgeTypeAdd (data) {
+export function knowledgeTypeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/add',
     method: 'post',
@@ -103,7 +103,7 @@
   });
 }
 // 科普知识类别 修改
-export function knowledgeTypeEdit (data) {
+export function knowledgeTypeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeType/edit',
     method: 'put',
@@ -111,14 +111,14 @@
   });
 }
 // 科普知识类别 删除
-export function knowledgeTypeDel (id) {
+export function knowledgeTypeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'delete',
   });
 }
 // 科普知识类别 详情
-export function knowledgeTypeDetail (id) {
+export function knowledgeTypeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeType/' + id,
     method: 'get',
@@ -126,7 +126,7 @@
 }
 
 // 科普知识管理 搜索列表
-export function knowledgePage (query) {
+export function knowledgePage(query) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/page',
     method: 'get',
@@ -134,7 +134,7 @@
   });
 }
 // 科普知识管理 新增
-export function knowledgeAdd (data) {
+export function knowledgeAdd(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/add',
     method: 'post',
@@ -142,7 +142,7 @@
   });
 }
 // 科普知识管理 修改
-export function knowledgeEdit (data) {
+export function knowledgeEdit(data) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/edit',
     method: 'put',
@@ -150,14 +150,14 @@
   });
 }
 // 科普知识管理 删除
-export function knowledgeDel (id) {
+export function knowledgeDel(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'delete',
   });
 }
 // 科普知识管理 详情
-export function knowledgeDetail (id) {
+export function knowledgeDetail(id) {
   return request({
     url: '/publicService/scienceKnowledgeConfig/' + id,
     method: 'get',
@@ -165,7 +165,7 @@
 }
 
 // 调查问卷 搜索列表
-export function quesNairePage (query) {
+export function quesNairePage(query) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/page',
     method: 'get',
@@ -173,7 +173,7 @@
   });
 }
 // 调查问卷 新增
-export function quesNaireAdd (data) {
+export function quesNaireAdd(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/add',
     method: 'post',
@@ -181,7 +181,7 @@
   });
 }
 // 调查问卷 修改
-export function quesNaireEdit (data) {
+export function quesNaireEdit(data) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/edit',
     method: 'put',
@@ -189,21 +189,21 @@
   });
 }
 // 调查问卷 删除
-export function quesNaireDel (id) {
+export function quesNaireDel(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'delete',
   });
 }
 // 调查问卷 详情
-export function quesNaireDetail (id) {
+export function quesNaireDetail(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/' + id,
     method: 'get',
   });
 }
 // 调查问卷 满意度调查
-export function quesNaireCount (id) {
+export function quesNaireCount(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatistics/' + id,
     method: 'get',
@@ -211,14 +211,14 @@
 }
 //群众满意度接口
 
-export function satisfactionStatisticsByYear (id) {
+export function satisfactionStatisticsByYear(id) {
   return request({
     url: '/publicService/adjustmentQuestionnaireConfig/satisfactionStatisticsByYear/' + id,
     method: 'get',
   });
 }
 // 粉丝信息认证 列表
-export function fansList (query) {
+export function fansList(query) {
   return request({
     url: '/publicService/wechartMiniuser/page',
     method: 'get',
@@ -226,28 +226,28 @@
   });
 }
 // 粉丝信息认证 认证
-export function fansCert (id) {
+export function fansCert(id) {
   return request({
     url: '/publicService/wechartMiniuser/authentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 取消认证
-export function fansCertCancel (id) {
+export function fansCertCancel(id) {
   return request({
     url: '/publicService/wechartMiniuser/unAuthentication/' + id,
     method: 'put',
   });
 }
 // 粉丝信息认证 删除
-export function fansDel (id) {
+export function fansDel(id) {
   return request({
     url: '/publicService/wechartMiniuser/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 列表
-export function suggestList (query) {
+export function suggestList(query) {
   return request({
     url: '/publicService/wechartSuggest/page',
     method: 'get',
@@ -255,21 +255,21 @@
   });
 }
 // 投诉建议 删除
-export function suggestDel (id) {
+export function suggestDel(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'delete',
   });
 }
 // 投诉建议 转工单则进行转案件处理
-export function suggestOrder (id) {
+export function suggestOrder(id) {
   return request({
     url: '/publicService/wechartSuggest/changeEventCenter/' + id,
     method: 'put',
   });
 }
 // 投诉建议 详情
-export function suggestDetail (id) {
+export function suggestDetail(id) {
   return request({
     url: '/publicService/wechartSuggest/' + id,
     method: 'get',
@@ -277,7 +277,7 @@
 }
 
 // 项目评论留言 列表
-export function projectComList (query) {
+export function projectComList(query) {
   return request({
     url: '/publicService/projectMiniuserComment/page',
     method: 'get',
@@ -285,7 +285,7 @@
   });
 }
 // 项目评论留言 删除
-export function projectComDel (id) {
+export function projectComDel(id) {
   return request({
     url: '/publicService/projectMiniuserComment/' + id,
     method: 'delete',
@@ -293,7 +293,7 @@
 }
 
 // 项目基础信息管理 列表
-export function projectInfoList (query) {
+export function projectInfoList(query) {
   return request({
     url: '/business/projectInfoNew/page',
     method: 'get',
@@ -301,7 +301,7 @@
   });
 }
 // 项目基础信息管理 置顶
-export function projectInfoTop (query) {
+export function projectInfoTop(query) {
   return request({
     url: '/business/projectInfoNew/top',
     method: 'post',
@@ -310,7 +310,7 @@
 }
 
 // 新闻资讯 搜索列表
-export function manageNewsPage (query) {
+export function manageNewsPage(query) {
   return request({
     url: '/system/sysNewsInfo/page',
     method: 'get',
@@ -318,7 +318,7 @@
   });
 }
 // 新闻资讯 新增
-export function manageNewsAdd (data) {
+export function manageNewsAdd(data) {
   return request({
     url: '/system/sysNewsInfo/add',
     method: 'post',
@@ -326,7 +326,7 @@
   });
 }
 // 新闻资讯 修改
-export function manageNewsEdit (data) {
+export function manageNewsEdit(data) {
   return request({
     url: '/system/sysNewsInfo/edit',
     method: 'put',
@@ -334,14 +334,14 @@
   });
 }
 // 新闻资讯 删除
-export function manageNewsDel (id) {
+export function manageNewsDel(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'delete',
   });
 }
 // 新闻资讯 详情
-export function manageNewsDetail (id) {
+export function manageNewsDetail(id) {
   return request({
     url: '/system/sysNewsInfo/' + id,
     method: 'get',
@@ -349,7 +349,7 @@
 }
 
 // 宣传片配置 搜索列表
-export function manageVideoPage (query) {
+export function manageVideoPage(query) {
   return request({
     url: '/publicService/propagandaVideo/page',
     method: 'get',
@@ -357,7 +357,7 @@
   });
 }
 // 宣传片配置 新增
-export function manageVideoAdd (data) {
+export function manageVideoAdd(data) {
   return request({
     url: '/publicService/propagandaVideo/add',
     method: 'post',
@@ -365,7 +365,7 @@
   });
 }
 // 宣传片配置 修改
-export function manageVideoEdit (data) {
+export function manageVideoEdit(data) {
   return request({
     url: '/publicService/propagandaVideo/edit',
     method: 'put',
@@ -373,16 +373,66 @@
   });
 }
 // 宣传片配置 删除
-export function manageVideoDel (id) {
+export function manageVideoDel(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'delete',
   });
 }
 // 宣传片配置 详情
-export function manageVideoDetail (id) {
+export function manageVideoDetail(id) {
   return request({
     url: '/publicService/propagandaVideo/' + id,
     method: 'get',
   });
 }
+
+// 公众意见 列表
+export function peopleOpinionPage(query) {
+  return request({
+    url: '/publicService/peopleOpinion/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 列表
+export function articleConfigPage(query) {
+  return request({
+    url: '/publicService/articleConfig/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 通知公告 新增
+export function articleConfigAdd(data) {
+  return request({
+    url: '/publicService/articleConfig/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 通知公告 修改
+export function articleConfigEdit(data) {
+  return request({
+    url: '/publicService/articleConfig/edit',
+    method: 'put',
+    data: data,
+  });
+}
+// 宣传片配置 删除
+export function articleConfigDel(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'delete',
+  });
+}
+// 宣传片配置 详情
+export function articleConfigDetail(id) {
+  return request({
+    url: '/publicService/articleConfig/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4231a40..4b32c4e 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -20,19 +20,25 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <!-- <ImagePreview
+          <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview> -->
+          ></ImagePreview>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -61,14 +67,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="缩略图" prop="coverPhotosFileList">
               <ImageFileUpload
                 :limit="1"
@@ -79,18 +85,17 @@
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入政策法规内容"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="技术标准内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,13 +146,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -172,52 +176,54 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改政策法规';
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改政策法规';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改政策法规';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改政策法规') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改政策法规') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index f767b34..4d3fed6 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -20,10 +20,15 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="发布日期" prop="time" />
-      <el-table-column label="通知公告名称" prop="title" />
-      <el-table-column label="通知内容" prop="title1" />
-      <el-table-column label="跳转链接" prop="createBy" />>
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="通知公告名称" prop="title"> </el-table-column>
+      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -47,13 +52,13 @@
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="发布日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            <el-form-item label="发布日期:" prop="publishTime">
+              <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,9 +69,9 @@
               <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="通知内容:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+          <el-col :span="24">
+            <el-form-item label="通知内容" prop="content">
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -83,6 +88,7 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
+
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
 
@@ -111,24 +117,19 @@
   },
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
+    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [
-    {
-      title: '123',
-    },
-  ];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +154,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改通知公告';
-  formData.value = row;
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改通知公告';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改通知公告') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改通知公告') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
new file mode 100644
index 0000000..dd4a428
--- /dev/null
+++ b/src/views/publicService/publicmind.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="publicContainer">
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="公众意见" prop="opinion" style="width: 300px">
+        <el-input v-model="queryParams.opinion" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="年份" style="width: 200px">
+        <el-date-picker
+          type="year"
+          v-model="queryParams.publishTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="用户头像" prop="headImg">
+        <template #default="scope">
+          <el-image :src="scope.row.headImg" style="width: 100px; height: 100px"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称" prop="wechatName" />
+      <el-table-column label="日期" prop="publishTime" />
+      <el-table-column label="上传图片" prop="filelist">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column label="公众意见" prop="opinion" width="650" />
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script setup name="公众意见">
+import { peopleOpinionPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import defaultImg from '@/assets/images/login/user.png';
+
+const { proxy } = getCurrentInstance();
+
+const tableData = ref([]);
+const tableLoading = ref(true);
+const total = ref(0);
+const showSearch = ref(true);
+
+const allData = reactive({
+  a: '',
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    opinion: undefined,
+    publishTime: ref(proxy.moment(new Date()).format('YYYY')),
+  },
+});
+const { queryParams } = toRefs(allData);
+
+/** 获取查询数据列表 */
+function getDataList() {
+  tableLoading.value = true;
+  peopleOpinionPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+    // response.data.forEach(element => {
+    //   console.log(element.filelist, 'element');
+    //   element.filelist.forEach(urlimg => {
+    //     allData.a = urlimg.url;
+    //     console.log(allData.a, 'urlimg');
+    //   });
+    // });
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getDataList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef');
+  queryParams.value.publishTime = ref(proxy.moment(new Date()).format('YYYY'));
+  handleQuery();
+}
+
+onMounted(() => {
+  getDataList();
+});
+</script>
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index aa18bdd..9e986ce 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -69,18 +69,18 @@
         <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
-        <el-form-item label="年份选择" prop="year">
+        <!-- <el-form-item label="年份选择" prop="year">
           <el-date-picker type="year" v-model="formData.year" value-format="YYYY" placeholder="请选择日期"> </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="问卷状态" prop="ifStart">
           <el-radio-group v-model="formData.ifStart">
             <el-radio :label="1">启用</el-radio>
             <el-radio :label="0">未启用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="问卷介绍" prop="introduce">
+        <!-- <el-form-item label="问卷介绍" prop="introduce">
           <el-input type="textarea" v-model="formData.introduce" />
-        </el-form-item>
+        </el-form-item> -->
         <el-divider />
         <el-button type="primary" plain icon="Plus" @click="addQues">新增标题内容</el-button>
         <el-table :data="formData.problemConfigList" style="margin-top: 10px" max-height="300">
@@ -108,13 +108,13 @@
     <!-- 问题答案编辑 -->
     <el-dialog :title="dialogTitleAns" v-model="dialogShowAns" width="500px" append-to-body>
       <el-form ref="formRefAns" :model="formDataAns" :rules="rulesFormAns" label-width="80px" class="publicForm">
-        <el-form-item label="试题名称" prop="problemName">
+        <el-form-item label="问题名称" prop="problemName">
           <el-input v-model="formDataAns.problemName" />
         </el-form-item>
         <el-form-item label="满分" prop="fullScore">
           <el-input v-model="formDataAns.fullScore" placeholder="分值" />
         </el-form-item>
-        <el-form-item label="题型" prop="problemType">
+        <el-form-item label="问题类型" prop="problemType">
           <el-select v-model="formDataAns.problemType" placeholder="请选择">
             <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
@@ -123,7 +123,7 @@
         <el-button type="primary" plain icon="Plus" @click="addAnswer">新增问题答案</el-button>
         <!-- 批量新增 可新增区域 -->
         <el-table :data="formDataAns.problemOptionList" style="margin-top: 10px">
-          <el-table-column label="选项名称" prop="optionName">
+          <el-table-column label="问题选项" prop="optionName">
             <template #default="scope">
               <el-input v-model="scope.row.optionName" />
             </template>
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index 78491f7..a60aef7 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -3,12 +3,18 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="培训宣传名称" prop="platePosition">
-        <el-input v-model="queryParams.road" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
+      <el-form-item label="培训宣传名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
       </el-form-item>
 
       <el-form-item style="width: 150px">
-        <el-date-picker type="year" v-model="dateYear" value-format="YYYY" placeholder="请选择年" style="width: 100%"></el-date-picker>
+        <el-date-picker
+          type="year"
+          v-model="queryParams.trainTime"
+          value-format="YYYY"
+          placeholder="请选择年"
+          style="width: 100%"
+        ></el-date-picker>
       </el-form-item>
 
       <el-form-item>
@@ -25,20 +31,18 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createBy1" />
-      <el-table-column label="培训地点" prop="createTime" />
-      <el-table-column label="培训宣传标题" prop="createBy" />
-      <el-table-column label="参加人员" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="培训日期" prop="trainTime" />
+      <el-table-column label="培训地点" prop="address" />
+      <el-table-column label="请输入培训宣传名称" prop="title" />
+      <el-table-column label="参加人员" prop="people" />
+      <el-table-column label="培训内容" prop="content" width="600" />
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <!-- <el-table-column label="封面图" prop="coverPhotosFileList">
+      <el-table-column label="封面图" prop="filelist">
         <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
+          <ImagePreview :src="scope.row.filelist.length > 0 ? scope.row.filelist[0].url : ''" :width="50" :height="50"></ImagePreview>
         </template>
-      </el-table-column> -->
+      </el-table-column>
 
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -50,53 +54,47 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <!-- <pagination
+    <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getDataList"
-    /> -->
+    />
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="110px" class="publicForm">
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="800px" append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训日期:" prop="createBy1">
-              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择日期" />
+            <el-form-item label="培训日期:" prop="trainTime">
+              <el-date-picker type="date" v-model="formData.trainTime" value-format="YYYY-MM-DD" placeholder="请选择日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="培训地点:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入培训地点" clearable style="width: 100%" />
+            <el-form-item label="培训地点:" prop="address">
+              <el-input type="text" v-model="formData.address" placeholder="请输入培训地点" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训宣传名称:" prop="road">
-              <el-input
-                type="textarea"
-                v-model="formData.emergencyMeasure"
-                placeholder="请输入培训宣传名称"
-                clearable
-                style="width: 100%"
-              />
+            <el-form-item label="培训宣传名称:" prop="title">
+              <el-input type="textarea" v-model="formData.title" placeholder="请输入培训宣传名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="参加人员:" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入参加人员" clearable style="width: 100%" />
+            <el-form-item label="参加人员:" prop="people">
+              <el-input type="textarea" v-model="formData.people" placeholder="请输入参加人员" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="培训内容:" prop="road">
-              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入培训内容" clearable style="width: 100%" />
+            <el-form-item label="培训内容:" prop="content">
+              <el-input type="textarea" v-model="formData.content" placeholder="请输入培训内容" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -106,13 +104,13 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="缩略图" prop="coverPhotosFileList">
+            <el-form-item label="缩略图" prop="filelist">
               <ImageFileUpload
                 :limit="1"
-                :saveFileArr="formData.coverPhotosFileList"
+                :saveFileArr="formData.filelist"
                 :listType="'picture-card'"
                 :refType="'public_special_navigation_config'"
-                :refField="'coverPhotos'"
+                :refField="'commentPhotos'"
               ></ImageFileUpload>
             </el-form-item>
           </el-col>
@@ -132,7 +130,6 @@
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
-const dateYear = ref(proxy.moment(new Date()).format('YYYY'));
 
 const tableData = ref([]);
 const tableLoading = ref(true);
@@ -143,7 +140,7 @@
 
 const allData = reactive({
   formData: {
-    coverPhotosFileList: [],
+    filelist: [],
     linkType: '',
     linkUrl: '',
     platePosition: '',
@@ -151,26 +148,28 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    platePosition: undefined,
+    trainTime: ref(proxy.moment(new Date()).format('YYYY')),
+    title: '',
   },
   rulesForm: {
-    platePosition: [{ required: true, message: '请选择', trigger: 'change' }],
-    linkType: [{ required: true, message: '请选择', trigger: 'change' }],
-    linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
-    coverPhotosFileList: [{ required: true, message: '请选择', trigger: 'change', type: 'array' }],
+    trainTime: [{ required: true, message: '请选择培训日期', trigger: 'change' }],
+    linkUrl: [{ required: true, message: '请输入跳转链接', trigger: 'blur' }],
+    address: [{ required: true, message: '请输入培训地点', trigger: 'blur' }],
+    title: [{ required: true, message: '请输入培训宣传名称', trigger: 'blur' }],
+    people: [{ required: true, message: '请输入参加人员', trigger: 'blur' }],
+    content: [{ required: true, message: '请输入培训内容', trigger: 'blur' }],
+    filelist: [{ required: true, message: '请选择缩略图', trigger: 'change', type: 'array' }],
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
 /** 获取查询数据列表 */
 function getDataList() {
-  // tableLoading.value = true;
-  // specialNavPage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
-  tableLoading.value = false;
-  tableData.value = [{ createBy1: '2024-07-02' }];
+  tableLoading.value = true;
+  specialNavPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -179,8 +178,8 @@
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  // queryParams.value.pageNum = 1;
-  // getDataList();
+  queryParams.value.pageNum = 1;
+  getDataList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -190,57 +189,53 @@
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
   dialogShow.value = true;
   dialogTitle.value = '新增培训宣传';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改培训宣传';
-  formData.value = row;
-  // specialNavDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改专题导航';
-  //   setTimeout(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  specialNavDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改培训宣传';
+    setTimeout(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改专题导航') {
-  //       specialNavEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       specialNavAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改培训宣传') {
+        specialNavEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        specialNavAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return specialNavDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return specialNavDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
 
 onMounted(() => {
diff --git a/src/views/publicService/technical.vue b/src/views/publicService/technical.vue
index fed5c27..1206899 100644
--- a/src/views/publicService/technical.vue
+++ b/src/views/publicService/technical.vue
@@ -20,18 +20,23 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="序号" type="index" width="55" />
+      <el-table-column label="发布日期" prop="publishTime" />
       <el-table-column label="技术标准名称" prop="title" />
-      <el-table-column label="技术标准内容" prop="degist" />
-      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="技术标准内容" prop="content" width="500" show-overflow-tooltip>
+        <template #default="scope">
+          <div v-html="scope.row.content"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面缩略图" prop="coverPhotosFileList">
-        <!-- <template #default="scope">
+        <template #default="scope">
           <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
           ></ImagePreview>
-        </template> -->
+        </template>
       </el-table-column>
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -61,12 +66,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跳转链接:" prop="emergencyMeasure">
-              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            <el-form-item label="跳转链接:" prop="linkUrl">
+              <el-input type="text" v-model="formData.linkUrl" placeholder="请输入跳转链接" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-form-item label="缩略图" prop="coverPhotosFileList">
+
+        <el-form-item label="发布日期:" prop="publishTime">
+          <el-date-picker type="date" v-model="formData.publishTime" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+        </el-form-item>
+
+        <el-form-item label="缩略图" prop="coverPhotosFileList">
           <ImageFileUpload
             :limit="1"
             :saveFileArr="formData.coverPhotosFileList"
@@ -74,7 +84,10 @@
             :refType="'public_special_navigation_config'"
             :refField="'coverPhotos'"
           ></ImageFileUpload>
-        </el-form-item> -->
+        </el-form-item>
+        <el-form-item label="技术标准内容" prop="content">
+          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -122,14 +135,12 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableData.value = [{ createTime: '2024-07-02', title: '123' }];
-  tableLoading.value = false;
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
+  tableLoading.value = true;
+  articlePage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -153,53 +164,53 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  dialogShow.value = true;
-  dialogTitle.value = '修改技术标准';
-  formData.value = { ...row };
-  // articleDetail(row.id).then(response => {
-  //   dialogShow.value = true;
-  //   dialogTitle.value = '修改技术标准';
-  //   nextTick(() => {
-  //     formData.value = response.data;
-  //   });
-  // });
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    dialogTitle.value = '修改技术标准';
+    nextTick(() => {
+      formData.value = response.data;
+    });
+  });
 }
 /** 提交按钮 */
 function submitForm() {
-  // proxy.$refs['formRef'].validate(valid => {
-  //   if (valid) {
-  //     if (dialogTitle.value == '修改技术标准') {
-  //       articleEdit(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('修改成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     } else {
-  //       if (formData.value.id) delete formData.value.id;
-  //       articleAdd(formData.value).then(response => {
-  //         proxy.$modal.msgSuccess('新增成功');
-  //         dialogShow.value = false;
-  //         getDataList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs['formRef'].validate(valid => {
+    if (valid) {
+      if (dialogTitle.value == '修改技术标准') {
+        articleEdit(formData.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      } else {
+        if (formData.value.id) delete formData.value.id;
+        articleAdd(formData.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          dialogShow.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  // const postIds = row.id;
-  // proxy.$modal
-  //   .confirm('是否确认删除该数据项？')
-  //   .then(function () {
-  //     return articleDel(postIds);
-  //   })
-  //   .then(() => {
-  //     getDataList();
-  //     proxy.$modal.msgSuccess('删除成功');
-  //   })
-  //   .catch(() => {});
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return articleDel(postIds);
+    })
+    .then(() => {
+      getDataList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
 }
-
+// 富文本编辑器内容获取
+function getWEditVal(val) {
+  formData.value.content = val;
+}
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index e6f9aed..632049c 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -20,7 +20,7 @@
       </div>
     </div>
     <el-dialog :title="title" v-model="open" width="1200px" append-to-body :close-on-click-modal="false">
-      <el-table :data="dataList" v-loading="loading" stripe :max-height="620">
+      <el-table :data="dataList" v-loading="loading" stripe>
         <el-table-column type="index" width="55" label="序号" />
         <el-table-column label="物资储备地点" prop="specificLocation" />
         <el-table-column label="具体位置" prop="address" />
diff --git a/vite.config.js b/vite.config.js
index 68f0eb0..94996b3 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,8 +7,8 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 
 // const targetUrl = 'http://192.168.20.49:7200'; //谢斌斌
-// const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-const targetUrl = 'http://kaifeng.wh-nf.cn/prod-api'; //线上
+const targetUrl = 'http://192.168.20.52:7300'; //杨辉
+// const targetUrl = 'http://kaifeng.wh-nf.cn/prod-api'; //线上
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {