diff --git a/src/api/peoSuggestion.js b/src/api/peoSuggestion.js index 39f0fad..ac76247 100644 --- a/src/api/peoSuggestion.js +++ b/src/api/peoSuggestion.js @@ -6,18 +6,8 @@ export function icEventSpecialSubject(data) { data }) } - //金点子专题详情 -// export function getDetail(data) { -// return request({ -// url: `/governance/icEventSpecialSubject/getDetail`, -// method: 'get', -// data -// }) -// } - //金点子详情 - - //获取处理进展 -export function getDetail(params) { + //专题详细介绍 + export function getDetailSpecial(params) { return request({ url: `/governance/icEventSpecialSubject/getDetail`, method: 'get', @@ -25,6 +15,25 @@ export function getDetail(params) { params }) } + //金点子专题详情 + export function getDetail(data) { + return request({ + url: `/governance/icEventOld/detail`, + method: 'post', + data + }) + } + //金点子详情 + + //获取处理进展 +// export function getDetail(params) { +// return request({ +// url: `/governance/icEventSpecialSubject/getDetail`, +// method: 'get', +// message: '获取处理进展中...', +// params +// }) +// } export function icEventOldAdd(data) { return request({ diff --git a/src/router/router.config.js b/src/router/router.config.js index acefc34..355f874 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -150,6 +150,12 @@ export const constantRouterMap = [ component: () => import('@/views/peoSuggestion/explain.vue'), meta: { title: '征集说明', keepAlive: false } }, + { + path: '/explainSpecial', + name: 'explainSpecial', + component: () => import('@/views/peoSuggestion/explainSpecial.vue'), + meta: { title: '专题征集说明', keepAlive: false } + }, { path: '/solicitationDaily', name: 'solicitationDaily', diff --git a/src/views/peoSuggestion/explainSpecial.vue b/src/views/peoSuggestion/explainSpecial.vue new file mode 100644 index 0000000..bc64156 --- /dev/null +++ b/src/views/peoSuggestion/explainSpecial.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/views/peoSuggestion/goldenIdea.vue b/src/views/peoSuggestion/goldenIdea.vue index 8027cb8..6c2617d 100644 --- a/src/views/peoSuggestion/goldenIdea.vue +++ b/src/views/peoSuggestion/goldenIdea.vue @@ -3,11 +3,7 @@
查询 @@ -18,11 +14,11 @@
-
+
+ :key="index" @click="$router.push({ path: `/goldenIdeaDetail`, query: { eventId: item.icEventId, } })">
{{ item.subjectTitle }} @@ -42,18 +38,18 @@
+ :key="index" @click="$router.push({ path: `/goldenIdeaDetail`, query: { eventId: item.icEventId,specialSubjectId:item.specialSubjectId} })">
{{ item.subjectTitle }}
- {{ item.publicationPeopleName }} + {{ item.eventContent }}
- {{ item.publicationTime }} + {{ item.createdTime }}
@@ -63,9 +59,9 @@
-
+ @@ -85,28 +81,6 @@ export default { return { tagActive:"", showGold:false, - PublicityList: [ - { - title:"70岁以上高龄老人补贴福利发放于1月1日", - name:"胡冰", - time:"2024-09-10 09:30" - }, - { - title:"70岁以上高龄老人补贴福利发放于1月1日", - name:"胡冰", - time:"2024-09-10 09:30" - }, - { - title:"70岁以上高龄老人补贴福利发放于1月1日", - name:"胡冰", - time:"2024-09-10 09:30" - }, - { - title:"70岁以上高龄老人补贴福利发放于1月1日", - name:"胡冰", - time:"2024-09-10 09:30" - }, - ], tagList:[{ id:"0", tagName:"日常征集" @@ -163,7 +137,7 @@ export default { } let res = await icEventSpecialSubject(parm) if (res.code === 0) { - this.eventList = res.data.list.slice(0, 4); + this.eventList = res.data.list; } }, //专题征集金点子列表 @@ -175,14 +149,15 @@ export default { eventContent:"", operationType:4, openFlag:"", - specialSubjectId:"", + specialSubjectId:"all", subjectTitle:this.subjectTitle, goldenIdeaFlag:1, agencyId:"", reportUserId:"" } - let res = await icEventSpecialSubject(parm) + let res = await ideaList(parm) if (res.code === 0) { + this.goldIdealList=[] this.goldIdealList = res.data.list; // this.tagList.unshift({ tagName: '最新', id: 'new' }) } @@ -197,13 +172,14 @@ export default { operationType:4, openFlag:"", specialSubjectId:"", - subjectTitle:"", + subjectTitle:this.subjectTitle, goldenIdeaFlag:1, agencyId:"", reportUserId:"" } let res = await ideaList(parm) if (res.code === 0) { + this.goldIdealist=[] this.goldIdealist = res.data.list; // this.tagList.unshift({ tagName: '最新', id: 'new' }) } @@ -212,7 +188,8 @@ export default { this.$router.push({name:'goldenIdeaDetail',query:{id:item.id}}) }, handleSearch(){ - this.PublicityList = []; + this.goldIdealist = []; + this.eventList=[] this.pageNo = 1; this.icEventSpecialSubjectGold() this.ideaList() @@ -220,19 +197,7 @@ export default { filterTagId(tagId) { return this.tagList.filter(item => item.id === tagId)[0].tagName || '--'; }, - // async advertisingTag() { - // let parm = { - // pageSize: 10, - // pageNo: 1, - // status: 1, - // tagName: null - // } - // let res = await advertisingTag(parm) - // if (res.code === 0) { - // this.tagList = res.data.list; - // this.tagList.unshift({ tagName: '最新', id: 'new' }) - // } - // }, + extractChineseCharactersAndPunctuation(str) { const chineseCharsAndPunctuation = str.match(/[\u4e00-\u9fa5\u3000-\u303F\uff00-\uffef]/g); return chineseCharsAndPunctuation ? chineseCharsAndPunctuation.join('') : ''; diff --git a/src/views/peoSuggestion/goldenIdeaDetail.vue b/src/views/peoSuggestion/goldenIdeaDetail.vue index 20879f5..1431979 100644 --- a/src/views/peoSuggestion/goldenIdeaDetail.vue +++ b/src/views/peoSuggestion/goldenIdeaDetail.vue @@ -3,14 +3,14 @@

{{ ProblemDescription.subjectTitle }}

-
{{ ProblemDescription.subjectContent }}
+
{{ ProblemDescription.eventContent }}
{{ ProblemDescription.createdTime }}
-
+
-
- + 反对 -
+
-->
@@ -59,14 +59,15 @@ export default { disableAllButtons: false, eventId: "", ProblemDescription: {}, - vote: {} + vote: {}, + specialSubjectId:"" }; }, components:{}, created() { + this.specialSubjectId=this.$route.query.specialSubjectId console.log(this.$route.query.eventId); - this.eventId = this.$route.query.eventId this.id = this.$route.query.eventId this.agencyId = this.$store.state.app.agencyId; @@ -91,11 +92,12 @@ export default { async getDetail() { console.log(this.eventId, "this.id"); let parm = { - id: this.eventId + icEventId: this.eventId, + specialSubjectId:this.specialSubjectId } await getDetail(parm).then(res => { this.ProblemDescription = res.data; - this.ProblemDescription.subjectContent= this.ProblemDescription.subjectContent.replace(/<[^>]*>/g, '') + // this.ProblemDescription.subjectContent= this.ProblemDescription.subjectContent.replace(/<[^>]*>/g, '') this.dataValue = res.data.opposeNum + res.data.supportNum }) }, diff --git a/src/views/peoSuggestion/index.vue b/src/views/peoSuggestion/index.vue index 440453d..9598ca9 100644 --- a/src/views/peoSuggestion/index.vue +++ b/src/views/peoSuggestion/index.vue @@ -64,7 +64,7 @@
+ :key="index" @click="$router.push({ path: `/goldenIdeaDetail`, query: { eventId: item.icEventId,specialSubjectId:item.specialSubjectId } })">
{{ item.subjectTitle }} @@ -84,27 +84,7 @@
-
- - {{ item.subjectTitle }} - -
-
- {{ item.publicationPeopleName }} -
-
-
- {{ item.publicationTime }} -
- -
- -
-
-
-
+ :key="index" @click="$router.push({ path: `/goldenIdeaDetail`, query: { eventId: item.icEventId,specialSubjectId:item.specialSubjectId } })">
{{ item.subjectTitle }} @@ -123,6 +103,7 @@
+
@@ -239,13 +220,13 @@ export default { eventContent:"", operationType:4, openFlag:"", - specialSubjectId:"", + specialSubjectId:"all", subjectTitle:"", goldenIdeaFlag:1, agencyId:"", reportUserId:"" } - let res = await icEventSpecialSubject(parm) + let res = await ideaList(parm) if (res.code === 0) { this.goldIdealList = res.data.list.slice(0, 4); // this.tagList.unshift({ tagName: '最新', id: 'new' }) @@ -268,7 +249,8 @@ export default { } let res = await ideaList(parm) if (res.code === 0) { - this.goldIdealist = res.data.list.slice(0, 4); + this.goldIdealist=[] + this.goldIdealist = res.data.list.slice(0,4) // this.tagList.unshift({ tagName: '最新', id: 'new' }) } }, diff --git a/src/views/peoSuggestion/solicitationDaily.vue b/src/views/peoSuggestion/solicitationDaily.vue index 0375a02..ac314a9 100644 --- a/src/views/peoSuggestion/solicitationDaily.vue +++ b/src/views/peoSuggestion/solicitationDaily.vue @@ -35,7 +35,7 @@
@@ -95,6 +95,7 @@ export default { }, radio:"", + fileList:[] }; }, created() { diff --git a/src/views/peoSuggestion/topicList.vue b/src/views/peoSuggestion/topicList.vue index 5b40a1b..3f62582 100644 --- a/src/views/peoSuggestion/topicList.vue +++ b/src/views/peoSuggestion/topicList.vue @@ -87,20 +87,20 @@ export default { // this.communityPublicity()//获取讯息列表 }, methods: { - //专题征集列表 - async icEventSpecialSubject() { + //专题征集列表 + async icEventSpecialSubject() { let parm = { - clientType:"app", - name:"", - mobile:"", - eventContent:this.eventContent, - operationType:4, - openFlag:"", - specialSubjectId:"", - subjectTitle:this.subjectTitle, - goldenIdeaFlag:0, - agencyId:"", - reportUserId:"" + clientType: "app", + name: "", + mobile: "", + eventContent: this.eventContent, + operationType: 4, + openFlag: "", + specialSubjectId: "", + subjectTitle: this.subjectTitle, + goldenIdeaFlag: 0, + agencyId: "", + reportUserId: "" } let res = await icEventSpecialSubject(parm) if (res.code === 0) { diff --git a/src/views/peoSuggestion/topicListDetail.vue b/src/views/peoSuggestion/topicListDetail.vue index 2e63855..5891229 100644 --- a/src/views/peoSuggestion/topicListDetail.vue +++ b/src/views/peoSuggestion/topicListDetail.vue @@ -47,7 +47,7 @@