diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue index 352d12627..8f8f5c7a7 100644 --- a/src/views/dataBoardMain/main-navbar.vue +++ b/src/views/dataBoardMain/main-navbar.vue @@ -220,12 +220,12 @@ export default { params = { orgId: this.value, level: this.getChooseLabel(this.value) }; } this.$http.post(`/gov/org/agency/maporg`, params).then(async ({ data: { data } }) => { - console.log(data); this.value = data.id; this.$store.dispatch("chooseArea/chooseName", { orgId: data.id, level: data.level, }); + console.log(children,data,"children"); let children = await this.dealTreeData(data.children); if (data.parentId) { this.options = [ @@ -260,9 +260,11 @@ export default { label: item.name, children: item.children && item.children.length ? this.dealTreeData(item.children, level++) : null, })); + console.log(data,"sdffs"); return data; }, setSelectName(index) { + console.log(index,"index"); const name = this.options.filter((item) => item.value === index)[0].label; const width = name.length > 5 ? name.length * 14 + 25 : 120; this.selectWidth = width; diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue index 8a4608523..d2337b8da 100644 --- a/src/views/modules/communityParty/activity/eventDetails.vue +++ b/src/views/modules/communityParty/activity/eventDetails.vue @@ -92,7 +92,7 @@ -
+
报名名单
diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue index 35d4ecb4a..515dce5c7 100644 --- a/src/views/modules/communityParty/activity/index.vue +++ b/src/views/modules/communityParty/activity/index.vue @@ -398,7 +398,7 @@ pageSize: 10, pageNo: 1, typeName: "", - enabled: 0 + enabled: 1 } const { data, code, msg } = await requestPost(url, params) if (code === 0) { @@ -434,6 +434,9 @@ this.detailShow = true this.formTitle = '详情' console.log('rowmememmeme',row) + if(this.typeList){ + row.typeName = this.typeList.filter(item=>item.id === row.typeId)[0].typeName || '--' + } this.$nextTick(() => { this.$refs.ref_detail.initForm(row) // this.$refs.ref_form.initForm('detail', row.id) diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue index 5bf0c1b0b..99b19c18d 100644 --- a/src/views/modules/communityParty/activity/initiateActivity.vue +++ b/src/views/modules/communityParty/activity/initiateActivity.vue @@ -343,7 +343,7 @@ export default { pageSize: 20, pageNo: 1, typeName: "", - enabled: 0 + enabled: 1 } const { data, code, msg } = await requestPost(url, params) if (code === 0) { diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index 6fa41a38e..f174a2f67 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -37,7 +37,7 @@ - + @@ -92,7 +92,7 @@ export default { adverTagList:[], ////// top:false, - fileList: [],//封面图片 + fileList: {},//封面图片 activityImgs:[],//活动照片 formType: 'add', //表单操作类型 add新增，edit编辑,records记录 // records:false, @@ -115,8 +115,8 @@ export default { coverPic: "",//封面图 releaseTime: "",//发布时间 sendMsg: false,//是否推送 - top: 0,//是否置顶 - status: 1 //状态 + top: false,//是否置顶 + status: 0 //状态 }, serviceList: [], // gridList: [], @@ -167,18 +167,14 @@ export default { this.startLoading(); if(row!=null){ this.formData = JSON.parse(JSON.stringify(row)); - this.fileList.push({fileUrl:this.formData.coverPic}) - console.log(this.formData.coverPic,'see'); + console.log(this.formData.coverPic); } this.formType=typeid - console.log(typeid); - console.log(this.formType,"5164"); - this.endLoading(); - if(typeid=="add"){ - this.setDefaultReleaseTime() - } + console.log(this.formData,"5164"); + this.endLoading(); + this.setDefaultReleaseTime() }, async advertisingTag () { const url = "/actual/base/advertisingTag/page" @@ -279,7 +275,6 @@ export default { let url = '/actual/base/communityPublicity/update' this.formData.sendMsg= this.formData.sendMsg? 1:0 this.formData.top= this.formData.top? 1:0 - this.formData.status=0 console.log(this.formData,"formData"); const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { @@ -300,7 +295,6 @@ export default { console.log(this.formData,"formData"); this.formData.sendMsg= this.formData.sendMsg? 1:0 this.formData.top= this.formData.top? 1:0 - const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue index 0d44cd503..4d29c1c0d 100644 --- a/src/views/modules/communityParty/comPromotion/index.vue +++ b/src/views/modules/communityParty/comPromotion/index.vue @@ -288,7 +288,7 @@ // console.log(row) const url = "/actual/base/communityPublicity/updateStatus" let params={ - status:0, + status:1, id:row.id } const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue index 9abea4158..d68cc1515 100644 --- a/src/views/modules/shequzhili/eventOld/eventList.vue +++ b/src/views/modules/shequzhili/eventOld/eventList.vue @@ -640,7 +640,7 @@ export default { this.getTableData(); }, async handleVote(row){ - const url = "/governance/icEventOld/updateSpecialColumn"; + const url = "/governance/icEventOld/reply"; let params = { icEventId:row.icEventId, @@ -649,14 +649,7 @@ export default { } const { data, code, msg } = await requestPost(url, params); - - if (code === 0) { - this.$message.success("操作成功！"); - this.getTableData(); - } else { - this.$message.error("操作失败！"); - } - + console.log(data); }, async handleDel(rowData) { let message = "确认删除?"; diff --git a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue index 22f03e2da..1d04b7d2f 100644 --- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue +++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue @@ -11,9 +11,6 @@
- - -
diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue index 1a804284d..0188cdba4 100644 --- a/src/views/modules/workSys/promotionTab/index.vue +++ b/src/views/modules/workSys/promotionTab/index.vue @@ -7,12 +7,7 @@ - - - - - - +
查询 diff --git a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue index 88e2fe4d1..0f862660d 100644 --- a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue +++ b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue @@ -8,9 +8,6 @@ {{ tagName }}
- - -