From afc6ff1326c0b9e9d337bc729b6d1733a4ddcb96 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: Fri, 12 Jul 2024 13:30:27 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/comPromotion/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue
index f169bcdf0..b5df9695f 100644
--- a/src/views/modules/communityParty/comPromotion/index.vue
+++ b/src/views/modules/communityParty/comPromotion/index.vue
@@ -296,7 +296,7 @@
           if (code === 0) {
             this.$message({
               type: "success",
-              message: "一发布"
+              message: "已发布"
             });
     
             this.loadTable()

From 376d2eb518a21847ae6d82af3f6f0057918877bc 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: Fri, 12 Jul 2024 16:55:18 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E5=8A=A0=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/comPromotion/event.vue | 4 ++--
 src/views/modules/communityParty/comPromotion/index.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityParty/comPromotion/event.vue b/src/views/modules/communityParty/comPromotion/event.vue
index 4352e54fe..5999df54e 100644
--- a/src/views/modules/communityParty/comPromotion/event.vue
+++ b/src/views/modules/communityParty/comPromotion/event.vue
@@ -53,14 +53,14 @@
                     <div class="m-info-prop">
                         <span class="u-info-title-2">点赞数: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.address || "--" }}</span>
+                        <span>{{ formData.likes || "--" }}</span>
                     </div>
 
                     <div style="display: flex;">
                         <div class="m-info-prop" style="flex: 0 0 50%;">
                             <span class="u-info-title-2">转发数</span>
                             <span style="margin-right: 10px;">&nbsp;</span>
-                            <span>{{ formData.cutOffTime || "--" }}</span>
+                            <span>{{ formData.transpond || "--" }}</span>
                         </div>
                     </div>
 
diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue
index b5df9695f..1f1f013ac 100644
--- a/src/views/modules/communityParty/comPromotion/index.vue
+++ b/src/views/modules/communityParty/comPromotion/index.vue
@@ -62,9 +62,9 @@
       <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
     </template>
   </el-table-column>
-  <el-table-column prop="topp" header-align="center" align="center" label="点赞数" width="100">
+  <el-table-column prop="likes" header-align="center" align="center" label="点赞数" width="100">
   </el-table-column>
-  <el-table-column prop="createdTime" header-align="center" align="center" label="转发数" width="100">
+  <el-table-column prop="transpond" header-align="center" align="center" label="转发数" width="100">
   </el-table-column>
   <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
     <template slot-scope="scope">

From cd22d6bae8416d468b25f208d10891e8b747ed96 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, 16 Jul 2024 13:30:36 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=20=E5=AE=A3=E4=BC=A0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/promotionTab/index.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue
index 020def2b7..1a804284d 100644
--- a/src/views/modules/workSys/promotionTab/index.vue
+++ b/src/views/modules/workSys/promotionTab/index.vue
@@ -29,17 +29,17 @@
       </div>
 
       <el-table class="table" :data="tableData" border v-loading="tableLoading"
-        style="width: 100%">
+      :height="tableHeight"   style="width: 100%">
 
         <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
-        <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" width="380">
+        <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" >
         </el-table-column>
-        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" width="380">
+        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" >
           <template slot-scope="scope">
             <span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
+        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
         </el-table-column>
 
         <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
@@ -80,6 +80,7 @@
 </template>
 
     <script>
+      import { mapGetters } from 'vuex'
      import AddpromotionTab from './AddpromotionTab.vue'
      import viewPromotionalTags from './viewPromotionalTags.vue'
     import { Loading } from 'element-ui' // 引入Loading服务
@@ -109,6 +110,13 @@
         ],
         }
       },
+      computed:{
+        tableHeight() {
+          return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
+
+        },
+        ...mapGetters(['clientHeight', 'iframeHeight'])
+      },
       components: {
         AddpromotionTab,viewPromotionalTags
       },

From 66482688806d0aa154ed20adeac83822cd219c73 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: Wed, 10 Jul 2024 14:05:28 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoardMain/main-navbar.vue       |  4 +++-
 .../communityParty/comPromotion/add.vue       | 19 +++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

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/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue
index 6fa41a38e..4f3707620 100644
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@@ -37,7 +37,7 @@
                 </el-form-item>
 
                 <el-form-item label="首页置顶" style="display: block" prop="top" label-width="150px">
-                    <el-switch v-model="formData.top" :active-value="1" :inactive-value="0" @change="handleOnlineRegistration"></el-switch>
+                    <el-switch v-model="formData.top" @change="handleOnlineRegistration"></el-switch>
                 </el-form-item>
 
                 <el-form-item label="消息推送" label-width="140px" prop="sendMsg">
@@ -115,8 +115,8 @@ export default {
             coverPic: "",//封面图
             releaseTime: "",//发布时间
             sendMsg: false,//是否推送
-            top: 0,//是否置顶
-            status: 1 //状态
+            top: false,//是否置顶
+            status: 0 //状态
         },
           serviceList: [],
         //   gridList: [],
@@ -172,13 +172,9 @@ export default {
              
             }
             this.formType=typeid
-           console.log(typeid);
-            console.log(this.formType,"5164");
+            console.log(this.formData,"5164");
             this.endLoading();
-            if(typeid=="add"){
-              this.setDefaultReleaseTime()
-            }
-           
+            this.setDefaultReleaseTime()
         },
     async advertisingTag () {
           const url = "/actual/base/advertisingTag/page"
@@ -263,7 +259,7 @@ export default {
           this.$refs['ref_form'].validate((valid, messageObj) => {
             this.formData.agencyName= this.agencyName
             this.formData.agencyId= this.agencyId
-            this.formData.status= 1
+            this.formData.status= 0
             console.log("this.formData看看里面村的什么",this.formData)
             if (!valid) {
               app.util.validateRule(messageObj)
@@ -279,7 +275,7 @@ 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.top);
               console.log(this.formData,"formData");
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
@@ -300,7 +296,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({

From 17a55e667a90ee65bd2189c02011541f0dfc0734 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: Wed, 17 Jul 2024 15:43:36 +0800
Subject: [PATCH 05/10] bug

---
 src/views/modules/shequzhili/eventOld/cpts/event-info.vue  | 7 ++++++-
 .../modules/shequzhili/eventOld/cpts/process-form.vue      | 4 ++++
 src/views/modules/workSys/promotionTab/AddpromotionTab.vue | 7 ++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index 06d5258d2..0e9c29939 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -529,7 +529,11 @@ export default {
         },
 
         async handelDispose() {
-            this.$refs.ref_processinfo_dispose.getProcessInfo();         
+            console.log(this.formData.operationType);
+            console.log(this.formData.openFlag);
+            this.$refs.ref_processinfo_dispose.getProcessInfo();
+            console.log(this.$refs.ref_processinfo_add.formData.openFlag);
+            this.openFlag=this.$refs.ref_processinfo_add.formData.openFlag;
             if (this.$refs.ref_processinfo_dispose.okflag) {
                 this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
                 if (this.formData.operationType === "0" || this.formData.operationType === '5'
@@ -587,6 +591,7 @@ export default {
             }
         },
         async submitDispose(url, params) {
+            params.openFlag=this.openFlag=this.$refs.ref_processinfo_add.formData.openFlag;
             console.log(params);
             const { data, code, msg } = await requestPost(url, {
                 ...params,
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
index 634d43b39..099566c26 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
@@ -13,6 +13,10 @@
                         <el-radio label="2">转服务</el-radio>
                     </el-radio-group>
                 </el-form-item>
+                <el-form-item label="公开表决" label-width="150px"
+                    prop="openFlag">
+                    <el-switch v-model="formData.openFlag" ></el-switch>
+                </el-form-item>
             </el-form>
             <div v-if="operationType === '0'">
                 <process-form-replay ref="ref_process_form_replay" :source="source" :eventDetailData="eventDetailData"
diff --git a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
index 22f03e2da..bbcd4c6d5 100644
--- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
+++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
@@ -11,9 +11,10 @@
                 </el-input>
             </div>
           </el-form-item>
-                    <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
-                    <el-switch v-model="status" :active-value="1" :inactive-value="0"></el-switch>
-                </el-form-item>
+
+          <!-- <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="online" @change="handleOnlineRegistration"></el-switch>
+                </el-form-item> -->
         </el-form>
       </div>
   

From ce768c1a838d7b103bdda3f8af897d1802af33cf 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: Thu, 11 Jul 2024 16:53:12 +0800
Subject: [PATCH 06/10] 1

---
 .../communityParty/activity/eventDetails.vue  |  2 +-
 .../shequzhili/eventOld/cpts/event-info.vue   |  7 +------
 .../shequzhili/eventOld/cpts/process-form.vue |  4 ----
 .../modules/shequzhili/eventOld/eventList.vue | 19 +++++--------------
 4 files changed, 7 insertions(+), 25 deletions(-)

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 @@
                         </div>
                     </div>
                        <!-- 报名名单 -->
-                    <div v-if="formData.status!==0 && formData.online == 1" style="margin-top: 20px;">
+                    <div v-if="formData.status!==0||formData.online == 1" style="margin-top: 20px;">
                         <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
                             报名名单
                         </div>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index 0e9c29939..06d5258d2 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -529,11 +529,7 @@ export default {
         },
 
         async handelDispose() {
-            console.log(this.formData.operationType);
-            console.log(this.formData.openFlag);
-            this.$refs.ref_processinfo_dispose.getProcessInfo();
-            console.log(this.$refs.ref_processinfo_add.formData.openFlag);
-            this.openFlag=this.$refs.ref_processinfo_add.formData.openFlag;
+            this.$refs.ref_processinfo_dispose.getProcessInfo();         
             if (this.$refs.ref_processinfo_dispose.okflag) {
                 this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
                 if (this.formData.operationType === "0" || this.formData.operationType === '5'
@@ -591,7 +587,6 @@ export default {
             }
         },
         async submitDispose(url, params) {
-            params.openFlag=this.openFlag=this.$refs.ref_processinfo_add.formData.openFlag;
             console.log(params);
             const { data, code, msg } = await requestPost(url, {
                 ...params,
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
index 099566c26..634d43b39 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
@@ -13,10 +13,6 @@
                         <el-radio label="2">转服务</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="公开表决" label-width="150px"
-                    prop="openFlag">
-                    <el-switch v-model="formData.openFlag" ></el-switch>
-                </el-form-item>
             </el-form>
             <div v-if="operationType === '0'">
                 <process-form-replay ref="ref_process_form_replay" :source="source" :eventDetailData="eventDetailData"
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index 8789de5ea..ad7e86dad 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -220,9 +220,7 @@
                                 " @click="handleWatch(scope.row)" type="text" size="small" class="">去评价</el-button>
                             <el-button v-else @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
                             <el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
-                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">{{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}}</el-button>
-                            
-                     
+                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">开启表决</el-button>
                             
                         </template>
                     </el-table-column>
@@ -643,23 +641,16 @@ export default {
             this.getTableData();
         },
         async handleVote(row){
-          const url = "/governance/icEventOld/updateSpecialColumn";
+          const url = "/governance/icEventOld/reply";
             let params = {
-
+                conten:row.eventContent,
                 icEventId:row.icEventId,
                 openFlag:row.openFlag==1?0:1,
-
+                operationType:"operationType"
             }
     
             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 = "确认删除?";

From 5263f3ea459cdcafe7be258893d52bc60ff793fc 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: Thu, 11 Jul 2024 18:27:29 +0800
Subject: [PATCH 07/10] 1111

---
 .../communityParty/activity/eventDetails.vue  |  2 +-
 .../communityParty/comPromotion/add.vue       |  9 ++++-----
 .../modules/shequzhili/eventOld/eventList.vue | 19 ++++++++++++++-----
 .../workSys/promotionTab/AddpromotionTab.vue  |  4 ----
 .../modules/workSys/promotionTab/index.vue    | 14 ++------------
 .../promotionTab/viewPromotionalTags.vue      |  3 ---
 6 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
index d2337b8da..8a4608523 100644
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -92,7 +92,7 @@
                         </div>
                     </div>
                        <!-- 报名名单 -->
-                    <div v-if="formData.status!==0||formData.online == 1" style="margin-top: 20px;">
+                    <div v-if="formData.status!==0 && formData.online == 1" style="margin-top: 20px;">
                         <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
                             报名名单
                         </div>
diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue
index 4f3707620..f174a2f67 100644
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@@ -92,7 +92,7 @@ export default {
         adverTagList:[],
         //////
           top:false,
-          fileList: [],//封面图片
+          fileList: {},//封面图片
           activityImgs:[],//活动照片
           formType: 'add', //表单操作类型 add新增，edit编辑,records记录
         //   records:false,
@@ -167,11 +167,11 @@ 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(this.formData,"5164");
             this.endLoading();
             this.setDefaultReleaseTime()
@@ -259,7 +259,7 @@ export default {
           this.$refs['ref_form'].validate((valid, messageObj) => {
             this.formData.agencyName= this.agencyName
             this.formData.agencyId= this.agencyId
-            this.formData.status= 0
+            this.formData.status= 1
             console.log("this.formData看看里面村的什么",this.formData)
             if (!valid) {
               app.util.validateRule(messageObj)
@@ -275,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
-                console.log(this.formData.top);
               console.log(this.formData,"formData");
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index ad7e86dad..8789de5ea 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -220,7 +220,9 @@
                                 " @click="handleWatch(scope.row)" type="text" size="small" class="">去评价</el-button>
                             <el-button v-else @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
                             <el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
-                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">开启表决</el-button>
+                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">{{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}}</el-button>
+                            
+                     
                             
                         </template>
                     </el-table-column>
@@ -641,16 +643,23 @@ export default {
             this.getTableData();
         },
         async handleVote(row){
-          const url = "/governance/icEventOld/reply";
+          const url = "/governance/icEventOld/updateSpecialColumn";
             let params = {
-                conten:row.eventContent,
+
                 icEventId:row.icEventId,
                 openFlag:row.openFlag==1?0:1,
-                operationType:"operationType"
+
             }
     
             const { data, code, msg } = await requestPost(url, params);
-            console.log(data);
+            
+            if (code === 0) {
+                this.$message.success("操作成功！");
+                this.getTableData();
+            } else {
+                this.$message.error("操作失败！");
+            }
+     
         },
         async handleDel(rowData) {
             let message = "确认删除?";
diff --git a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
index bbcd4c6d5..1d04b7d2f 100644
--- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
+++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
@@ -11,10 +11,6 @@
                 </el-input>
             </div>
           </el-form-item>
-
-          <!-- <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
-                    <el-switch v-model="online" @change="handleOnlineRegistration"></el-switch>
-                </el-form-item> -->
         </el-form>
       </div>
   
diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue
index 1a804284d..53b534aa2 100644
--- a/src/views/modules/workSys/promotionTab/index.vue
+++ b/src/views/modules/workSys/promotionTab/index.vue
@@ -7,12 +7,7 @@
             <el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
-          <el-form-item label="首页显示">
-            <el-select class="item_width_1" v-model.trim="status" size="small" placeholder="请选择" clearable>
-              <el-option v-for="item in statuslist" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
+
           <div style="display: flex; justify-content: flex-end;">
             <el-button style="margin-left:10px" class="diy-button--blue" size="small"
               @click="handleSearch">查询</el-button>
@@ -34,12 +29,7 @@
         <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
         <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" >
         </el-table-column>
-        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" >
-          <template slot-scope="scope">
-            <span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
+        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
         </el-table-column>
 
         <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
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 @@
                         <span>{{ tagName }}</span>
                     </div>
                 </el-form-item>
-                <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
-                    <el-switch v-model="online" disabled></el-switch>
-                </el-form-item>
             </el-form>
         </div>
 

From 2495c44e3431a26884db793e8b711ac1f2e55a57 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: Thu, 11 Jul 2024 16:53:12 +0800
Subject: [PATCH 08/10] 1111

---
 .../communityParty/activity/eventDetails.vue  |  2 +-
 .../modules/shequzhili/eventOld/eventList.vue | 19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

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 @@
                         </div>
                     </div>
                        <!-- 报名名单 -->
-                    <div v-if="formData.status!==0 && formData.online == 1" style="margin-top: 20px;">
+                    <div v-if="formData.status!==0||formData.online == 1" style="margin-top: 20px;">
                         <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
                             报名名单
                         </div>
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index 8789de5ea..ad7e86dad 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -220,9 +220,7 @@
                                 " @click="handleWatch(scope.row)" type="text" size="small" class="">去评价</el-button>
                             <el-button v-else @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
                             <el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
-                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">{{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}}</el-button>
-                            
-                     
+                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">开启表决</el-button>
                             
                         </template>
                     </el-table-column>
@@ -643,23 +641,16 @@ export default {
             this.getTableData();
         },
         async handleVote(row){
-          const url = "/governance/icEventOld/updateSpecialColumn";
+          const url = "/governance/icEventOld/reply";
             let params = {
-
+                conten:row.eventContent,
                 icEventId:row.icEventId,
                 openFlag:row.openFlag==1?0:1,
-
+                operationType:"operationType"
             }
     
             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 = "确认删除?";

From c0cc5fb73572f7a5e5293607279a89dfd0d11c9e 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, 16 Jul 2024 13:30:36 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/promotionTab/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue
index 53b534aa2..0188cdba4 100644
--- a/src/views/modules/workSys/promotionTab/index.vue
+++ b/src/views/modules/workSys/promotionTab/index.vue
@@ -29,7 +29,12 @@
         <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
         <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" >
         </el-table-column>
-        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
+        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
         </el-table-column>
 
         <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">

From 4863d6fea2187060c2daa9867fb8c11f72c6fa3d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 17 Jul 2024 16:27:29 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/activity/index.vue          | 5 ++++-
 .../modules/communityParty/activity/initiateActivity.vue     | 2 +-
 src/views/modules/communityParty/comPromotion/index.vue      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

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/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)