diff --git a/src/api/Sys.ts b/src/api/Sys.ts index 21219ee..3543bca 100644 --- a/src/api/Sys.ts +++ b/src/api/Sys.ts @@ -490,6 +490,16 @@ export function saveUser(data) { method: "DELETE", }); } +/** + *查看对应学习内容的相关党员信息 + */ + export function partyCheckList(params) { + return request({ + url: `/admin/partyLearnContent/partyCheckList/`, + method: "GET", + params:params + }); +} /** *公开内容分页查看 */ @@ -528,6 +538,16 @@ export function saveUser(data) { data:params, }); } +/** + *查看对应公开内容的相关人员信息 + */ + export function publicCheckList(params) { + return request({ + url: `/admin/publicContent/publicCheckList/`, + method: "GET", + params:params, + }); +} diff --git a/src/api/demands.ts b/src/api/demands.ts new file mode 100644 index 0000000..7d4c9e8 --- /dev/null +++ b/src/api/demands.ts @@ -0,0 +1,40 @@ +import request from "@/utils/request"; + +/** +*分页查看困难诉求 +*/ +export function difficultyPage(data) { + return request({ + url: `/admin/difficultyAppeal/difficultyPage`, + method: "GET", + params: data + }); +} +/** +*查看困难诉求详情 +*/ +export function difficultyDetail(data) { + return request({ + url: `/admin/difficultyAppeal/difficultyDetail/${data.difficultyId}`, + method: "GET", + }); + } +/** +*处置困难诉求 +*/ +export function difficultyDeal(data) { + return request({ + url: `/admin/difficultyAppeal/difficultyDeal`, + method: "GET", + params:data, + }); + } +/** +*查看困难诉求处置流程信息 +*/ +export function difficultyProcess(data) { + return request({ + url: `/admin/difficultyAppeal/difficultyProcess/${data.difficultyId}`, + method: "GET", + }); + } \ No newline at end of file diff --git a/src/router/modules/demands.js b/src/router/modules/demands.js index 50623c8..5edf765 100644 --- a/src/router/modules/demands.js +++ b/src/router/modules/demands.js @@ -20,7 +20,7 @@ export default { auth: "demands", title: '群众诉求', sidebar: false, - breadcrumb: true, //是否显示面包屑 + // breadcrumb: true, //是否显示面包屑 activeMenu: '/demands/index' }, children: [ @@ -31,7 +31,7 @@ export default { meta: { title: '群众诉求详情', sidebar: false, //是否在菜单栏显示 - breadcrumb: true, //是否显示面包屑 + // breadcrumb: true, //是否显示面包屑 } } ] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index c2c7a82..50e78aa 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -172,7 +172,7 @@ export default { icon: 'point', title: '公告管理', breadcrumb: true, - } + }, }, { path: 'study', @@ -183,6 +183,19 @@ export default { title: '党员学习内容', breadcrumb: true, //是否显示面包屑 }, + children: [ + { + path: 'study-detail', + name: 'study-detail', + component: () => import('@/views/system/message/study-content/detail.vue'), + meta: { + icon: 'point', + title: '党员学习内容详情', + breadcrumb: true, + sidebar: false + }, + }, + ] }, { path: 'public', @@ -193,6 +206,19 @@ export default { title: '公开内容', breadcrumb: true, //是否显示面包屑 }, + children: [ + { + path: 'public-detail', + name: 'public-detail', + component: () => import('@/views/system/message/public-content/detail.vue'), + meta: { + icon: 'point', + title: '公开内容详情', + breadcrumb: true, + sidebar: false + }, + }, + ] }, ] }, diff --git a/src/utils/common.ts b/src/utils/common.ts index b453e0e..8cfe16e 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -36,6 +36,8 @@ export enum FileType { studyContentCover = 'studyContentCover',//党员学习内容封面 publicContent = 'publicContent',//党员学习内容 publicContentCover = 'publicContentCover',//党员学习内容封面 + demandsEscalation = 'demandsEscalation',//群众诉求上报 + demands = 'demands',//群众诉求处置 } // 文件接口类型 export enum ApiFile { diff --git a/src/views/base-manage/residence/detail.vue b/src/views/base-manage/residence/detail.vue index 88dffb8..7170d28 100644 --- a/src/views/base-manage/residence/detail.vue +++ b/src/views/base-manage/residence/detail.vue @@ -440,8 +440,6 @@ const clone = () => { //获取详情 const getDetail = () => { domicileDetail({domicileId:route.query.id}).then((res: any) => { - console.log(res.data,'res===>'); - detailForm.value = res.data; }); }; @@ -464,7 +462,6 @@ const getList = () => { domicileId: route.query.id, }; domicilePeoplePageList(params).then((res: any) => { - console.log(res,'res===>'); detailTableData.value = res.data.list; total.value = res.data.total; tableDataloading.value = false; diff --git a/src/views/demands/detail.vue b/src/views/demands/detail.vue index 3241eb4..cec6786 100644 --- a/src/views/demands/detail.vue +++ b/src/views/demands/detail.vue @@ -2,7 +2,7 @@
- +
- - + + - - - 男 - 女 - - - - - - - - 已婚 - 未婚 - 离婚 - - - + - - - - + - - - - - - - - - + + +
+ + + +
+ - + + + +
+ +
+ + + + + + + + + + + + +
@@ -144,57 +168,114 @@ \ No newline at end of file diff --git a/src/views/system/message/public-content/detail.vue b/src/views/system/message/public-content/detail.vue new file mode 100644 index 0000000..d666ed5 --- /dev/null +++ b/src/views/system/message/public-content/detail.vue @@ -0,0 +1,289 @@ + + + \ No newline at end of file diff --git a/src/views/system/message/public-content/index.vue b/src/views/system/message/public-content/index.vue index 2741727..7c3f548 100644 --- a/src/views/system/message/public-content/index.vue +++ b/src/views/system/message/public-content/index.vue @@ -90,9 +90,7 @@ 详情 @@ -133,7 +131,9 @@ import { onMounted, reactive, ref } from "vue"; import { publicContentPage, publicContentDelete } from "@/api/Sys"; import { ElMessage, ElMessageBox } from "element-plus"; import Add from "./add.vue"; +import { useRouter } from "vue-router"; import useUserStore from "@/store/modules/user"; +const router = useRouter(); const userStore = useUserStore(); const user = ref(JSON.parse(userStore.userInfo)); const userId = ref(user.value.userId); @@ -191,6 +191,13 @@ const del = (id) => { }); }); }; +//公开内容详情 +const toDetail = (id) => { + router.push({ + name: "public-detail", + query: { id: id }, + }); +}; //关闭新增弹窗 const onclone = () => { dialogVisible.value = false; diff --git a/src/views/system/message/study-content/detail.vue b/src/views/system/message/study-content/detail.vue new file mode 100644 index 0000000..764cc51 --- /dev/null +++ b/src/views/system/message/study-content/detail.vue @@ -0,0 +1,289 @@ + + + \ No newline at end of file diff --git a/src/views/system/message/study-content/index.vue b/src/views/system/message/study-content/index.vue index 732e855..1c8887e 100644 --- a/src/views/system/message/study-content/index.vue +++ b/src/views/system/message/study-content/index.vue @@ -90,9 +90,7 @@ 详情 @@ -133,7 +131,9 @@ import { onMounted, reactive, ref } from "vue"; import { partyLearnPage, partyLearnDelete } from "@/api/Sys"; import { ElMessage, ElMessageBox } from "element-plus"; import Add from "./add.vue"; +import { useRouter } from "vue-router"; import useUserStore from "@/store/modules/user"; +const router = useRouter(); const userStore = useUserStore(); const user = ref(JSON.parse(userStore.userInfo)); const userId = ref(user.value.userId); @@ -191,6 +191,13 @@ const del = (id) => { }); }); }; +//党员学习内容详情 +const toDetail = (id) => { + router.push({ + name: "study-detail", + query: { id: id }, + }); +}; //关闭新增弹窗 const onclone = () => { dialogVisible.value = false;