From ce7b27842b207f8628181f09e1d3d3ee8f485738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Mon, 23 Dec 2024 10:21:30 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BA=BA=E6=B0=91=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E5=BE=81=E9=9B=86=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/home/index.vue | 2 +- .../peopleOpinons/cpts/eventDetail.vue | 57 ++++++++++++------- .../peopleOpinons/opinionsDaily.vue | 22 +++---- .../cpts/suggestionList.vue | 14 ++--- .../shequzhili/solicitationSpecial/index.vue | 12 ++-- 5 files changed, 62 insertions(+), 45 deletions(-) diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index d0b652438..4f29571fc 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -276,7 +276,7 @@ export default { mounted() { // this.ehso(); //图形 - + this.getApiData(); this.$nextTick(() => { diff --git a/src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue b/src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue index cac99a957..498e80fde 100644 --- a/src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue +++ b/src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue @@ -49,33 +49,34 @@ 'm-info-prop', { 'm-info-prop-vis': source === 'visiual' }, ]"> - 意见标题： + 建议主题： {{ info.subjectTitle }}
- 意见内容: + 建议内容: {{ info.eventContent }}
-
- 意见文档: - 下载文件 - - + { 'm-info-prop-vis': source === 'visiual' }, + ]"> + 建议文档: +
+
+ {{ file.name }} + 下载 +
+
- 建议人： + 建议人姓名： {{ info.name }}
+ ]"> 建议人年龄： {{ info.age }}
+ ]"> 建议人身份： {{ ideaIdentityName }}
@@ -143,7 +144,7 @@ { 'm-info-prop-vis': source === 'visiual' }, ]"> 办理前： -
{ - console.log(item,"奥特玛"); - window.open(item, '_blank'); - }); + window.open(data.url, '_blank'); }, async loadGrid() { const url = "/gov/org/customergrid/gridoption"; @@ -440,4 +440,21 @@ export default { margin-right: 10px; } } +.uploadList1{ +// width: 99%; + display: flex; +// justify-content: space-between; + align-items: center; + flex-wrap: wrap; + >div{ + display: flex; + color: #606266; + align-items: center; + justify-content: space-between; + width: 100%; + &:hover{ + background-color: #f5f7fa; + } + } +} \ No newline at end of file diff --git a/src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue b/src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue index b264cd25e..c9fc2deba 100644 --- a/src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue +++ b/src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue @@ -4,7 +4,7 @@
- + @@ -17,17 +17,17 @@ --> - + - + - + @@ -48,7 +48,7 @@ - + @@ -87,13 +87,13 @@ - + - + - + - + - + - + @@ -48,7 +48,7 @@ - + @@ -92,11 +92,11 @@ --> - + - + - + 至 - -
@@ -364,12 +344,10 @@ export default { }, watch: { 'formData.notQuota'(newValue) { - console.log(newValue,'newvalue'); // 当 notQuota 变为 '0' 时，清空 quota if (newValue === '0') { this.formData.quota = ''; } - console.log( this.formData.quota); } }, @@ -378,12 +356,7 @@ export default { this.getTableData2() this.volunteerservicetype() this.getTableData() - // this.startLoading() - // await this.loadInfo() - // this.endLoading() this.getOrgTreeList() - - }, methods: { @@ -468,7 +441,7 @@ export default { } }, //获取活动详情 - async getTableData() { + getTableData() { // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list"; const url = `/voluntary/activityInfo/detail/${this.list.id}`; requestGet(url).then((res) => { @@ -529,7 +502,10 @@ export default { }, //提交 async handleComfirm() { - + if (this.formData.notQuota == '1' && this.formData.quota === 0) { + this.$message.error('活动人数不能为'); + return false; + } if (this.formData.address == '') { this.$message.error('请输入活动地点'); return; From b305377deb038434231ccbfb74e947dcda101db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Mon, 23 Dec 2024 17:58:48 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/event/cpts/event-detail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 30c0d1fe0..710213304 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -13,14 +13,14 @@
-
受理员编号
+
工单编号
{{ info.clerkNumber }}
办结时限
{{ info.timeLimit }}
-
工单编号
-
{{ info.workOrderNum }}
+
接收时间
+
{{ info.happenTime }}
紧急程度
{{ info.exigency }}
From 7a697e3d199338175600fc3d7f855cb1429b838b Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 24 Dec 2024 09:58:59 +0800 Subject: [PATCH 5/8] 1 --- src/views/modules/volunteer/activityArchive/add.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue index 037b2c8e8..90c045de1 100644 --- a/src/views/modules/volunteer/activityArchive/add.vue +++ b/src/views/modules/volunteer/activityArchive/add.vue @@ -526,8 +526,6 @@ export default { }, //提交 async handleComfirm() { - console.log(this.formData,"this,formD"); - debugger if (this.formData.notQuota == '1' && this.formData.quota === 0) { this.$message.error('活动人数不能为0'); return false; From 3f6311da7fdb9ed2c1bfc73ad8f2d2950cfcbfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 24 Dec 2024 16:53:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/peopleOpinons/cpts/eventDetail.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue b/src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue index 498e80fde..2db7d7ea1 100644 --- a/src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue +++ b/src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue @@ -63,10 +63,11 @@ 'm-info-prop', { 'm-info-prop-vis': source === 'visiual' }, ]"> - 建议文档: + 建议附件:
+ {{ file.name }} 下载
@@ -280,7 +281,10 @@ export default { if (this.eventId) { this.info = JSON.parse(JSON.stringify(this.eventDetailData)); this.info.attachmentList = this.eventDetailData.attachmentList.filter(item => item.type == 'doc') - console.log(this.info, "dslkjlksgjlskdj"); + this.info.attachmentList.map(item=>{ + item.image=item.name.split('.').pop()=='pdf'?"https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/prod/20241224/3859c08cd2e64e73924d768acd3f7dee.png":"https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/prod/20241224/35ef6aa0a06548c1a5811e28ba53562b.png" + + }) this.agencyId = this.info.agencyId } From d0dc979fa8d00b39a97428c135e300d5739f33af Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 25 Dec 2024 09:27:42 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=89=8D=E4=B8=8D=E5=86=8D=E8=AE=B0=E5=BD=95=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/index.js | 1 - src/views/pages/login.vue | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/utils/index.js b/src/utils/index.js index ec577e6cb..0b5a858b0 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -46,7 +46,6 @@ export function clearLoginInfo() { console.log('==========clearLoginInfo') store.commit("resetStore"); localStorage.removeItem("token"); - localStorage.setItem('thePageAtExit', location.href); window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false; } diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index f5a22e4b3..12ad1a647 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -161,15 +161,8 @@ export default { methods: { // 登陆后跳转逻辑 skipAfterLogin() { - let href = localStorage.getItem("thePageAtExit"); - if (href && href.indexOf("login") == -1) { - localStorage.removeItem("thePageAtExit"); - location.href = href; - } else { - localStorage.removeItem("thePageAtExit"); const redirect = this.$route.query.redirect || '/' this.$router.replace(redirect); - } }, // 获取公钥 getPubKey() { From 738f5245226d466863842420a16771b31394dbd4 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 25 Dec 2024 14:54:06 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E8=AE=BA=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volunteer/Dynamicmanagement/comment.vue | 116 ++++++++++++++++++ .../volunteer/Dynamicmanagement/index.vue | 25 ++-- 2 files changed, 134 insertions(+), 7 deletions(-) create mode 100644 src/views/modules/volunteer/Dynamicmanagement/comment.vue diff --git a/src/views/modules/volunteer/Dynamicmanagement/comment.vue b/src/views/modules/volunteer/Dynamicmanagement/comment.vue new file mode 100644 index 000000000..2bfe76e5c --- /dev/null +++ b/src/views/modules/volunteer/Dynamicmanagement/comment.vue @@ -0,0 +1,116 @@ + + + \ No newline at end of file diff --git a/src/views/modules/volunteer/Dynamicmanagement/index.vue b/src/views/modules/volunteer/Dynamicmanagement/index.vue index 29bd5f90c..a220f4f85 100644 --- a/src/views/modules/volunteer/Dynamicmanagement/index.vue +++ b/src/views/modules/volunteer/Dynamicmanagement/index.vue @@ -83,12 +83,9 @@ @click="handleupOnline(scope.row)" v-if="scope.row.online === 1">上线 删除 - + @click="handlComment(scope.row)">评论管理 + @@ -110,6 +107,10 @@ width="850px" top="10vh" class="dialog-h" @closed="showEditClose"> + + +