bug

src/views/modules/communityParty/activity/eventDetails.vue

@@ -68,6 +68,14 @@
                             <span>{{ formData.points || "--" }}</span>
                         </div>
                     </div>
+                    
+                    <div style="display: flex;" v-if="formData.online==0 && formData.status==2">
+                        <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.participants || "--" }}</span>
+                        </div>
+                    </div>
                     <!-- 总结 -->
                     <div class="m-info-prop" v-if="formData.status!==0&&formData.status!==1&&formData.status!==3">
                         <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动总结：</span>
@@ -84,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>

src/views/modules/communityParty/activity/index.vue

@@ -111,7 +111,7 @@
             <!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;"
               size="small" @click="handleSumm(scope.row)">活动总结</el-button> -->
 
-              <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs == null && scope.row.sumUp == ''" style="color:#1C6AFD;"
+              <el-button type="text" v-if="scope.row.status == 2 && !scope.row.activityImgs" style="color:#1C6AFD;"
               size="small" @click="handleSumm(scope.row)">活动总结</el-button>
 
             <el-button  type="text"
@@ -450,6 +450,7 @@
       },
 
       handleSumm(row){
+        console.log(row.activityImgs);
         this.initShow = true
         this.formTitle = '总结'
         this.$nextTick(() => {

src/views/modules/communityParty/activity/initiateActivity.vue

@@ -90,7 +90,7 @@
                                 <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
                                 </el-input> -->
                                 <Tinymce class="tinymce_view " v-model.trim="formData.sumUp" :height="250"
-                                    placeholder="请输入活动总结" />
+                                    placeholder="请输入活动总结"  @input="validateContent"/>
                             </div>
                         </el-form-item>
 
@@ -153,8 +153,8 @@
         <div class="div_btn">
             <el-button size="small" @click="handleCancle">取 消</el-button>
             <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
-                @click="handleComfirm">确
+                @click="handleComfirm">确 定</el-button>
-                定</el-button>
+               
         </div>
     </div>
 </template>
@@ -233,7 +233,9 @@ export default {
             customerId: localStorage.getItem('customerId'),
 
         }
+        
     },
+
     components: { Tinymce, UploadImage },
     mounted() {
         this.activityType()
@@ -241,6 +243,20 @@ export default {
     },
 
     methods: {
+        validateContent() {
+            console.log("dfs g");
+      // 使用正则表达式去除HTML标签后检查内容
+      const textContent = this.stripHtml(this.formData.sumUp);
+      if (textContent.trim() === '') {
+        this.formData.sumUp = null;
+      }
+    },
+    stripHtml(html) {
+      const div = document.createElement('div');
+      div.innerHTML = html;
+      return div.textContent || div.innerText || '';
+    },
+
         // 上传成功
         handleImgSuccess(res, file, fileList) {
             if (res.code === 0 && res.msg === 'success') {
@@ -335,6 +351,16 @@ export default {
             } else {
                 this.$message.error(msg)
             }
+            this.$nextTick(() => {
+                if (!map) {
+                    this.initMap(this.formData.latitude, this.formData.longitude);
+                    console.log("map", map,this.formData.latitude, this.formData.longitude)
+                } else {
+                    map.setCenter(this.formData.latitude, this.formData.longitude);
+                    map.setMarker(this.formData.latitude, this.formData.longitude);
+                    console.log("mapmapmap", map)
+                }
+            })
         },
 
         handleOnlineRegistration(value) {
@@ -414,8 +440,8 @@ export default {
                 console.log(startTimeArray);
                 const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
                 console.log(endTimeArray);
-                this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+                this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] 
-                this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+                this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] 
                 // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
                 // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
             } else {
@@ -427,16 +453,7 @@ export default {
         async initForm(type, activityId) {
             this.startLoading()
             console.log("啊实打实的", type, activityId)
-            this.$nextTick(() => {
+            console.log(map);
-                if (!map) {
-                    this.initMap(this.formData.latitude, this.formData.longitude);
-                    console.log("map", map)
-                } else {
-                    map.setCenter(this.formData.latitude, this.formData.longitude);
-                    map.setMarker(this.formData.latitude, this.formData.longitude);
-                    console.log("mapmapmap", map)
-                }
-            })
             this.formType = type
             if (type === 'edit') {
                 if (activityId.activityImgs || activityId.sumUp) {
@@ -479,6 +496,7 @@ export default {
                     if (res.code !== 0) {
                         return this.$message.error(res.msg);
                     } else {
+                        console.log(res.data);
                         this.demandOptions = this.getFlagData(
                             this.getTreeData(res.data),
                             "usableFlag"
@@ -566,8 +584,9 @@ export default {
             this.$refs['ref_form'].validate((valid, messageObj) => {
                 this.formData.sendMessage = this.formData.sendMessage ? 1 : 0;
                 console.log(this.formData, "2234323424")
-                const dateObj = this.formData.startTime.split(' ');
+                const dateObj = this.formData.startTime;
-                const formattedDate = dateObj[0]; // 获取日期部分，即 '2424-10-22'
+                console.log(dateObj);
+                const formattedDate = dateObj; // 获取日期部分，即 '2424-10-22'
                 if (this.formData.cutOffTime != '' && formattedDate <= this.formData.cutOffTime) {
                     this.$message.error('报名截止时间要小于活动开始时间')
                 } else if (!valid) {
@@ -623,7 +642,7 @@ export default {
 
         // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
         initMap(latitude, longitude) {
-
+            console.log(latitude, longitude,"564564568");
             map = new daiMap(
                 document.getElementById("app_activity"),
                 { latitude, longitude },
@@ -742,6 +761,8 @@ export default {
                 // longitude: null, //经度
                 // latitude: null//纬度
             }
+            map=""
+            
 
         },
         // 开启加载动画

src/views/modules/communityParty/comPromotion/event.vue

@@ -41,7 +41,7 @@
                     <div class="m-info-prop">
                         <span class="u-info-title-2">是否置顶: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <el-switch :value="formData.top === 0 ? true : false" :disabled="true"></el-switch>
+                        <el-switch :value="formData.top === 1 ? true : false" :disabled="true"></el-switch>
                       
                     </div>
                     <div class="m-info-prop">

src/views/modules/communityParty/comPromotion/index.vue

@@ -59,7 +59,7 @@
   </el-table-column>
   <el-table-column prop="top" header-align="center" align="center" label="置顶" width="100">
     <template slot-scope="scope">
-      <span>{{ scope.row.top === 0 ? '是' : '否' }}</span>
+      <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
     </template>
   </el-table-column>
   <el-table-column prop="topp" header-align="center" align="center" label="点赞数" width="100">

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_dispose.formData.openFlag,"sdf dsf sf sdf ");
-            this.openFlag=this.$refs.ref_processinfo_dispose.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'
@@ -591,7 +587,6 @@ export default {
             }
         },
         async submitDispose(url, params) {
-            params.openFlag=this.openFlag=this.$refs.ref_processinfo_dispose.formData.openFlag?1:0;
             console.log(params);
             const { data, code, msg } = await requestPost(url, {
                 ...params,

src/views/modules/shequzhili/eventOld/cpts/process-form.vue

@@ -11,13 +11,8 @@
                         <el-radio label="5">指派</el-radio>
                         <el-radio label="6">完成并回复</el-radio>
                         <el-radio label="2">转服务</el-radio>
-                        <el-radio label="7">公开讨论</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"

src/views/modules/shequzhili/eventOld/eventList.vue

@@ -209,7 +209,7 @@
                     <el-table-column prop="markTypeName" align="center" label="标记" width="80" :show-overflow-tooltip="true">
                     </el-table-column>
 
-                    <el-table-column fixed="right" label="操作" align="center" width="100">
+                    <el-table-column fixed="right" label="操作" align="center" width="200px">
                         <template slot-scope="scope">
                             <el-button v-if="scope.row.status === 'processing' && !scope.row.operationId
                                 " @click="handleDispose(scope.row)" type="text" size="small" class="">处理</el-button>
@@ -220,6 +220,8 @@
                                 " @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>
+                            
                         </template>
                     </el-table-column>
                 </el-table>
@@ -638,7 +640,18 @@ export default {
             this.handleClose();
             this.getTableData();
         },
+        async handleVote(row){
+          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);
+            console.log(data);
+        },
         async handleDel(rowData) {
             let message = "确认删除?";
             this.$confirm(message, "提示", {