From a9df6d964354b9a3842de00ab5f5eb77c42ef485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Mon, 20 May 2024 17:56:46 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/activityRecords.vue              | 620 +++++++++++++++++
 .../communityParty/activity/eventDetails.vue  | 258 +++++++
 .../modules/communityParty/activity/index.vue | 634 ++++++++++++++++++
 3 files changed, 1512 insertions(+)
 create mode 100644 src/views/modules/communityParty/activity/activityRecords.vue
 create mode 100644 src/views/modules/communityParty/activity/eventDetails.vue
 create mode 100644 src/views/modules/communityParty/activity/index.vue

diff --git a/src/views/modules/communityParty/activity/activityRecords.vue b/src/views/modules/communityParty/activity/activityRecords.vue
new file mode 100644
index 000000000..50f528da9
--- /dev/null
+++ b/src/views/modules/communityParty/activity/activityRecords.vue
@@ -0,0 +1,620 @@
+<template>
+  <div>
+
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
+        class="form">
+        <el-form-item label="活动类型" label-width="150px" prop="gridId">
+          <el-select class="item_width_1" v-model.trim="formData.gridId" placeholder="请选择" clearable>
+            <el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="活动名称" prop="serviceMatterList" label-width="150px">
+          <el-cascader v-model.trim="formData.serviceMatterList" :options="demandOptions"
+            :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}"
+            clearable collapse-tags size="small" class="u-item-width-normal"></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="活动时间" prop="startTime">
+          <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
+            value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
+            end-placeholder="结束时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="协办方" prop="serviceMatterList" label-width="150px">
+          <el-cascader v-model.trim="formData.serviceMatterList" :options="demandOptions"
+            :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}"
+            clearable collapse-tags size="small" class="u-item-width-normal"></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="活动封面图" label-width="140px">
+          <template>
+            <upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"></upload-image>
+          </template>
+        </el-form-item>
+
+
+        <el-form-item label="活动内容" prop="target" label-width="150px" style="display: block">
+          <div class="item_width_1">
+            <Tinymce class="tinymce_view " v-if="formType!='detail'" v-model.trim="formData.content" :height="250"
+              placeholder="在这里输入文字" />
+
+            <p v-else class="text_p" v-html="formData.content"></p>
+          </div>
+        </el-form-item>
+
+        <el-form-item label="活动地点" prop="longitude" label-width="150px" style="display: block">
+          <div style="width: 500px">
+            <el-select v-model.trim="searchValue" filterable style="width: 500px" remote :reserve-keyword="true"
+              placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
+              <el-option v-for="(item,index) in searchOptions" @click.native="handleClickKey(index)" :key="item.value"
+                :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+            <div id="app_activity" class="div_map"></div>
+          </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-switch v-model="formData.isOn" active-text="已报名" inactive-text="未报名" @change="handleOnlineRegistration"></el-switch> -->
+        </el-form-item>
+
+        <div v-if="!online">
+          <el-form-item label="活动总结" prop="result" label-width="150px" style="display: block">
+          <div class="item_width_1">
+            <Tinymce class="tinymce_view " v-if="formType!='detail'" v-model.trim="formData.result" :height="250"
+              placeholder="在这里输入文字" />
+
+            <p v-else class="text_p" v-html="formData.result"></p>
+          </div>
+        </el-form-item>
+
+        <el-form-item label="活动照片" label-width="140px">
+          <template>
+            <upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"></upload-image>
+          </template>
+        </el-form-item>
+        </div>
+
+        <div  v-if="online">
+          <el-form-item label="报名截止时间" label-width="140px">
+          <el-date-picker v-model.trim="formData.endDate" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+            placeholder="选择报名截止时间" style="width:280px">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="活动积分" label-width="140px">
+          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="活动人数" label-width="140px">
+          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="消息推送数" label-width="140px">
+          <el-checkbox-group v-model="formData.serviceMatterList" >
+            <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        </div>
+
+        
+
+       
+
+      </el-form>
+    </div>
+
+    <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">确
+        定</el-button>
+    </div>
+  </div>
+</template>
+  
+  <script>
+  import { mapGetters } from 'vuex'
+  import { Loading } from 'element-ui' // 引入Loading服务
+  import { requestPost } from '@/js/dai/request'
+  import Tinymce from '@c/tinymce2/index.vue'
+  import daiMap from "@/utils/dai-map";
+  // import UploadImage from './upload-image.vue'
+  import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+  
+  var map
+  var search
+  var markers
+  var infoWindowList
+  var geocoder // 新建一个正逆地址解析类
+  
+  let loading // 加载动画
+  export default {
+    data () {
+      let initFormData = () => {
+        let _form = {
+          gridId: '',
+          serviceMatter: '',//服务事项
+          serviceMatterList: [],
+          unitId: '',//单位ID
+          unitIdList: [],
+          title: '',//活动标题
+          target: '',//活动目标
+          content: '',//活动内容
+          activityTime: '',//活动时间
+          peopleCount: 0,//服务人数
+          result: '', //活动结果
+          address: '', //详细地址
+          
+          endDate:'',
+          longitude: this.$store.state.user.longitude, //经度
+          latitude: this.$store.state.user.latitude//纬度
+        }
+  
+        return _form
+      }
+      return {
+        fileList: [],//图片
+        formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+        searchOptions: [],
+        searchValue: '',
+        resultList: [],
+        num: 0,
+        loading: false,
+        timeRange: [],
+        online:false,
+  
+        btnDisable: false,
+  
+        keyWords: '',
+        activityId: '',
+        formData: initFormData(),
+        serviceList: [],
+        // gridList: [],
+        agencyId: '',
+        
+        demandOptions:[]
+  
+      }
+    },
+    components: { Tinymce,UploadImage },
+    mounted () {
+      // this.initMap()
+  
+    },
+  
+    methods: {
+      handleOnlineRegistration(value) {
+        console.log(value)
+        if (value) {
+          this.online = true;
+        } else {
+          this.online = false;
+        }
+      },
+
+      onChangeFileList (e, rowIndex=0) {
+      console.log('onChangeFileList', e)
+      if (e.length > 0) {
+        this.fileList = []
+        e.forEach(item => {
+          let ob = {
+            fileType: '0',
+            fileUrl: item.response.data.url
+          }
+          this.fileList.push(ob)
+        })
+      }
+    },
+    handleChange(value) {
+        console.log(value);
+      },
+        handleTimeChange (time) {
+        if (time) {
+          const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+          const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+  
+          this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+          this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+  
+          // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+          // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+        } else {
+          this.formData.startTime = ''
+          this.formData.endTime = ''
+          // this.startTimeShow = ''
+          // this.endTimeShow = ''
+        }
+  
+      },
+  
+      async initForm (type, activityId) {
+        this.startLoading()
+        this.$refs.ref_form.resetFields();
+  
+  
+        //获取服务事项
+        await this.getDemandOptions()
+  
+        let { latitude, longitude } = this.$store.state.user;
+  
+        this.formType = type
+        if (activityId) {
+          this.activityId = activityId
+          this.formData.id = activityId
+          await this.loadFormData()
+        } else {
+          this.formData.latitude = latitude
+          this.formData.longitude = longitude
+        }
+        this.$nextTick(() => {
+          if (!map) {
+            this.initMap(this.formData.latitude, this.formData.longitude);
+          } else {
+            map.setCenter(this.formData.latitude, this.formData.longitude);
+            map.setMarker(this.formData.latitude, this.formData.longitude);
+          }
+        })
+        this.endLoading()
+  
+      },
+  
+      async getDemandOptions() {
+        this.$http
+          .post("/actual/base/serviceitem/listAllCategory")
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg);
+            } else {
+              this.demandOptions = this.getFlagData(
+                this.getTreeData(res.data),
+                "usableFlag"
+              );
+            }
+          })
+          .catch(() => {
+            return this.$message.error("网络错误");
+          });
+      },
+      getFlagData(data, flag) {
+        if (!Array.isArray(data)) return [];
+        let arr1 = data.filter((item) => item[flag]);
+        let arr2 = arr1.map((item) => {
+          if (item.childCateList)
+            return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+          else return item;
+        });
+        // console.log('arrr-oppp', arr2)
+        return arr2;
+      },
+      getTreeData(data) {
+        if (!Array.isArray(data)) return [];
+        let arr = data.map((item) => {
+          let _item = {};
+          if (item.childCateList) {
+            if (item.childCateList.length === 0)
+              _item = { ...item, childCateList: undefined };
+            else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+          } else {
+            _item = { ...item };
+          }
+          return _item;
+        });
+        return arr;
+      },
+      async loadGrid () {
+        const url = "/gov/org/customergrid/gridoption"
+  
+        let params = {
+          agencyId: this.agencyId
+        }
+  
+        const { data, code, msg } = await requestPost(url, params)
+  
+        if (code === 0) {
+          this.gridList = data
+  
+        } else {
+          this.$message.error(msg)
+        }
+  
+      },
+  
+      
+      //加载组织
+      async loadFormData () {
+        const url = '/actual/base/icpartyactivity/detail'
+        // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
+        let params = {
+          id: this.activityId
+        }
+  
+        const { data, code, msg } = await requestPost(url, params)
+  
+        if (code === 0) {
+          this.formData = data
+          console.log(this.formData.content)
+          let style_img = "style='width:50px;height:40px;' "
+  
+          if (this.formData.content) {
+            // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
+            // let array=this.formData.content.split('<img')
+  
+          }
+          console.log(this.formData.content)
+  
+        } else {
+          this.$message.error(msg)
+        }
+      },
+  
+      async handleComfirm () {
+        this.btnDisable = true
+        setTimeout(() => {
+          this.btnDisable = false
+        }, 10000)
+        this.$refs['ref_form'].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj)
+            this.btnDisable = false
+          } else {
+            this.addActivity()
+          }
+  
+        })
+  
+      },
+      async addActivity () {
+        let url = '/actual/base/icpartyactivity/save'
+        // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
+  
+  
+        const { data, code, msg } = await requestPost(url, this.formData)
+  
+        if (code === 0) {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.resetData()
+          this.$emit('dialogOk')
+          this.btnDisable = false
+        } else {
+          this.btnDisable = false
+          this.$message.error(msg)
+        }
+  
+      },
+  
+      handleCancle () {
+  
+        this.resetData()
+        this.$emit('dialogCancle')
+  
+      },
+  
+      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+      initMap (latitude, longitude) {
+  
+        map = new daiMap(
+          document.getElementById("app_activity"),
+          { latitude, longitude },
+          {
+            zoom: 16.2, // 设置地图缩放级别
+            pitch: 43.5, // 设置俯仰角
+            rotation: 45, // 设置地图旋转角度
+          }
+        );
+  
+        // 监听地图平移结束
+      /*  map.on("dragend", (e) => {
+          this.handleMoveCenter(e);
+        });*/
+        map.on("click", (e) => {
+          this.handleMoveCenter(e);
+        });
+  
+        map.setCenter(latitude, longitude);
+        map.setMarker(latitude, longitude);
+  
+      },
+  
+  
+      async handleMoveCenter (e) {
+        //修改地图中心点
+        // const { lat, lng } = map.getCenter();
+        const { lat, lng } = e.latLng;
+        this.formData.latitude = lat;
+        this.formData.longitude = lng;
+        map.setMarker(lat, lng);
+  
+        let { msg, data } = await map.getAddress(lat, lng);
+        if (msg == "success") {
+          this.formData.address = data.address
+          this.searchValue = data.address
+          this.searchOptions = []
+  
+        }
+      },
+  
+      async remoteMethod (query) {
+  
+        if (query !== '') {
+          this.loading = true;
+  
+          const { msg, data } = await map.searchNearby(query);
+          this.loading = false;
+          this.resultList = []
+  
+          if (msg == "success" && data.resultList && data.resultList.length > 0) {
+  
+            if (data.resultList && data.resultList.length > 0) {
+              this.resultList = data.resultList
+              this.searchOptions = this.resultList.map(item => {
+                return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
+  
+              });
+            }
+          } else {
+            this.searchOptions = [
+              {
+                value: '0',
+                label: '未检索到结果'
+              }
+            ]
+          }
+        } else {
+          this.searchOptions = [];
+        }
+      },
+  
+      handleClickKey (index) {
+        let selPosition = this.resultList[index]
+        let lonlat = selPosition.lonlat.split(" ")
+        map.setCenter(lonlat[1], lonlat[0]);
+        map.setMarker(lonlat[1], lonlat[0]);
+        this.formData.latitude = lonlat[1];
+        this.formData.longitude = lonlat[0];
+        this.formData.address = selPosition.address + selPosition.name
+      },
+  
+      resetData () {
+        this.searchValue = ''
+        this.searchOptions = []
+        this.resultList = []
+        this.activityId = ''
+        this.keyWords = ''
+        this.formData = {
+          gridId: '',
+          serviceMatter: '',//服务事项
+          serviceMatterList: [],
+          unitId: '',//单位ID
+          unitIdList: [],
+          title: '',//活动标题
+          target: '',//活动目标
+          content: '',//活动内容
+          activityTime: '',//活动时间
+          peopleCount: 0,//服务人数
+          result: '', //活动结果
+          address: '', //详细地址
+          longitude: this.$store.state.user.longitude, //经度
+          latitude: this.$store.state.user.latitude//纬度
+        }
+  
+      },
+      // 开启加载动画
+      startLoading () {
+        loading = Loading.service({
+          lock: true, // 是否锁定
+          text: '正在加载……', // 加载中需要显示的文字
+          background: 'rgba(0,0,0,.7)' // 背景颜色
+        })
+      },
+      // 结束加载动画
+      endLoading () {
+        // clearTimeout(timer);
+        if (loading) {
+          loading.close()
+        }
+      }
+    },
+    computed: {
+      dataRule () {
+        return {
+          serviceMatterList: [
+            { required: true, message: '服务事项不能为空', trigger: 'blur' }
+          ],
+          unitIdList: [
+            { required: true, message: '单位名称不能为空', trigger: 'blur' },
+          ],
+          title: [
+            { required: true, message: '活动标题不能为空', trigger: 'blur' }
+          ],
+  
+          target: [
+            { required: true, message: '活动目标不能为空', trigger: 'blur' }
+          ],
+          content: [
+            { required: true, message: '活动内容不能为空', trigger: 'blur' }
+          ],
+          activityTime: [
+            { required: true, message: '活动时间不能为空', trigger: 'blur' }
+          ],
+          result: [
+            { required: true, message: '活动结果不能为空', trigger: 'blur' }
+          ],
+          address: [
+            { required: true, message: '详细地址不能为空', trigger: 'blur' }
+          ],
+          longitude: [
+            { required: true, message: '坐标不能为空', trigger: 'blur' }
+          ]
+        }
+      },
+  
+    },
+    props: {
+  
+      unitList: {
+        type: Array,
+        default: []
+      },
+      gridList: {
+        type: Array,
+        default: []
+      },
+  
+  
+    }
+  }
+  </script>
+  
+  
+  <style lang="scss" scoped >
+  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+  </style>
+  <style  lang="scss" scoped>
+  .item_width_1 {
+    width: 560px;
+  
+    /deep/.tox .tox-dialog {
+      z-index: 20000;
+    }
+  }
+  .tinymce_view {
+    ::v-deep .tox .tox-dialog {
+      z-index: 2000000000;
+    }
+  }
+  
+  .div_map {
+    position: relative;
+  }
+  .div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+  }
+  
+  .tinymce_view {
+    height: 400px;
+    overflow: auto;
+  }
+  .text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+    > p {
+      margin: 0;
+    }
+  }
+  </style>
+  
+  
\ No newline at end of file
diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
new file mode 100644
index 000000000..501e8b2f7
--- /dev/null
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -0,0 +1,258 @@
+<template>
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <div v-if="initLoading" class="m-detail-main">
+                <div class="m-info">
+
+                    <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>绿色环保-垃圾分类</span>
+                        </div>
+                        <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>要想环境好，垃圾要分类</span>
+                        </div>
+                    </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>2024-03-12 09:00至2024-03-12 12:00</span>
+                        </div>
+                        <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.unitName || "--" }}</span>
+                        </div>
+                    </div>
+
+
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动内容: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <span>活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容</span>
+                    </div>
+
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">活动地点: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <span>{{ formData.address || "--" }}</span>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2"></span>
+                        <div class="div_map">
+                            <div id="app_detail_unit"></div>
+                        </div>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">线上报名: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <el-switch v-model="online"></el-switch>
+                    </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>2024-03-1123:59</span>
+                        </div>
+
+                        <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>3</span>
+                        </div>
+                    </div>
+
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动总结：</span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <span>活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容</span>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">活动图片：</span>
+                        <span>{{ formData.memberCount || "--" }}</span>
+                    </div>
+
+                    <div style="margin-top: 20px;">
+                        <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
+                            报名名单
+                        </div>
+                        <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
+                            style="width: 100%">
+                            <el-table-column label="序号" header-align="center" align="center" type="index"
+                                width="50"></el-table-column>
+
+                            <el-table-column prop="unitName" header-align="center" align="center" label="姓名"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="agencyName" header-align="center" align="center" label="联系电话"
+                                min-width="100">
+                            </el-table-column>
+                            <el-table-column prop="type" header-align="center" align="center" label="报名时间"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                                label="备注说明" show-overflow-tooltip min-width="120">
+
+                            </el-table-column>
+                            <el-table-column prop="contact" header-align="center" align="center" label="签到" width="80">
+                            </el-table-column>
+                            <el-table-column prop="contactMobile" header-align="center" align="center" label="签到地点"
+                                width="120">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+
+
+                    <div style="margin-top: 20px;">
+                        <div style="font-size: 15px; color: black; margin-left: -30px; margin-bottom: 10px;">
+                            活动实况
+                        </div>
+                        <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
+                            style="width: 100%">
+                            <el-table-column label="序号" header-align="center" align="center" type="index"
+                                width="50"></el-table-column>
+
+                            <el-table-column prop="unitName" header-align="center" align="center" label="姓名"
+                                min-width="100">
+                            </el-table-column>
+                            <el-table-column prop="agencyName" header-align="center" align="center" label="联系电话"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="type" header-align="center" align="center" label="实况内容"
+                                min-width="280">
+                            </el-table-column>
+                            <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                                label="活动照片" show-overflow-tooltip min-width="120">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+        <div class="m-detail-btn">
+            <el-button size="small" @click="handleCancle">关 闭</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import nextTick from "dai-js/tools/nextTick";
+import daiMap from "@/utils/dai-map";
+
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+let loading; // 加载动画
+export default {
+    data() {
+        return {
+            formData: {},
+            initLoading: false,
+            online:true,
+        };
+    },
+    components: {},
+    created() { },
+
+    methods: {
+        handleCancle() {
+            this.diaDestroy();
+            this.$emit("diaDetailClose");
+        },
+
+        diaDestroy() {
+            if (map) {
+                // map.destroy()
+            }
+        },
+
+        async initForm(row) {
+            this.startLoading();
+            this.formData = JSON.parse(JSON.stringify(row));
+            this.initLoading = true;
+            console.log(this.formData);
+            // await nextTick(200)
+
+            let { latitude, longitude } = this.$store.state.user;
+            console.log("lat" + latitude + ",lon" + longitude);
+            if (this.formData.latitude && this.formData.longitude) {
+                latitude = this.formData.latitude;
+                longitude = this.formData.longitude;
+            }
+            if (!latitude || latitude == "" || latitude == "0") {
+                latitude = 39.9088810666821;
+                longitude = 116.39743841556731;
+            }
+            this.$nextTick(() => {
+                if (!map) {
+                    this.initMap(latitude, longitude);
+                } else {
+                    map.setCenter(latitude, longitude);
+                    map.setMarker(latitude, longitude);
+                }
+            });
+
+            this.endLoading();
+        },
+
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+            map = new daiMap(
+                document.getElementById("app_detail_unit"),
+                { latitude, longitude },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45, // 设置地图旋转角度
+                }
+            );
+
+            // // 监听地图平移结束
+            // map.on("dragend", (e) => {
+            //   this.handleMoveCenter(e);
+            // });
+
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
+    },
+    computed: {},
+    props: {},
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+// span {
+//     display: inline-block;
+//     white-space: nowrap; /* 避免换行 */
+// }
+
+</style>
+<style scoped></style>
diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
new file mode 100644
index 000000000..27b96df16
--- /dev/null
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -0,0 +1,634 @@
+<template>
+  <div class="g-main">
+    <div class="m-search">
+      <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+        <div>
+
+          <el-form-item label="活动类型" prop="unitId">
+            <el-select class="item_width_1" v-model.trim="formData.unitId" size="small" placeholder="全部" clearable>
+              <el-option v-for="item in unitList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="活动状态" prop="unitId">
+            <el-select class="item_width_1" v-model.trim="formData.unitId" size="small" placeholder="全部" clearable>
+              <el-option v-for="item in unitList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+          <el-form-item label="活动名称" prop="title">
+            <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入关键字">
+            </el-input>
+          </el-form-item>
+
+        </div>
+        <div>
+          <el-form-item label="活动时间" prop="startTime">
+            <el-date-picker v-model.trim="timeRange" size="small"  style="width: 260px;" type="daterange" value-format="yyyy-MM-dd HH:mm:ss"
+              @change="handleTimeChange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="活动地点" prop="title">
+            <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入内容">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="协办方" prop="title">
+            <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入关键字">
+            </el-input>
+          </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>
+          <el-button style="margin-left:10px" class="diy-button--white" size="small" @click="resetSearch">重置</el-button>
+          </div>
+        </div>
+      </el-form>
+    </div>
+    <div class="m-table">
+      <div class="div_btn">
+        <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 发起活动</el-button>
+        <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 活动记录</el-button>
+      </div>
+
+      <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
+        style="width: 100%">
+
+        <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+        <el-table-column prop="unitName" header-align="center" align="center" label="活动类型" width="180">
+        </el-table-column>
+        <el-table-column prop="gridName" header-align="center" align="center" label="活动名称" width="180">
+        </el-table-column>
+        <el-table-column prop="title" header-align="center" align="center" label="活动开始时间" min-width="180">
+        </el-table-column>
+        <el-table-column prop="address" header-align="center" align="center" label="活动地点" min-width="230">
+        </el-table-column>
+
+        <el-table-column prop="peopleCount" header-align="center" align="center" label="协办方" width="100">
+        </el-table-column>
+        <el-table-column prop="activityTime" header-align="center" align="center" label="活动状态" width="230">
+        </el-table-column>
+        <el-table-column prop="activityTime" header-align="center" align="center" label="线上报名" width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.actId">小程序</span>
+            <span v-else>管理平台</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" fixed="right" width="140" header-align="center" align="center" class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
+              @click="handleDetail(scope.row)">查看</el-button>
+            <el-button v-if="agencyId===scope.row.agencyId&&!scope.row.actId" type="text"
+              style="color:#00A7A9;text-decoration: underline;" size="small"
+              @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="agencyId===scope.row.agencyId" type="text"
+              style="color:#D51010;text-decoration: underline;" size="small"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+          :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+      width="950px" top="5vh" class="dialog-h" @closed="diaClose">
+      <activity-records ref="ref_form" :unitList="unitList" :gridList="gridList" @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"></activity-records>
+    </el-dialog>
+
+    <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
+      width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
+      <event-details ref="ref_detail" :serviceList="serviceList" :gridList="gridList"
+        @diaDetailClose="detailClosed"></event-details>
+    </el-dialog>
+
+  </div>
+</template>
+  <script>
+  
+  import activityRecords from './activityRecords'
+  import eventDetails from './eventDetails'
+  import util from '@js/util.js';
+  import { requestPost } from "@/js/dai/request";
+  import { mapGetters } from 'vuex'
+  import { Loading } from 'element-ui' // 引入Loading服务
+  
+  let loading // 加载动画
+  export default {
+    data () {
+      return {
+        loading: false,
+        total: 0,
+        pageSize: 10,
+        pageNo: 0,
+        tableLoading: false,
+        agencyId: '',
+        gridList: [],//所属网格
+        unitList: [],//单位list
+        serviceList: [
+          {
+            id: "1",
+            name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
+          },
+          {
+            id: "2",
+            name: '积极配合'
+          },
+          {
+            id: "3",
+            name: '积极配合社区安全巡查员进行'
+          },
+          {
+            id: "4",
+            name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
+          },
+        ],//服务list
+        pickerOptions: { //控制时间范围
+          disabledDate (time) {
+            return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
+          }
+        },
+  
+        timeRange: [],
+        unitId: '',
+        formData: {
+          unitId: '',
+          title: '',
+          serviceMatter:"",
+          startTime: '',
+          endTime: '',
+          gridId: ''
+        },
+  
+  
+        tableData: [],
+  
+        //form相关
+        formShow: false,
+        formTitle: '新增活动',
+        detailShow: false,
+  
+        files: "",
+        fileName: "",
+        uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
+        searchdemandOptions:[]
+      }
+    },
+    components: {
+      activityRecords, eventDetails
+    },
+    async created () {
+  
+    },
+    async mounted () {
+      //获取服务事项
+      await this.getDemandOptions()
+  
+      const { user } = this.$store.state
+      this.agencyId = user.agencyId
+  
+      //获取建联单位
+      this.loadUnit()
+      this.loadGrid()
+      //获取网格下拉框数据
+      this.loadTable()
+  
+    },
+  
+    methods: {
+      handleCateCHange(val) {
+        if (val.length === 2) {
+          this.formData.serviceMatter = val[1];
+        } else {
+          this.formData.serviceMatter = val[0];
+        }
+      },
+      async getDemandOptions() {
+        this.$http
+          .post("/actual/base/serviceitem/listAllCategory")
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg);
+            } else {
+              this.searchdemandOptions = this.getTreeData(res.data);
+            }
+          })
+          .catch(() => {
+            return this.$message.error("网络错误");
+          });
+      },
+      getTreeData(data) {
+        if (!Array.isArray(data)) return [];
+        let arr = data.map((item) => {
+          let _item = {};
+          if (item.childCateList) {
+            if (item.childCateList.length === 0)
+              _item = { ...item, childCateList: undefined };
+            else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+          } else {
+            _item = { ...item };
+          }
+          return _item;
+        });
+        return arr;
+      },
+      handleSearch () {
+        this.loadTable()
+      },
+      async loadGrid () {
+        const url = "/gov/org/customergrid/gridoption"
+  
+        let params = {
+          agencyId: this.agencyId
+        }
+  
+        const { data, code, msg } = await requestPost(url, params)
+  
+        if (code === 0) {
+          this.gridList = data
+  
+        } else {
+          this.$message.error(msg)
+        }
+  
+      },
+  
+      async loadUnit () {
+        const url = "/actual/base/icpartyunit/option"
+        let params = {
+          agencyId: this.agencyId
+        }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.unitList = data
+        } else {
+          this.$message.error(msg)
+        }
+      },
+  
+      //获取服务事项下拉框
+      async loadService () {
+        const url = "/actual/base/serviceitem/dict-list"
+        let params = {
+          // parentCategoryCode: '1010'
+        }
+  
+        const { data, code, msg } = await requestPost(url, params)
+  
+        if (code === 0) {
+          this.serviceList = data
+  
+        } else {
+          this.$message.error(msg)
+        }
+  
+      },
+  
+      async loadTable () {
+        this.tableLoading = true
+  
+        const url = "/actual/base/icpartyactivity/search"
+        // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+        let params = {
+          agencyId: this.agencyId,
+          pageSize: this.pageSize,
+          pageNo: this.pageNo,
+          ...this.formData
+        }
+  
+        const { data, code, msg } = await requestPost(url, params)
+  
+        if (code === 0) {
+          this.total = data.total
+          this.tableData = data.list
+        } else {
+          this.$message.error(msg)
+        }
+        this.tableLoading = false
+      },
+  
+  
+  
+      diaClose () {
+  
+        this.$refs.ref_form.resetData()
+        this.formShow = false
+      },
+  
+      detailClosed () {
+        console.log(this.$refs.ref_detail)
+        this.$refs.ref_detail.diaDestroy()
+        this.detailShow = false
+      },
+  
+  
+      handleDetail (row) {
+        this.detailShow = true
+        this.formTitle = '详情'
+  
+        this.$nextTick(() => {
+          this.$refs.ref_detail.initForm(row)
+          // this.$refs.ref_form.initForm('detail', row.id)
+        })
+      },
+  
+      handleAdd () {
+        this.formTitle = '新增'
+  
+        this.formShow = true
+        this.$nextTick(() => {
+          this.$refs.ref_form.initForm('add', null)
+        })
+      },
+  
+      handleEdit (row) {
+        this.formTitle = '修改'
+        this.formShow = true
+        this.$nextTick(() => {
+          this.$refs.ref_form.initForm('edit', row.id)
+        })
+      },
+  
+      addFormCancle () {
+        this.formShow = false
+      },
+      addFormOk () {
+        this.formShow = false
+        this.loadTable()
+  
+      },
+  
+      async handleDelete (row) {
+  
+        this.$confirm("确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteActivity(row)
+          })
+          .catch(err => {
+            if (err == "cancel") {
+  
+            }
+  
+          });
+      },
+  
+      async deleteActivity (row) {
+        const url = "/actual/base/icpartyactivity/delete"
+        // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
+  
+        let params = {
+          id: row.id
+        }
+  
+        const { data, code, msg } = await requestPost(url, params)
+  
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "删除成功"
+          });
+  
+          this.loadTable()
+        } else {
+          this.$message.error(msg)
+        }
+      },
+  
+      //重置搜索条件
+      resetSearch () {
+        this.timeRange = []
+        this.formData = {
+          gridId: '',
+          unitName: '',
+          serviceMatter: '',
+          type: '',
+          contact: '',
+          contactMobile: ''
+        }
+        this.pageSize = 10
+        this.pageNo = 0
+        this.loadTable()
+      },
+  
+      //导出表格
+      async handleExport () {
+        let title = '联建活动列表'
+  
+        const url = "/heart/icpartyactivity/export"
+        let params = {
+          agencyId: this.agencyId,
+  
+          ...this.formData
+  
+        }
+  
+        app.ajax.exportFilePost(
+          url,
+          params,
+          (data, rspMsg) => {
+  
+            this.download(data, title + '.xls')
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg);
+          }
+        );
+  
+      },
+  
+      // 下载文件
+      download (data, fileName) {
+        if (!data) {
+          return
+        }
+  
+        var csvData = new Blob([data])
+  
+        if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+          window.navigator.msSaveOrOpenBlob(csvData, fileName);
+        }
+        // for Non-IE (chrome, firefox etc.)
+        else {
+          var a = document.createElement('a');
+          document.body.appendChild(a);
+          a.style = 'display: none';
+          var url = window.URL.createObjectURL(csvData);
+          a.href = url;
+          a.download = fileName;
+          a.click();
+          a.remove();
+          window.URL.revokeObjectURL(url);
+        }
+  
+      },
+  
+      // 上传文件之前的钩子
+      beforeUpload (file) {
+        this.files = file;
+  
+        const isText = file.type === 'application/vnd.ms-excel'
+        const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+  
+        if (!isText && !isTextComputer) {
+          this.$message.error('请选择正确格式的文件')
+          return false
+        } else {
+          this.fileName = file.name;
+          return true
+        }
+  
+      },
+      // 上传文件个数超过定义的数量
+      handleExceed (files, fileList) {
+        this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+      },
+  
+      async uploadFile () {
+        this.loading = true
+  
+        if (this.fileName == "") {
+          this.$message.warning('请选择要上传的文件！')
+          return false
+        }
+  
+        //清空上传列表
+        this.$refs['upload'].clearFiles()
+  
+        var url = '/heart/icpartyactivity/import'
+        let fileFormData = new FormData();
+        fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+  
+        const { data, code, msg } = await requestPost(url, fileFormData)
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "导入成功"
+          });
+  
+          this.loadTable()
+        } else {
+          this.$message.error(msg)
+        }
+  
+  
+      },
+  
+      handleTimeChange (time) {
+        if (time) {
+          const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+          const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+  
+          this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+          this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+  
+          // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+          // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+        } else {
+          this.formData.startTime = ''
+          this.formData.endTime = ''
+          // this.startTimeShow = ''
+          // this.endTimeShow = ''
+        }
+  
+      },
+  
+      handleSizeChange (val) {
+        this.pageSize = val
+        this.pageNo = 1
+        this.loadTable()
+      },
+      handleCurrentChange (val) {
+        this.pageNo = val
+        this.loadTable()
+      },
+  
+      // 开启加载动画
+      startLoading () {
+        loading = Loading.service({
+          lock: true, // 是否锁定
+          text: '正在加载……', // 加载中需要显示的文字
+          background: 'rgba(0,0,0,.7)' // 背景颜色
+        })
+      },
+      // 结束加载动画
+      endLoading () {
+        // clearTimeout(timer);
+        if (loading) {
+          loading.close()
+        }
+      }
+    },
+    computed: {
+      tableHeight () {
+  
+        return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
+  
+      },
+  
+      ...mapGetters(['clientHeight', 'iframeHeight'])
+    },
+    watch: {
+  
+    },
+    props: {
+  
+    }
+  }
+  </script>
+  <style lang="scss" scoped >
+  .g-main {
+    width: 100%;
+  }
+  
+  .m-search {
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 30px 20px 5px;
+    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  }
+  
+  .item_width_1 {
+    width: 260px;
+  }
+  .item_width_2 {
+    width: 495px;
+  }
+  
+  .m-table {
+    background: #ffffff;
+    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+    margin-top: 15px;
+    padding: 23px 30px 10px;
+  
+    .table {
+      margin-top: 20px;
+    }
+  }
+  
+  .div_btn {
+  }
+  
+  .el-row {
+    /* margin-bottom: 20px; */
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 10px;
+    margin-right: 50px;
+  }
+  </style>
+  
\ No newline at end of file

From be9c6c0cbe2e945468c9465bdaa3f1f5c322be10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Tue, 21 May 2024 17:59:26 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/activity/eventDetails.vue  |  40 +-
 .../modules/communityParty/activity/index.vue | 104 ++-
 .../modules/workSys/typeActivity/index.vue    | 635 ++++++++++++++++++
 3 files changed, 742 insertions(+), 37 deletions(-)
 create mode 100644 src/views/modules/workSys/typeActivity/index.vue

diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
index 501e8b2f7..dcd3675de 100644
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -51,7 +51,7 @@
                     <div class="m-info-prop">
                         <span class="u-info-title-2">线上报名: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <el-switch v-model="online"></el-switch>
+                        <el-switch v-model="online" :disabled="true"></el-switch>
                     </div>
 
                     <div style="display: flex;">
@@ -73,9 +73,12 @@
                         <span style="margin-right: 10px;">&nbsp;</span>
                         <span>活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容</span>
                     </div>
-                    <div class="m-info-prop">
-                        <span class="u-info-title-2">活动图片：</span>
-                        <span>{{ formData.memberCount || "--" }}</span>
+                    <div class="m-info-prop" style="display: flex; flex-wrap: wrap; align-items: flex-start;">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动图片：</span>
+                        <div v-for="(image, index) in imageArray" :key="index">
+                            <img style="width: 200px; height: 160px; margin-right: 30px;margin-bottom: 10px;"
+                                :src="image.url" alt="Image" />
+                        </div>
                     </div>
 
                     <div style="margin-top: 20px;">
@@ -127,8 +130,18 @@
                             <el-table-column prop="type" header-align="center" align="center" label="实况内容"
                                 min-width="280">
                             </el-table-column>
+                            <!-- <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                                label="活动照片" show-overflow-tooltip min-width="120">
+                            </el-table-column> -->
                             <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
                                 label="活动照片" show-overflow-tooltip min-width="120">
+                                <template slot-scope="scope">
+                                    <div v-for="(item, index) in scope.row.serviceMatterListShow" :key="index"
+                                        style="display: flex;">
+                                        <img :src="item.url"
+                                            style="max-width: 20px; max-height: 20px; margin-right: 10px;" />
+                                    </div>
+                                </template>
                             </el-table-column>
                         </el-table>
                     </div>
@@ -159,7 +172,24 @@ export default {
         return {
             formData: {},
             initLoading: false,
-            online:true,
+            online: true,
+            imageArray: [
+                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            ],
+            tableData: [
+                { unitName: '张三', agencyName: '123456789', type: '内容1', serviceMatterListShow: [  { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] },
+                { unitName: '李四', agencyName: '987654321', type: '内容2', serviceMatterListShow: [  { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] },
+
+            ],
         };
     },
     components: {},
diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index 27b96df16..3b60fa888 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -9,7 +9,6 @@
               <el-option v-for="item in unitList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
-
           </el-form-item>
 
           <el-form-item label="活动状态" prop="unitId">
@@ -17,8 +16,8 @@
               <el-option v-for="item in unitList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
-
           </el-form-item>
+
           <el-form-item label="活动名称" prop="title">
             <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入关键字">
             </el-input>
@@ -26,31 +25,44 @@
 
         </div>
         <div>
+
           <el-form-item label="活动时间" prop="startTime">
-            <el-date-picker v-model.trim="timeRange" size="small"  style="width: 260px;" type="daterange" value-format="yyyy-MM-dd HH:mm:ss"
-              @change="handleTimeChange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
+            <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
+              end-placeholder="结束时间">
             </el-date-picker>
           </el-form-item>
+
           <el-form-item label="活动地点" prop="title">
             <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入内容">
             </el-input>
-
           </el-form-item>
-          <el-form-item label="协办方" prop="title">
-            <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入关键字">
-            </el-input>
+
+          <el-form-item label="协办方" prop="xbf">
+            <el-select class="item_width_1" v-model.trim="formData.xbf" size="small" placeholder="请选择" clearable>
+              <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name">
+              </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>
-          <el-button style="margin-left:10px" class="diy-button--white" size="small" @click="resetSearch">重置</el-button>
+            <el-button style="margin-left:10px" class="diy-button--blue" size="small"
+              @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px" class="diy-button--white" size="small"
+              @click="resetSearch">重置</el-button>
           </div>
         </div>
       </el-form>
     </div>
     <div class="m-table">
       <div class="div_btn">
-        <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 发起活动</el-button>
-        <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 活动记录</el-button>
+        <div>
+          <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 发起活动</el-button>
+          <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 活动记录</el-button>
+        </div>
+
+        <el-button style="" class="diy-button--add" size="small">导出</el-button>
       </div>
 
       <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
@@ -102,7 +114,7 @@
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
       width="950px" top="5vh" class="dialog-h" @closed="diaClose">
-      <activity-records ref="ref_form" :unitList="unitList" :gridList="gridList" @dialogCancle="addFormCancle"
+      <activity-records ref="ref_form" :unitList="corganizerList" :gridList="gridList" @dialogCancle="addFormCancle"
         @dialogOk="addFormOk"></activity-records>
     </el-dialog>
 
@@ -119,7 +131,7 @@
   import activityRecords from './activityRecords'
   import eventDetails from './eventDetails'
   import util from '@js/util.js';
-  import { requestPost } from "@/js/dai/request";
+  import { requestPost,requestGet } from "@/js/dai/request";
   import { mapGetters } from 'vuex'
   import { Loading } from 'element-ui' // 引入Loading服务
   
@@ -135,6 +147,7 @@
         agencyId: '',
         gridList: [],//所属网格
         unitList: [],//单位list
+        corganizerList:[],//协办方list
         serviceList: [
           {
             id: "1",
@@ -163,6 +176,7 @@
         unitId: '',
         formData: {
           unitId: '',
+          xbf:'',
           title: '',
           serviceMatter:"",
           startTime: '',
@@ -181,7 +195,8 @@
         files: "",
         fileName: "",
         uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
-        searchdemandOptions:[]
+        searchdemandOptions:[],
+        detail:{}
       }
     },
     components: {
@@ -202,10 +217,32 @@
       this.loadGrid()
       //获取网格下拉框数据
       this.loadTable()
+
+      this.listServerOrg()
   
     },
   
     methods: {
+      async listServerOrg() {
+        const url = "/actual/base/serviceitem/listServerOrgNewTask";
+        let params = {  
+          // serviceTypeId: "1037",
+          // serverOrgType: "1044",
+          // businessType: "party_unit",
+          serverOrgCategoryCode: "",
+          serverOrgType: "party_unit",
+          serverParentOrgCategoryCode: ""
+        };
+
+        let { data, code, msg } = await requestPost(url, params);
+        if (code == 0) {
+          this.corganizerList = data;
+          console.log("datadata",this.corganizerList)
+        } else if (code >= 8000) {
+          this.$message.error(msg);
+        }
+      },
+
       handleCateCHange(val) {
         if (val.length === 2) {
           this.formData.serviceMatter = val[1];
@@ -293,21 +330,18 @@
         }
   
       },
-  
+      //展示表格
       async loadTable () {
         this.tableLoading = true
-  
         const url = "/actual/base/icpartyactivity/search"
-        // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+        // const url = "/actual/base/communityActivity/page"
         let params = {
           agencyId: this.agencyId,
           pageSize: this.pageSize,
           pageNo: this.pageNo,
           ...this.formData
         }
-  
         const { data, code, msg } = await requestPost(url, params)
-  
         if (code === 0) {
           this.total = data.total
           this.tableData = data.list
@@ -350,6 +384,14 @@
           this.$refs.ref_form.initForm('add', null)
         })
       },
+      // startProcess () {
+      //   this.formTitle = '新增'
+  
+      //   this.formShow = true
+      //   this.$nextTick(() => {
+      //     this.$refs.ref_form.initForm('add', null)
+      //   })
+      // },
   
       handleEdit (row) {
         this.formTitle = '修改'
@@ -534,14 +576,9 @@
   
           this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
           this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
-  
-          // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
-          // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
         } else {
           this.formData.startTime = ''
           this.formData.endTime = ''
-          // this.startTimeShow = ''
-          // this.endTimeShow = ''
         }
   
       },
@@ -593,36 +630,39 @@
   .g-main {
     width: 100%;
   }
-  
+
   .m-search {
     background: #ffffff;
     border-radius: 4px;
     padding: 30px 20px 5px;
     box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   }
-  
+
   .item_width_1 {
     width: 260px;
   }
+
   .item_width_2 {
     width: 495px;
   }
-  
+
   .m-table {
     background: #ffffff;
     box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
     border-radius: 4px;
     margin-top: 15px;
     padding: 23px 30px 10px;
-  
+
     .table {
       margin-top: 20px;
     }
   }
-  
+
   .div_btn {
+    display: flex;
+    justify-content: space-between;
   }
-  
+
   .el-row {
     /* margin-bottom: 20px; */
     display: flex;
@@ -630,5 +670,5 @@
     margin-top: 10px;
     margin-right: 50px;
   }
-  </style>
+</style>
   
\ No newline at end of file
diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue
new file mode 100644
index 000000000..1e0f6f6b2
--- /dev/null
+++ b/src/views/modules/workSys/typeActivity/index.vue
@@ -0,0 +1,635 @@
+<template>
+    <div class="g-main">
+        <div class="m-search">
+            <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+                <div>
+
+
+                    <el-form-item label="标签名称" prop="title">
+                        <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable
+                            placeholder="请输入">
+                        </el-input>
+                    </el-form-item>
+
+                    <el-form-item label="首页显示" prop="unitId">
+                        <el-select class="item_width_1" v-model.trim="formData.unitId" size="small" placeholder="请选择"
+                            clearable>
+                            <el-option v-for="item in unitList" :key="item.value" :label="item.name"
+                                :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>
+                        <el-button style="margin-left:10px" class="diy-button--white" size="small"
+                            @click="resetSearch">重置</el-button>
+                    </div>
+                </div>
+            </el-form>
+        </div>
+        <div class="m-table">
+            
+            <div class="div_btn">
+                <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+            </div>
+
+            <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
+                style="width: 100%">
+
+                <el-table-column label="序号" header-align="center" align="center" type="index"
+                    width="80"></el-table-column>
+                <el-table-column prop="unitName" header-align="center" align="center" label="类型名称" width="380">
+                </el-table-column>
+                
+                <el-table-column prop="peopleCount" 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">
+                    <template slot-scope="scope">
+
+                        <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
+                            @click="handleDetail(scope.row)">查看</el-button>
+                        <el-button v-if="agencyId===scope.row.agencyId&&!scope.row.actId" type="text"
+                            style="color:#00A7A9;text-decoration: underline;" size="small"
+                            @click="handleEdit(scope.row)">修改</el-button>
+
+                        <el-button v-if="agencyId===scope.row.agencyId" type="text"
+                            style="color:#D51010;text-decoration: underline;" size="small"
+                            @click="handleDelete(scope.row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div>
+                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
+                    layout="sizes, prev, pager, next, total" :total="total">
+                </el-pagination>
+            </div>
+        </div>
+
+        <!-- 修改弹出框 -->
+        <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
+            :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
+            <activity-records ref="ref_form" :unitList="corganizerList" :gridList="gridList"
+                @dialogCancle="addFormCancle" @dialogOk="addFormOk"></activity-records>
+        </el-dialog>
+
+        <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false"
+            :title="'活动详情'" width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
+            <event-details ref="ref_detail" :serviceList="serviceList" :gridList="gridList"
+                @diaDetailClose="detailClosed"></event-details>
+        </el-dialog>
+
+    </div>
+</template>
+    <script>
+
+    import activityRecords from '../../communityParty/activity/activityRecords'
+    import eventDetails from '../../communityParty/activity/eventDetails'
+    import util from '@js/util.js';
+    import { requestPost,requestGet } from "@/js/dai/request";
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    
+    let loading // 加载动画
+    export default {
+      data () {
+        return {
+          loading: false,
+          total: 0,
+          pageSize: 10,
+          pageNo: 0,
+          tableLoading: false,
+          agencyId: '',
+          gridList: [],//所属网格
+          unitList: [{value:'是',name:'是',id:'1'},{value:'否',name:'否',id:'2'}],//单位list
+          corganizerList:[],//协办方list
+          serviceList: [
+            {
+              id: "1",
+              name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
+            },
+            {
+              id: "2",
+              name: '积极配合'
+            },
+            {
+              id: "3",
+              name: '积极配合社区安全巡查员进行'
+            },
+            {
+              id: "4",
+              name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
+            },
+          ],//服务list
+          pickerOptions: { //控制时间范围
+            disabledDate (time) {
+              return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
+            }
+          },
+    
+          timeRange: [],
+          unitId: '',
+          formData: {
+            unitId: '',
+            xbf:'',
+            title: '',
+            serviceMatter:"",
+            startTime: '',
+            endTime: '',
+            gridId: ''
+          },
+    
+    
+          tableData: [],
+    
+          //form相关
+          formShow: false,
+          formTitle: '新增活动',
+          detailShow: false,
+    
+          files: "",
+          fileName: "",
+          uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
+          searchdemandOptions:[],
+          detail:{}
+        }
+      },
+      components: {
+        activityRecords, eventDetails
+      },
+      async created () {
+    
+      },
+      async mounted () {
+        //获取服务事项
+        await this.getDemandOptions()
+    
+        const { user } = this.$store.state
+        this.agencyId = user.agencyId
+    
+        //获取建联单位
+        // this.loadUnit()
+        this.loadGrid()
+        //获取网格下拉框数据
+        this.loadTable()
+  
+        this.listServerOrg()
+    
+      },
+    
+      methods: {
+        async listServerOrg() {
+          const url = "/actual/base/serviceitem/listServerOrgNewTask";
+          let params = {  
+            // serviceTypeId: "1037",
+            // serverOrgType: "1044",
+            // businessType: "party_unit",
+            serverOrgCategoryCode: "",
+            serverOrgType: "party_unit",
+            serverParentOrgCategoryCode: ""
+          };
+  
+          let { data, code, msg } = await requestPost(url, params);
+          if (code == 0) {
+            this.corganizerList = data;
+            console.log("datadata",this.corganizerList)
+          } else if (code >= 8000) {
+            this.$message.error(msg);
+          }
+        },
+  
+        handleCateCHange(val) {
+          if (val.length === 2) {
+            this.formData.serviceMatter = val[1];
+          } else {
+            this.formData.serviceMatter = val[0];
+          }
+        },
+        async getDemandOptions() {
+          this.$http
+            .post("/actual/base/serviceitem/listAllCategory")
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              } else {
+                this.searchdemandOptions = this.getTreeData(res.data);
+              }
+            })
+            .catch(() => {
+              return this.$message.error("网络错误");
+            });
+        },
+        getTreeData(data) {
+          if (!Array.isArray(data)) return [];
+          let arr = data.map((item) => {
+            let _item = {};
+            if (item.childCateList) {
+              if (item.childCateList.length === 0)
+                _item = { ...item, childCateList: undefined };
+              else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+            } else {
+              _item = { ...item };
+            }
+            return _item;
+          });
+          return arr;
+        },
+        handleSearch () {
+          this.loadTable()
+        },
+        async loadGrid () {
+          const url = "/gov/org/customergrid/gridoption"
+    
+          let params = {
+            agencyId: this.agencyId
+          }
+    
+          const { data, code, msg } = await requestPost(url, params)
+    
+          if (code === 0) {
+            this.gridList = data
+    
+          } else {
+            this.$message.error(msg)
+          }
+    
+        },
+    
+        // async loadUnit () {
+        //   const url = "/actual/base/icpartyunit/option"
+        //   let params = {
+        //     agencyId: this.agencyId
+        //   }
+        //   const { data, code, msg } = await requestPost(url, params)
+        //   if (code === 0) {
+        //     this.unitList = data
+        //   } else {
+        //     this.$message.error(msg)
+        //   }
+        // },
+    
+        //获取服务事项下拉框
+        async loadService () {
+          const url = "/actual/base/serviceitem/dict-list"
+          let params = {
+            // parentCategoryCode: '1010'
+          }
+    
+          const { data, code, msg } = await requestPost(url, params)
+    
+          if (code === 0) {
+            this.serviceList = data
+    
+          } else {
+            this.$message.error(msg)
+          }
+    
+        },
+        //展示表格
+        async loadTable () {
+          this.tableLoading = true
+          const url = "/actual/base/icpartyactivity/search"
+          // const url = "/actual/base/communityActivity/page"
+          let params = {
+            agencyId: this.agencyId,
+            pageSize: this.pageSize,
+            pageNo: this.pageNo,
+            ...this.formData
+          }
+          const { data, code, msg } = await requestPost(url, params)
+          if (code === 0) {
+            this.total = data.total
+            this.tableData = data.list
+          } else {
+            this.$message.error(msg)
+          }
+          this.tableLoading = false
+        },
+    
+    
+    
+        diaClose () {
+    
+          this.$refs.ref_form.resetData()
+          this.formShow = false
+        },
+    
+        detailClosed () {
+          console.log(this.$refs.ref_detail)
+          this.$refs.ref_detail.diaDestroy()
+          this.detailShow = false
+        },
+    
+    
+        handleDetail (row) {
+          this.detailShow = true
+          this.formTitle = '详情'
+    
+          this.$nextTick(() => {
+            this.$refs.ref_detail.initForm(row)
+            // this.$refs.ref_form.initForm('detail', row.id)
+          })
+        },
+    
+        handleAdd () {
+          this.formTitle = '新增'
+    
+          this.formShow = true
+          this.$nextTick(() => {
+            this.$refs.ref_form.initForm('add', null)
+          })
+        },
+        // startProcess () {
+        //   this.formTitle = '新增'
+    
+        //   this.formShow = true
+        //   this.$nextTick(() => {
+        //     this.$refs.ref_form.initForm('add', null)
+        //   })
+        // },
+    
+        handleEdit (row) {
+          this.formTitle = '修改'
+          this.formShow = true
+          this.$nextTick(() => {
+            this.$refs.ref_form.initForm('edit', row.id)
+          })
+        },
+    
+        addFormCancle () {
+          this.formShow = false
+        },
+        addFormOk () {
+          this.formShow = false
+          this.loadTable()
+    
+        },
+    
+        async handleDelete (row) {
+    
+          this.$confirm("确认删除?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              this.deleteActivity(row)
+            })
+            .catch(err => {
+              if (err == "cancel") {
+    
+              }
+    
+            });
+        },
+    
+        async deleteActivity (row) {
+          const url = "/actual/base/icpartyactivity/delete"
+          // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
+    
+          let params = {
+            id: row.id
+          }
+    
+          const { data, code, msg } = await requestPost(url, params)
+    
+          if (code === 0) {
+            this.$message({
+              type: "success",
+              message: "删除成功"
+            });
+    
+            this.loadTable()
+          } else {
+            this.$message.error(msg)
+          }
+        },
+    
+        //重置搜索条件
+        resetSearch () {
+          this.timeRange = []
+          this.formData = {
+            gridId: '',
+            unitName: '',
+            serviceMatter: '',
+            type: '',
+            contact: '',
+            contactMobile: ''
+          }
+          this.pageSize = 10
+          this.pageNo = 0
+          this.loadTable()
+        },
+    
+        //导出表格
+        async handleExport () {
+          let title = '联建活动列表'
+    
+          const url = "/heart/icpartyactivity/export"
+          let params = {
+            agencyId: this.agencyId,
+    
+            ...this.formData
+    
+          }
+    
+          app.ajax.exportFilePost(
+            url,
+            params,
+            (data, rspMsg) => {
+    
+              this.download(data, title + '.xls')
+            },
+            (rspMsg, data) => {
+              this.$message.error(rspMsg);
+            }
+          );
+    
+        },
+    
+        // 下载文件
+        download (data, fileName) {
+          if (!data) {
+            return
+          }
+    
+          var csvData = new Blob([data])
+    
+          if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+            window.navigator.msSaveOrOpenBlob(csvData, fileName);
+          }
+          // for Non-IE (chrome, firefox etc.)
+          else {
+            var a = document.createElement('a');
+            document.body.appendChild(a);
+            a.style = 'display: none';
+            var url = window.URL.createObjectURL(csvData);
+            a.href = url;
+            a.download = fileName;
+            a.click();
+            a.remove();
+            window.URL.revokeObjectURL(url);
+          }
+    
+        },
+    
+        // 上传文件之前的钩子
+        beforeUpload (file) {
+          this.files = file;
+    
+          const isText = file.type === 'application/vnd.ms-excel'
+          const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    
+          if (!isText && !isTextComputer) {
+            this.$message.error('请选择正确格式的文件')
+            return false
+          } else {
+            this.fileName = file.name;
+            return true
+          }
+    
+        },
+        // 上传文件个数超过定义的数量
+        handleExceed (files, fileList) {
+          this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+        },
+    
+        async uploadFile () {
+          this.loading = true
+    
+          if (this.fileName == "") {
+            this.$message.warning('请选择要上传的文件！')
+            return false
+          }
+    
+          //清空上传列表
+          this.$refs['upload'].clearFiles()
+    
+          var url = '/heart/icpartyactivity/import'
+          let fileFormData = new FormData();
+          fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+    
+          const { data, code, msg } = await requestPost(url, fileFormData)
+          if (code === 0) {
+            this.$message({
+              type: "success",
+              message: "导入成功"
+            });
+    
+            this.loadTable()
+          } else {
+            this.$message.error(msg)
+          }
+    
+    
+        },
+    
+        handleTimeChange (time) {
+          if (time) {
+            const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+            const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+    
+            this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+            this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+          } else {
+            this.formData.startTime = ''
+            this.formData.endTime = ''
+          }
+    
+        },
+    
+        handleSizeChange (val) {
+          this.pageSize = val
+          this.pageNo = 1
+          this.loadTable()
+        },
+        handleCurrentChange (val) {
+          this.pageNo = val
+          this.loadTable()
+        },
+    
+        // 开启加载动画
+        startLoading () {
+          loading = Loading.service({
+            lock: true, // 是否锁定
+            text: '正在加载……', // 加载中需要显示的文字
+            background: 'rgba(0,0,0,.7)' // 背景颜色
+          })
+        },
+        // 结束加载动画
+        endLoading () {
+          // clearTimeout(timer);
+          if (loading) {
+            loading.close()
+          }
+        }
+      },
+      computed: {
+        tableHeight () {
+    
+          return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
+    
+        },
+    
+        ...mapGetters(['clientHeight', 'iframeHeight'])
+      },
+      watch: {
+    
+      },
+      props: {
+    
+      }
+    }
+    </script>
+    <style lang="scss" scoped >
+    .g-main {
+      width: 100%;
+    }
+  
+    .m-search {
+      background: #ffffff;
+      border-radius: 4px;
+      padding: 30px 20px 5px;
+      box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+    }
+  
+    .item_width_1 {
+      width: 260px;
+    }
+  
+    .item_width_2 {
+      width: 495px;
+    }
+  
+    .m-table {
+      background: #ffffff;
+      box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+      border-radius: 4px;
+      margin-top: 15px;
+      padding: 23px 30px 10px;
+  
+      .table {
+        margin-top: 20px;
+      }
+    }
+  
+    .div_btn {
+      display: flex;
+      justify-content: space-between;
+    }
+  
+    .el-row {
+      /* margin-bottom: 20px; */
+      display: flex;
+      flex-wrap: wrap;
+      margin-top: 10px;
+      margin-right: 50px;
+    }
+  </style>
+    
\ No newline at end of file

From ef4b9081ffd9ebd499a7adec405fc3ce3991f2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Thu, 23 May 2024 09:49:42 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/activity/index.vue |  24 ++-
 .../modules/workSys/typeActivity/index.vue    |  22 +-
 .../workSys/typeActivity/typeActivityadd.vue  | 195 ++++++++++++++++++
 3 files changed, 223 insertions(+), 18 deletions(-)
 create mode 100644 src/views/modules/workSys/typeActivity/typeActivityadd.vue

diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index 3b60fa888..3a5488b46 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -219,6 +219,7 @@
       this.loadTable()
 
       this.listServerOrg()
+      this.communityPublicity()
   
     },
   
@@ -237,12 +238,33 @@
         let { data, code, msg } = await requestPost(url, params);
         if (code == 0) {
           this.corganizerList = data;
-          console.log("datadata",this.corganizerList)
+          // console.log("datadata",this.corganizerList)
         } else if (code >= 8000) {
           this.$message.error(msg);
         }
       },
 
+      async communityPublicity() {
+        const url = "/actual/base/communityPublicity/page";
+        let params = {  
+          "pageSize": 20,
+          "pageNo": 1,
+          // "title": "",
+          // "tagId": "",
+          // "startTime": "",
+          // "endTime": ""
+        };
+
+        let { data, code, msg } = await requestGet(url, params);
+        console.log("datadatadata",data)
+        // if (code == 0) {
+        //   this.corganizerList = data;
+        //   console.log("datadata",this.corganizerList)
+        // } else if (code >= 8000) {
+        //   this.$message.error(msg);
+        // }
+      },
+
       handleCateCHange(val) {
         if (val.length === 2) {
           this.formData.serviceMatter = val[1];
diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue
index 1e0f6f6b2..c8e4fc6d4 100644
--- a/src/views/modules/workSys/typeActivity/index.vue
+++ b/src/views/modules/workSys/typeActivity/index.vue
@@ -75,8 +75,8 @@
         <!-- 修改弹出框 -->
         <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
             :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
-            <activity-records ref="ref_form" :unitList="corganizerList" :gridList="gridList"
-                @dialogCancle="addFormCancle" @dialogOk="addFormOk"></activity-records>
+            <type-activityadd ref="ref_form" :unitList="corganizerList" :gridList="gridList"
+                @dialogCancle="addFormCancle" @dialogOk="addFormOk"></type-activityadd>
         </el-dialog>
 
         <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false"
@@ -87,9 +87,10 @@
 
     </div>
 </template>
+
     <script>
 
-    import activityRecords from '../../communityParty/activity/activityRecords'
+    import typeActivityadd from './typeActivityadd'
     import eventDetails from '../../communityParty/activity/eventDetails'
     import util from '@js/util.js';
     import { requestPost,requestGet } from "@/js/dai/request";
@@ -161,7 +162,7 @@
         }
       },
       components: {
-        activityRecords, eventDetails
+        typeActivityadd, eventDetails
       },
       async created () {
     
@@ -261,19 +262,6 @@
     
         },
     
-        // async loadUnit () {
-        //   const url = "/actual/base/icpartyunit/option"
-        //   let params = {
-        //     agencyId: this.agencyId
-        //   }
-        //   const { data, code, msg } = await requestPost(url, params)
-        //   if (code === 0) {
-        //     this.unitList = data
-        //   } else {
-        //     this.$message.error(msg)
-        //   }
-        // },
-    
         //获取服务事项下拉框
         async loadService () {
           const url = "/actual/base/serviceitem/dict-list"
diff --git a/src/views/modules/workSys/typeActivity/typeActivityadd.vue b/src/views/modules/workSys/typeActivity/typeActivityadd.vue
new file mode 100644
index 000000000..a17607484
--- /dev/null
+++ b/src/views/modules/workSys/typeActivity/typeActivityadd.vue
@@ -0,0 +1,195 @@
+<template>
+    <div>
+  
+      <div class="dialog-h-content scroll-h">
+        <el-form ref="ref_form" :inline="true"  :rules="dataRule" :disabled="formType === 'detail'"
+          class="form">
+
+          <el-form-item label="活动地点" prop="longitude" label-width="150px" style="display: block">
+            <div style="width: 500px">
+              <el-input v-model.trim="searchValue" size="small" class="item_width_1" clearable placeholder="请输入">
+                </el-input>
+            </div>
+          </el-form-item>
+  
+        </el-form>
+      </div>
+  
+      <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">确
+          定</el-button> -->
+
+          <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable">确
+          定</el-button>
+      </div>
+    </div>
+  </template>
+    
+    <script>
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost } from '@/js/dai/request'
+    import Tinymce from '@c/tinymce2/index.vue'
+    import daiMap from "@/utils/dai-map";
+    // import UploadImage from './upload-image.vue'
+    import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+    
+    var map
+    var search
+    var markers
+    var infoWindowList
+    var geocoder // 新建一个正逆地址解析类
+    
+    let loading // 加载动画
+    export default {
+      data () {
+        return {
+          searchValue: ''
+    
+        }
+      },
+      components: { Tinymce,UploadImage },
+      mounted () {
+        // this.initMap()
+    
+      },
+    
+      methods: { 
+        async handleComfirm () {
+          this.btnDisable = true
+          setTimeout(() => {
+            this.btnDisable = false
+          }, 10000)
+          this.$refs['ref_form'].validate((valid, messageObj) => {
+            if (!valid) {
+              app.util.validateRule(messageObj)
+              this.btnDisable = false
+            } else {
+              this.addActivity()
+            }
+    
+          })
+    
+        },
+        async addActivity () {
+          let url = '/actual/base/icpartyactivity/save'
+          // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
+    
+    
+          const { data, code, msg } = await requestPost(url, this.formData)
+    
+          if (code === 0) {
+            this.$message({
+              type: 'success',
+              message: '操作成功'
+            })
+            this.resetData()
+            this.$emit('dialogOk')
+            this.btnDisable = false
+          } else {
+            this.btnDisable = false
+            this.$message.error(msg)
+          }
+    
+        },
+    
+        handleCancle () {
+    
+          this.resetData()
+          this.$emit('dialogCancle')
+    
+        },
+    
+        resetData () {
+          this.formData = {
+            gridId: '',
+          }
+    
+        },
+        // 开启加载动画
+        startLoading () {
+          loading = Loading.service({
+            lock: true, // 是否锁定
+            text: '正在加载……', // 加载中需要显示的文字
+            background: 'rgba(0,0,0,.7)' // 背景颜色
+          })
+        },
+        // 结束加载动画
+        endLoading () {
+          // clearTimeout(timer);
+          if (loading) {
+            loading.close()
+          }
+        }
+      },
+      computed: {
+        dataRule () {
+          return {
+            longitude: [
+              { required: true, message: '活动地点不能为空', trigger: 'blur' }
+            ]
+          }
+        },
+    
+      },
+      props: {
+    
+        unitList: {
+          type: Array,
+          default: []
+        },
+        gridList: {
+          type: Array,
+          default: []
+        },
+    
+    
+      }
+    }
+    </script>
+    
+    
+    <style lang="scss" scoped >
+    @import "@/assets/scss/modules/visual/communityManageForm.scss";
+    </style>
+    <style  lang="scss" scoped>
+    .item_width_1 {
+      width: 560px;
+    
+      /deep/.tox .tox-dialog {
+        z-index: 20000;
+      }
+    }
+    .tinymce_view {
+      ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+      }
+    }
+    
+    .div_map {
+      position: relative;
+    }
+    .div_searchmap {
+      z-index: 5000;
+      position: absolute;
+      top: 5px;
+      left: 5px;
+    }
+    
+    .tinymce_view {
+      height: 400px;
+      overflow: auto;
+    }
+    .text_p {
+      margin: 0;
+      padding: 0 10px;
+      border: 1px solid #d9d9d9;
+      border-radius: 5px;
+      > p {
+        margin: 0;
+      }
+    }
+    </style>
+    
+    
\ No newline at end of file

From 67b647e45fc70fd70125c0fc2c10cc2fb765928c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Thu, 23 May 2024 18:06:14 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/activityRecords.vue              | 127 ++--
 .../communityParty/activity/eventDetails.vue  |  94 +--
 .../modules/communityParty/activity/index.vue | 208 +++---
 .../activity/initiateActivity.vue             | 664 ++++++++++++++++++
 4 files changed, 889 insertions(+), 204 deletions(-)
 create mode 100644 src/views/modules/communityParty/activity/initiateActivity.vue

diff --git a/src/views/modules/communityParty/activity/activityRecords.vue b/src/views/modules/communityParty/activity/activityRecords.vue
index 50f528da9..b4cb9be7b 100644
--- a/src/views/modules/communityParty/activity/activityRecords.vue
+++ b/src/views/modules/communityParty/activity/activityRecords.vue
@@ -6,18 +6,22 @@
         class="form">
         <el-form-item label="活动类型" label-width="150px" prop="gridId">
           <el-select class="item_width_1" v-model.trim="formData.gridId" placeholder="请选择" clearable>
-            <el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value">
+            <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.typeName">
             </el-option>
           </el-select>
-
         </el-form-item>
 
         <el-form-item label="活动名称" prop="serviceMatterList" label-width="150px">
-          <el-cascader v-model.trim="formData.serviceMatterList" :options="demandOptions"
-            :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}"
-            clearable collapse-tags size="small" class="u-item-width-normal"></el-cascader>
+          <el-input v-model.trim="formData.serviceMatterList" size="small" clearable placeholder="请输入活动名称"
+            class="u-item-width-normal"></el-input>
         </el-form-item>
 
+        <!-- <el-form-item label="活动名称" prop="activityName">
+          <el-input v-model.trim="formData.activityName" size="small" class="item_width_1" clearable
+            placeholder="请输入关键字">
+          </el-input>
+        </el-form-item> -->
+
         <el-form-item label="活动时间" prop="startTime">
           <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
             value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
@@ -25,11 +29,18 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="协办方" prop="serviceMatterList" label-width="150px">
-          <el-cascader v-model.trim="formData.serviceMatterList" :options="demandOptions"
+        <!-- <el-form-item label="协办方" prop="serviceMatterList" label-width="150px">
+          <el-cascader v-model.trim="formData.assistingParty" :options="demandOptions"
             :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}"
             clearable collapse-tags size="small" class="u-item-width-normal"></el-cascader>
-        </el-form-item>
+        </el-form-item> -->
+
+        <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+            <el-select class="item_width_1" v-model.trim="formData.assistingParty" size="small" placeholder="请选择" clearable>
+              <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name">
+              </el-option>
+            </el-select>
+          </el-form-item>
 
         <el-form-item label="活动封面图" label-width="140px">
           <template>
@@ -66,46 +77,46 @@
 
         <div v-if="!online">
           <el-form-item label="活动总结" prop="result" label-width="150px" style="display: block">
-          <div class="item_width_1">
-            <Tinymce class="tinymce_view " v-if="formType!='detail'" v-model.trim="formData.result" :height="250"
-              placeholder="在这里输入文字" />
+            <div class="item_width_1">
+              <Tinymce class="tinymce_view " v-if="formType!='detail'" v-model.trim="formData.result" :height="250"
+                placeholder="在这里输入文字" />
 
-            <p v-else class="text_p" v-html="formData.result"></p>
-          </div>
-        </el-form-item>
+              <p v-else class="text_p" v-html="formData.result"></p>
+            </div>
+          </el-form-item>
 
-        <el-form-item label="活动照片" label-width="140px">
-          <template>
-            <upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"></upload-image>
-          </template>
-        </el-form-item>
+          <el-form-item label="活动照片" label-width="140px">
+            <template>
+              <upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"></upload-image>
+            </template>
+          </el-form-item>
         </div>
 
-        <div  v-if="online">
+        <div v-if="online">
           <el-form-item label="报名截止时间" label-width="140px">
-          <el-date-picker v-model.trim="formData.endDate" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
-            placeholder="选择报名截止时间" style="width:280px">
-          </el-date-picker>
-        </el-form-item>
+            <el-date-picker v-model.trim="formData.endDate" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+              placeholder="选择报名截止时间" style="width:280px">
+            </el-date-picker>
+          </el-form-item>
 
-        <el-form-item label="活动积分" label-width="140px">
-          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
-        </el-form-item>
+          <el-form-item label="活动积分" label-width="140px">
+            <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+          </el-form-item>
 
-        <el-form-item label="活动人数" label-width="140px">
-          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
-        </el-form-item>
+          <el-form-item label="活动人数" label-width="140px">
+            <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+          </el-form-item>
 
-        <el-form-item label="消息推送数" label-width="140px">
-          <el-checkbox-group v-model="formData.serviceMatterList" >
-            <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
+          <el-form-item label="消息推送数" label-width="140px">
+            <el-checkbox-group v-model="formData.serviceMatterList">
+              <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
         </div>
 
-        
 
-       
+
+
 
       </el-form>
     </div>
@@ -178,17 +189,53 @@
         // gridList: [],
         agencyId: '',
         
-        demandOptions:[]
+        demandOptions:[],
+        typeList:[],
+        corganizerList:[]
   
       }
     },
     components: { Tinymce,UploadImage },
     mounted () {
-      // this.initMap()
+      this.activityType()
+      this.listServerOrg()
   
     },
   
     methods: {
+      async listServerOrg() {
+        const url = "/actual/base/serviceitem/listServerOrgNewTask";
+        let params = {  
+          serverOrgCategoryCode: "",
+          serverOrgType: "party_unit",
+          serverParentOrgCategoryCode: ""
+        };
+
+        let { data, code, msg } = await requestPost(url, params);
+        if (code == 0) {
+          this.corganizerList = data;
+          // console.log("datadata",this.corganizerList)
+        } else if (code >= 8000) {
+          this.$message.error(msg);
+        }
+      },
+      async activityType () {
+        const url = "/actual/base/activityType/page"
+        let params = {
+          // agencyId: this.agencyId
+          pageSize: 20,
+          pageNo: 1,
+          typeName: "",
+          enabled: 0
+        }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.typeList = data.list
+        } else {
+          this.$message.error(msg)
+        }
+      },
+
       handleOnlineRegistration(value) {
         console.log(value)
         if (value) {
@@ -527,7 +574,7 @@
       dataRule () {
         return {
           serviceMatterList: [
-            { required: true, message: '服务事项不能为空', trigger: 'blur' }
+            { required: true, message: '活动名称不能为空', trigger: 'blur' }
           ],
           unitIdList: [
             { required: true, message: '单位名称不能为空', trigger: 'blur' },
diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
index dcd3675de..5fe539a90 100644
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -8,12 +8,12 @@
                         <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>绿色环保-垃圾分类</span>
+                            <span>{{ formData.unitName || "--" }}</span>
                         </div>
                         <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>要想环境好，垃圾要分类</span>
+                            <span>{{ formData.activityName || "--" }}</span>
                         </div>
                     </div>
 
@@ -21,12 +21,12 @@
                         <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>2024-03-12 09:00至2024-03-12 12:00</span>
+                            <span>{{ formData.startTime || "--" }}至<span>{{ formData.endTime || "--" }}</span></span>
                         </div>
                         <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.unitName || "--" }}</span>
+                            <span>{{ formData.assistingParty || "--" }}</span>
                         </div>
                     </div>
 
@@ -34,7 +34,7 @@
                     <div class="m-info-prop">
                         <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动内容: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容</span>
+                        <span>{{ formData.content || "--" }}</span>
                     </div>
 
                     <div class="m-info-prop">
@@ -51,7 +51,7 @@
                     <div class="m-info-prop">
                         <span class="u-info-title-2">线上报名: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <el-switch v-model="online" :disabled="true"></el-switch>
+                        <el-switch :value="formData.online === 1 ? true : false" :disabled="true"></el-switch>
                     </div>
 
                     <div style="display: flex;">
@@ -71,11 +71,11 @@
                     <div class="m-info-prop">
                         <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动总结：</span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容</span>
+                        <span>{{ formData.sumUp || "--" }}</span>
                     </div>
                     <div class="m-info-prop" style="display: flex; flex-wrap: wrap; align-items: flex-start;">
                         <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动图片：</span>
-                        <div v-for="(image, index) in imageArray" :key="index">
+                        <div v-for="(image, index) in formData.activityImgs" :key="index">
                             <img style="width: 200px; height: 160px; margin-right: 30px;margin-bottom: 10px;"
                                 :src="image.url" alt="Image" />
                         </div>
@@ -85,8 +85,7 @@
                         <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
                             报名名单
                         </div>
-                        <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
-                            style="width: 100%">
+                        <el-table class="table" border style="width: 100%">
                             <el-table-column label="序号" header-align="center" align="center" type="index"
                                 width="50"></el-table-column>
 
@@ -116,8 +115,7 @@
                         <div style="font-size: 15px; color: black; margin-left: -30px; margin-bottom: 10px;">
                             活动实况
                         </div>
-                        <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
-                            style="width: 100%">
+                        <el-table class="table" border style="width: 100%">
                             <el-table-column label="序号" header-align="center" align="center" type="index"
                                 width="50"></el-table-column>
 
@@ -172,24 +170,23 @@ export default {
         return {
             formData: {},
             initLoading: false,
-            online: true,
-            imageArray: [
-                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            ],
-            tableData: [
-                { unitName: '张三', agencyName: '123456789', type: '内容1', serviceMatterListShow: [  { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] },
-                { unitName: '李四', agencyName: '987654321', type: '内容2', serviceMatterListShow: [  { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-                { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] },
+            // imageArray: [
+            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            // ],
+            // tableData: [
+            //     { unitName: '张三', agencyName: '123456789', type: '内容1', serviceMatterListShow: [  { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] },
+            //     { unitName: '李四', agencyName: '987654321', type: '内容2', serviceMatterListShow: [  { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
+            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] },
 
-            ],
+            // ],
         };
     },
     components: {},
@@ -211,8 +208,7 @@ export default {
             this.startLoading();
             this.formData = JSON.parse(JSON.stringify(row));
             this.initLoading = true;
-            console.log(this.formData);
-            // await nextTick(200)
+            console.log('this.formData,',this.formData);
 
             let { latitude, longitude } = this.$store.state.user;
             console.log("lat" + latitude + ",lon" + longitude);
@@ -224,38 +220,18 @@ export default {
                 latitude = 39.9088810666821;
                 longitude = 116.39743841556731;
             }
-            this.$nextTick(() => {
-                if (!map) {
-                    this.initMap(latitude, longitude);
-                } else {
-                    map.setCenter(latitude, longitude);
-                    map.setMarker(latitude, longitude);
-                }
-            });
+            // this.$nextTick(() => {
+            //     if (!map) {
+            //         // this.initMap(latitude, longitude);
+            //     } else {
+            //         // map.setCenter(latitude, longitude);
+            //         // map.setMarker(latitude, longitude);
+            //     }
+            // });
 
             this.endLoading();
         },
 
-        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-        initMap(latitude, longitude) {
-            map = new daiMap(
-                document.getElementById("app_detail_unit"),
-                { latitude, longitude },
-                {
-                    zoom: 16.2, // 设置地图缩放级别
-                    pitch: 43.5, // 设置俯仰角
-                    rotation: 45, // 设置地图旋转角度
-                }
-            );
-
-            // // 监听地图平移结束
-            // map.on("dragend", (e) => {
-            //   this.handleMoveCenter(e);
-            // });
-
-            map.setCenter(latitude, longitude);
-            map.setMarker(latitude, longitude);
-        },
         // 开启加载动画
         startLoading() {
             loading = Loading.service({
diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index 3a5488b46..2ff14ab1b 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -6,7 +6,7 @@
 
           <el-form-item label="活动类型" prop="unitId">
             <el-select class="item_width_1" v-model.trim="formData.unitId" size="small" placeholder="全部" clearable>
-              <el-option v-for="item in unitList" :key="item.value" :label="item.label" :value="item.value">
+              <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.typeName">
               </el-option>
             </el-select>
           </el-form-item>
@@ -18,28 +18,28 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="活动名称" prop="title">
-            <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入关键字">
+          <el-form-item label="活动名称" prop="activityName">
+            <el-input v-model.trim="formData.activityName" size="small" class="item_width_1" clearable placeholder="请输入关键字">
             </el-input>
           </el-form-item>
 
         </div>
         <div>
 
-          <el-form-item label="活动时间" prop="startTime">
+          <el-form-item label="活动时间" prop="timeRange">
             <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
               value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
               end-placeholder="结束时间">
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="活动地点" prop="title">
-            <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入内容">
+          <el-form-item label="活动地点" prop="address">
+            <el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable placeholder="请输入内容">
             </el-input>
           </el-form-item>
 
-          <el-form-item label="协办方" prop="xbf">
-            <el-select class="item_width_1" v-model.trim="formData.xbf" size="small" placeholder="请选择" clearable>
+          <el-form-item label="协办方" prop="assistingParty">
+            <el-select class="item_width_1" v-model.trim="formData.assistingParty" size="small" placeholder="请选择" clearable>
               <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name">
               </el-option>
             </el-select>
@@ -58,7 +58,7 @@
     <div class="m-table">
       <div class="div_btn">
         <div>
-          <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 发起活动</el-button>
+          <el-button style="" class="diy-button--add" size="small" @click="handleInitAdd">+ 发起活动</el-button>
           <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 活动记录</el-button>
         </div>
 
@@ -69,23 +69,23 @@
         style="width: 100%">
 
         <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-        <el-table-column prop="unitName" header-align="center" align="center" label="活动类型" width="180">
+        <el-table-column prop="activityName" header-align="center" align="center" label="活动类型" width="180">
         </el-table-column>
-        <el-table-column prop="gridName" header-align="center" align="center" label="活动名称" width="180">
+        <el-table-column prop="activityName" header-align="center" align="center" label="活动名称" width="180">
         </el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="活动开始时间" min-width="180">
+        <el-table-column prop="startTime" header-align="center" align="center" label="活动开始时间" min-width="180">
         </el-table-column>
         <el-table-column prop="address" header-align="center" align="center" label="活动地点" min-width="230">
         </el-table-column>
 
-        <el-table-column prop="peopleCount" header-align="center" align="center" label="协办方" width="100">
+        <el-table-column prop="assistingParty" header-align="center" align="center" label="协办方" width="100">
         </el-table-column>
         <el-table-column prop="activityTime" header-align="center" align="center" label="活动状态" width="230">
         </el-table-column>
-        <el-table-column prop="activityTime" header-align="center" align="center" label="线上报名" width="100">
+        <el-table-column prop="online" header-align="center" align="center" label="线上报名" width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.actId">小程序</span>
-            <span v-else>管理平台</span>
+            <span v-if="scope.row.online === 1">是</span>
+            <span v-else>否</span>
           </template>
         </el-table-column>
 
@@ -118,9 +118,16 @@
         @dialogOk="addFormOk"></activity-records>
     </el-dialog>
 
+    <el-dialog :visible.sync="initShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+      width="950px" top="5vh" class="dialog-h" @closed="diaInitClose">
+      <initiate-activity ref="ref_form" :unitList="corganizerList" :gridList="gridList" @dialogCancle="addFormCancleInit"
+        @dialogOk="addFormOkInit"></initiate-activity>
+    </el-dialog>
+    
+
     <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
       width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
-      <event-details ref="ref_detail" :serviceList="serviceList" :gridList="gridList"
+      <event-details ref="ref_detail" :gridList="gridList"
         @diaDetailClose="detailClosed"></event-details>
     </el-dialog>
 
@@ -130,6 +137,7 @@
   
   import activityRecords from './activityRecords'
   import eventDetails from './eventDetails'
+  import initiateActivity from './initiateActivity'
   import util from '@js/util.js';
   import { requestPost,requestGet } from "@/js/dai/request";
   import { mapGetters } from 'vuex'
@@ -147,25 +155,8 @@
         agencyId: '',
         gridList: [],//所属网格
         unitList: [],//单位list
+        typeList:[],//活动类型
         corganizerList:[],//协办方list
-        serviceList: [
-          {
-            id: "1",
-            name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
-          },
-          {
-            id: "2",
-            name: '积极配合'
-          },
-          {
-            id: "3",
-            name: '积极配合社区安全巡查员进行'
-          },
-          {
-            id: "4",
-            name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
-          },
-        ],//服务list
         pickerOptions: { //控制时间范围
           disabledDate (time) {
             return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
@@ -189,6 +180,7 @@
   
         //form相关
         formShow: false,
+        initShow:false,
         formTitle: '新增活动',
         detailShow: false,
   
@@ -200,7 +192,7 @@
       }
     },
     components: {
-      activityRecords, eventDetails
+      activityRecords, eventDetails, initiateActivity
     },
     async created () {
   
@@ -214,12 +206,15 @@
   
       //获取建联单位
       this.loadUnit()
+      //获取活动类型
+      this.activityType()
+
       this.loadGrid()
       //获取网格下拉框数据
-      this.loadTable()
+      // this.loadTable()
 
       this.listServerOrg()
-      this.communityPublicity()
+      this.communityActivityList()
   
     },
   
@@ -243,26 +238,23 @@
           this.$message.error(msg);
         }
       },
-
-      async communityPublicity() {
-        const url = "/actual/base/communityPublicity/page";
-        let params = {  
-          "pageSize": 20,
-          "pageNo": 1,
-          // "title": "",
-          // "tagId": "",
-          // "startTime": "",
-          // "endTime": ""
+      async communityActivityList() {
+        const url = "/actual/base/communityActivity/page";
+        
+        let params = {
+          pageSize: this.pageSize,
+          pageNo: this.pageNo,
+          agencyId: this.agencyId,
+          ...this.formData,
         };
-
-        let { data, code, msg } = await requestGet(url, params);
-        console.log("datadatadata",data)
-        // if (code == 0) {
-        //   this.corganizerList = data;
-        //   console.log("datadata",this.corganizerList)
-        // } else if (code >= 8000) {
-        //   this.$message.error(msg);
-        // }
+        let { data, code, msg } = await requestPost(url, params);
+           if (code === 0) {
+          this.total = data.total
+          this.tableData = data.list
+          console.log("datadatadata",this.tableData)
+        } else {
+          this.$message.error(msg)
+        }
       },
 
       handleCateCHange(val) {
@@ -302,7 +294,8 @@
         return arr;
       },
       handleSearch () {
-        this.loadTable()
+        // this.loadTable()
+        this.communityActivityList()
       },
       async loadGrid () {
         const url = "/gov/org/customergrid/gridoption"
@@ -334,52 +327,34 @@
           this.$message.error(msg)
         }
       },
-  
-      //获取服务事项下拉框
-      async loadService () {
-        const url = "/actual/base/serviceitem/dict-list"
-        let params = {
-          // parentCategoryCode: '1010'
-        }
-  
-        const { data, code, msg } = await requestPost(url, params)
-  
-        if (code === 0) {
-          this.serviceList = data
-  
-        } else {
-          this.$message.error(msg)
-        }
-  
-      },
-      //展示表格
-      async loadTable () {
-        this.tableLoading = true
-        const url = "/actual/base/icpartyactivity/search"
-        // const url = "/actual/base/communityActivity/page"
+
+      async activityType () {
+        const url = "/actual/base/activityType/page"
         let params = {
-          agencyId: this.agencyId,
-          pageSize: this.pageSize,
-          pageNo: this.pageNo,
-          ...this.formData
+          // agencyId: this.agencyId
+          pageSize: 20,
+          pageNo: 1,
+          typeName: "",
+          enabled: 0
         }
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
-          this.total = data.total
-          this.tableData = data.list
+          this.typeList = data.list
         } else {
           this.$message.error(msg)
         }
-        this.tableLoading = false
       },
   
-  
-  
       diaClose () {
   
         this.$refs.ref_form.resetData()
         this.formShow = false
       },
+      diaInitClose() {
+
+        this.$refs.ref_form.resetData()
+        this.initShow = false
+      },
   
       detailClosed () {
         console.log(this.$refs.ref_detail)
@@ -406,6 +381,14 @@
           this.$refs.ref_form.initForm('add', null)
         })
       },
+      handleInitAdd () {
+        this.formTitle = '新增'
+  
+        this.initShow = true
+        this.$nextTick(() => {
+          this.$refs.ref_form.initForm('add', null)
+        })
+      },
       // startProcess () {
       //   this.formTitle = '新增'
   
@@ -426,9 +409,19 @@
       addFormCancle () {
         this.formShow = false
       },
+      addFormCancleInit () {
+        this.initShow = false
+      },
       addFormOk () {
         this.formShow = false
-        this.loadTable()
+        // this.loadTable()
+        this.communityActivityList()
+  
+      },
+      addFormOkInit () {
+        this.initShow = false
+        // this.loadTable()
+        this.communityActivityList()
   
       },
   
@@ -466,7 +459,8 @@
             message: "删除成功"
           });
   
-          this.loadTable()
+          // this.loadTable()
+          this.communityActivityList()
         } else {
           this.$message.error(msg)
         }
@@ -476,16 +470,18 @@
       resetSearch () {
         this.timeRange = []
         this.formData = {
-          gridId: '',
-          unitName: '',
-          serviceMatter: '',
-          type: '',
-          contact: '',
-          contactMobile: ''
+          activityName: "",
+          status: 0,
+          typtId: "",
+          startTime: "",
+          endTime: "",
+          address: "",
+          assistingParty: ""
         }
-        this.pageSize = 10
-        this.pageNo = 0
-        this.loadTable()
+        this.pageSize = 20
+        this.pageNo = 1
+        // this.loadTable()
+        this.communityActivityList()
       },
   
       //导出表格
@@ -583,7 +579,8 @@
             message: "导入成功"
           });
   
-          this.loadTable()
+          // this.loadTable()
+          this.communityActivityList()
         } else {
           this.$message.error(msg)
         }
@@ -602,17 +599,18 @@
           this.formData.startTime = ''
           this.formData.endTime = ''
         }
-  
       },
   
       handleSizeChange (val) {
         this.pageSize = val
         this.pageNo = 1
-        this.loadTable()
+        // this.loadTable()
+        this.communityActivityList()
       },
       handleCurrentChange (val) {
         this.pageNo = val
-        this.loadTable()
+        // this.loadTable()
+        this.communityActivityList()
       },
   
       // 开启加载动画
diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
new file mode 100644
index 000000000..56fef782f
--- /dev/null
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -0,0 +1,664 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
+                class="form">
+                <el-form-item label="活动类型" label-width="150px" prop="gridId">
+                    <el-select class="item_width_1" v-model.trim="formData.gridId" placeholder="请选择" clearable>
+                        <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
+                            :value="item.typeName">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="活动名称" prop="activityName" label-width="150px">
+                    <el-input v-model.trim="formData.activityName" size="small" clearable placeholder="请输入活动名称"
+                        class="u-item-width-normal"></el-input>
+                </el-form-item>
+
+                <el-form-item label="活动时间" prop="timeRange" label-width="130px">
+                    <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
+                        value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至"
+                        start-placeholder="开始时间" end-placeholder="结束时间">
+                    </el-date-picker>
+                </el-form-item>
+
+                <!-- <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                    <el-cascader v-model.trim="formData.assistingParty" :options="corganizerList"
+                        :props="{ label: 'label', value: 'name', multiple: true, emitPath: false }"
+                        clearable collapse-tags size="small" class="u-item-width-normal"></el-cascader>
+                </el-form-item> -->
+
+                <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                    <el-cascader v-model.trim="formData.assistingParty" :options="corganizerList"
+                        :props="{ label: 'label', value: 'name'}" clearable collapse-tags size="small"
+                        class="u-item-width-normal"></el-cascader>
+                </el-form-item>
+
+                <el-form-item label="活动封面图" label-width="140px" prop="fileList" >
+                    <template>
+                        <upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"></upload-image>
+                    </template>
+                </el-form-item>
+
+
+                <el-form-item label="活动内容" prop="contentt" label-width="150px" style="display: block">
+                    <div class="item_width_1">
+                        <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
+                            :height="250" placeholder="在这里输入文字" />
+                        <p v-else class="text_p" v-html="formData.content"></p>
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="活动地点" prop="searchValue" label-width="150px" style="display: block">
+                    <div style="width: 500px">
+                        <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                            :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                            :loading="loading">
+                            <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                        <div id="app_activity" class="div_map"></div>
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="线上报名" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="formData.online" @change="handleOnlineRegistration"></el-switch>
+                    <!-- <el-switch v-model="formData.isOn" active-text="已报名" inactive-text="未报名" @change="handleOnlineRegistration"></el-switch> -->
+                </el-form-item>
+
+                <div v-if="online">
+                    <el-form-item label="报名截止时间" label-width="140px" prop="cutOffTime">
+                        <el-date-picker v-model.trim="formData.cutOffTime" type="date" value-format="yyyy-MM-dd"
+                            format="yyyy-MM-dd" placeholder="选择报名截止时间" style="width:280px">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="活动积分" label-width="140px" prop="points">
+                        <el-input-number v-model="formData.points" @change="handleChange" :min="1" :max="10"
+                            label="描述文字"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="活动人数" label-width="140px">
+                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" :max="10"
+                            label="描述文字"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="消息推送" label-width="140px">
+                        <el-checkbox-group v-model="formData.sendMessage">
+                            <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                </div>
+
+
+
+
+
+            </el-form>
+        </div>
+
+        <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">确
+                定</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import Tinymce from '@c/tinymce2/index.vue'
+import daiMap from "@/utils/dai-map";
+// import UploadImage from './upload-image.vue'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+    data() {
+        let initFormData = () => {
+            let _form = {
+                // gridId: '',
+                // serviceMatter: '',//服务事项
+                // serviceMatterList: [],
+                // unitId: '',//单位ID
+                // unitIdList: [],
+                // title: '',//活动标题
+                // target: '',//活动目标
+                // content: '',//活动内容
+                // activityTime: '',//活动时间
+                // peopleCount: 0,//服务人数
+                // result: '', //活动结果
+                // address: '', //详细地址
+                // endDate: '',
+                // longitude: this.$store.state.user.longitude, //经度
+                // latitude: this.$store.state.user.latitude,//纬度
+
+                id: "1790263323837440002",
+                typeId: "1111111111",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 1,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude//纬度
+            }
+
+            return _form
+        }
+        return {
+            fileList: [],//图片
+            formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            num: 0,
+            loading: false,
+            timeRange: [],
+            online: false,
+
+            btnDisable: false,
+
+            keyWords: '',
+            activityId: '',
+            formData: initFormData(),
+            serviceList: [],
+            // gridList: [],
+            agencyId: '',
+
+            demandOptions: [],
+            typeList: [],
+            corganizerList: []
+
+        }
+    },
+    components: { Tinymce, UploadImage },
+    mounted() {
+        this.activityType()
+        this.listServerOrg()
+
+    },
+
+    methods: {
+        async listServerOrg() {
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
+            let params = {
+                serverOrgCategoryCode: "",
+                serverOrgType: "party_unit",
+                serverParentOrgCategoryCode: ""
+            };
+
+            let { data, code, msg } = await requestPost(url, params);
+            if (code == 0) {
+                this.corganizerList = data;
+                // console.log("datadata",this.corganizerList)
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
+        async activityType() {
+            const url = "/actual/base/activityType/page"
+            let params = {
+                // agencyId: this.agencyId
+                pageSize: 20,
+                pageNo: 1,
+                typeName: "",
+                enabled: 0
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.typeList = data.list
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        handleOnlineRegistration(value) {
+            console.log(value)
+            if (value) {
+                this.online = true;
+            } else {
+                this.online = false;
+            }
+        },
+
+        onChangeFileList(e) {
+            console.log('onChangeFileList', e)
+            if (e.length > 0) {
+                let item = e[0];
+                let ob = {
+                    fileType: '0',
+                    fileUrl: item.response.data.url
+                };
+                this.formData.coverPic = [ob];
+            }
+        },
+
+        handleChange(value) {
+            console.log(value);
+        },
+        handleTimeChange(time) {
+            if (time) {
+                const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+                const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+
+                this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+                this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+
+                // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+                // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+            } else {
+                this.formData.startTime = ''
+                this.formData.endTime = ''
+            }
+
+        },
+
+        async initForm(type, activityId) {
+            this.startLoading()
+            this.$refs.ref_form.resetFields();
+
+
+            //获取服务事项
+            await this.getDemandOptions()
+
+            let { latitude, longitude } = this.$store.state.user;
+
+            this.formType = type
+            if (activityId) {
+                this.activityId = activityId
+                this.formData.id = activityId
+                await this.loadFormData()
+            } else {
+                this.formData.latitude = latitude
+                this.formData.longitude = longitude
+            }
+            this.$nextTick(() => {
+                if (!map) {
+                    this.initMap(this.formData.latitude, this.formData.longitude);
+                } else {
+                    map.setCenter(this.formData.latitude, this.formData.longitude);
+                    map.setMarker(this.formData.latitude, this.formData.longitude);
+                }
+            })
+            this.endLoading()
+
+        },
+
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory")
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        );
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            // console.log('arrr-oppp', arr2)
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption"
+
+            let params = {
+                agencyId: this.agencyId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.gridList = data
+
+            } else {
+                this.$message.error(msg)
+            }
+
+        },
+
+
+        //加载组织
+        async loadFormData() {
+            const url = '/actual/base/icpartyactivity/detail'
+            // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
+            let params = {
+                id: this.activityId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.formData = data
+                console.log(this.formData.content)
+                let style_img = "style='width:50px;height:40px;' "
+
+                if (this.formData.content) {
+                    // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
+                    // let array=this.formData.content.split('<img')
+
+                }
+                console.log(this.formData.content)
+
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else {
+                    this.addActivity()
+                }
+            })
+        },
+        async addActivity() {
+            let url = '/actual/base/communityActivity/save'
+            const { data, code, msg } = await requestPost(url, this.formData)
+            console.log("data/actual/base/communityActivity/save",data)
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                })
+                this.resetData()
+                this.$emit('dialogOk')
+                this.btnDisable = false
+            } else {
+                this.btnDisable = false
+                this.$message.error(msg)
+            }
+
+        },
+
+        handleCancle() {
+
+            this.resetData()
+            this.$emit('dialogCancle')
+
+        },
+
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+
+            map = new daiMap(
+                document.getElementById("app_activity"),
+                { latitude, longitude },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45, // 设置地图旋转角度
+                }
+            );
+
+            // 监听地图平移结束
+            /*  map.on("dragend", (e) => {
+                this.handleMoveCenter(e);
+              });*/
+            map.on("click", (e) => {
+                this.handleMoveCenter(e);
+            });
+
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
+
+        },
+
+
+        async handleMoveCenter(e) {
+            //修改地图中心点
+            // const { lat, lng } = map.getCenter();
+            const { lat, lng } = e.latLng;
+            this.formData.latitude = lat;
+            this.formData.longitude = lng;
+            map.setMarker(lat, lng);
+
+            let { msg, data } = await map.getAddress(lat, lng);
+            if (msg == "success") {
+                this.formData.address = data.address
+                this.searchValue = data.address
+                this.searchOptions = []
+
+            }
+        },
+
+        async remoteMethod(query) {
+
+            if (query !== '') {
+                this.loading = true;
+
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                this.resultList = []
+
+                if (msg == "success" && data.resultList && data.resultList.length > 0) {
+
+                    if (data.resultList && data.resultList.length > 0) {
+                        this.resultList = data.resultList
+                        this.searchOptions = this.resultList.map(item => {
+                            return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
+
+                        });
+                    }
+                } else {
+                    this.searchOptions = [
+                        {
+                            value: '0',
+                            label: '未检索到结果'
+                        }
+                    ]
+                }
+            } else {
+                this.searchOptions = [];
+            }
+        },
+
+        handleClickKey(index) {
+            let selPosition = this.resultList[index]
+            let lonlat = selPosition.lonlat.split(" ")
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.formData.latitude = lonlat[1];
+            this.formData.longitude = lonlat[0];
+            this.formData.address = selPosition.address + selPosition.name
+        },
+
+        resetData() {
+            this.searchValue = ''
+            this.searchOptions = []
+            this.resultList = []
+            this.activityId = ''
+            this.keyWords = ''
+            this.formData = {
+                id: "1790263323837440002",
+                typeId: "1111111111",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 1,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude//纬度
+            }
+
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                activityName: [
+                    { required: true, message: '活动名称不能为空', trigger: 'blur' }
+                ],
+                gridId:[
+                    { required: true, message: '请选择活动类型', trigger: 'blur' }
+                ],
+                timeRange:[
+                    { required: true, message: '请选择活动时间', trigger: 'blur' }
+                ],
+                fileList:[
+                    { required: true, message: '请选择活动封面图', trigger: 'blur' }
+                ],
+                contentt: [
+                    { required: true, message: '活动内容不能为空', trigger: 'blur' }
+                ],
+                searchValue: [
+                    { required: true, message: '请选择活动地点', trigger: 'blur' }
+                ],
+                longitude: [
+                    { required: true, message: '坐标不能为空', trigger: 'blur' }
+                ],
+                cutOffTime: [
+                    { required: true, message: '请选择报名截止时间', trigger: 'blur' }
+                ],
+                points: [
+                    { required: true, message: '请选择活动积分', trigger: 'blur' }
+                ]
+            }
+        },
+
+    },
+    props: {
+
+        unitList: {
+            type: Array,
+            default: []
+        },
+        gridList: {
+            type: Array,
+            default: []
+        },
+
+
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style lang="scss" scoped>
+.item_width_1 {
+    width: 560px;
+
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
+
+.tinymce_view {
+    ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+    }
+}
+
+.div_map {
+    position: relative;
+}
+
+.div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+}
+
+.tinymce_view {
+    height: 400px;
+    overflow: auto;
+}
+
+.text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+
+    >p {
+        margin: 0;
+    }
+}
+</style>
\ No newline at end of file

From 9331f70071cb03bf55fd0038590881b6b96b683b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Mon, 27 May 2024 17:18:23 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=92=8C=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/activityRecords.vue              | 667 ------------------
 .../communityParty/activity/eventDetails.vue  |  58 +-
 .../modules/communityParty/activity/index.vue | 165 +++--
 .../activity/initiateActivity.vue             | 387 +++++++---
 .../modules/workSys/typeActivity/index.vue    | 345 +--------
 .../workSys/typeActivity/typeActivityadd.vue  | 123 ++--
 .../workSys/typeActivity/typeDetails.vue      | 163 +++++
 7 files changed, 675 insertions(+), 1233 deletions(-)
 delete mode 100644 src/views/modules/communityParty/activity/activityRecords.vue
 create mode 100644 src/views/modules/workSys/typeActivity/typeDetails.vue

diff --git a/src/views/modules/communityParty/activity/activityRecords.vue b/src/views/modules/communityParty/activity/activityRecords.vue
deleted file mode 100644
index b4cb9be7b..000000000
--- a/src/views/modules/communityParty/activity/activityRecords.vue
+++ /dev/null
@@ -1,667 +0,0 @@
-<template>
-  <div>
-
-    <div class="dialog-h-content scroll-h">
-      <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
-        class="form">
-        <el-form-item label="活动类型" label-width="150px" prop="gridId">
-          <el-select class="item_width_1" v-model.trim="formData.gridId" placeholder="请选择" clearable>
-            <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.typeName">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="活动名称" prop="serviceMatterList" label-width="150px">
-          <el-input v-model.trim="formData.serviceMatterList" size="small" clearable placeholder="请输入活动名称"
-            class="u-item-width-normal"></el-input>
-        </el-form-item>
-
-        <!-- <el-form-item label="活动名称" prop="activityName">
-          <el-input v-model.trim="formData.activityName" size="small" class="item_width_1" clearable
-            placeholder="请输入关键字">
-          </el-input>
-        </el-form-item> -->
-
-        <el-form-item label="活动时间" prop="startTime">
-          <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
-            value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
-            end-placeholder="结束时间">
-          </el-date-picker>
-        </el-form-item>
-
-        <!-- <el-form-item label="协办方" prop="serviceMatterList" label-width="150px">
-          <el-cascader v-model.trim="formData.assistingParty" :options="demandOptions"
-            :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}"
-            clearable collapse-tags size="small" class="u-item-width-normal"></el-cascader>
-        </el-form-item> -->
-
-        <el-form-item label="协办方" prop="assistingParty" label-width="150px">
-            <el-select class="item_width_1" v-model.trim="formData.assistingParty" size="small" placeholder="请选择" clearable>
-              <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-        <el-form-item label="活动封面图" label-width="140px">
-          <template>
-            <upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"></upload-image>
-          </template>
-        </el-form-item>
-
-
-        <el-form-item label="活动内容" prop="target" label-width="150px" style="display: block">
-          <div class="item_width_1">
-            <Tinymce class="tinymce_view " v-if="formType!='detail'" v-model.trim="formData.content" :height="250"
-              placeholder="在这里输入文字" />
-
-            <p v-else class="text_p" v-html="formData.content"></p>
-          </div>
-        </el-form-item>
-
-        <el-form-item label="活动地点" prop="longitude" label-width="150px" style="display: block">
-          <div style="width: 500px">
-            <el-select v-model.trim="searchValue" filterable style="width: 500px" remote :reserve-keyword="true"
-              placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
-              <el-option v-for="(item,index) in searchOptions" @click.native="handleClickKey(index)" :key="item.value"
-                :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-            <div id="app_activity" class="div_map"></div>
-          </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-switch v-model="formData.isOn" active-text="已报名" inactive-text="未报名" @change="handleOnlineRegistration"></el-switch> -->
-        </el-form-item>
-
-        <div v-if="!online">
-          <el-form-item label="活动总结" prop="result" label-width="150px" style="display: block">
-            <div class="item_width_1">
-              <Tinymce class="tinymce_view " v-if="formType!='detail'" v-model.trim="formData.result" :height="250"
-                placeholder="在这里输入文字" />
-
-              <p v-else class="text_p" v-html="formData.result"></p>
-            </div>
-          </el-form-item>
-
-          <el-form-item label="活动照片" label-width="140px">
-            <template>
-              <upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"></upload-image>
-            </template>
-          </el-form-item>
-        </div>
-
-        <div v-if="online">
-          <el-form-item label="报名截止时间" label-width="140px">
-            <el-date-picker v-model.trim="formData.endDate" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
-              placeholder="选择报名截止时间" style="width:280px">
-            </el-date-picker>
-          </el-form-item>
-
-          <el-form-item label="活动积分" label-width="140px">
-            <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
-          </el-form-item>
-
-          <el-form-item label="活动人数" label-width="140px">
-            <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
-          </el-form-item>
-
-          <el-form-item label="消息推送数" label-width="140px">
-            <el-checkbox-group v-model="formData.serviceMatterList">
-              <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-        </div>
-
-
-
-
-
-      </el-form>
-    </div>
-
-    <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">确
-        定</el-button>
-    </div>
-  </div>
-</template>
-  
-  <script>
-  import { mapGetters } from 'vuex'
-  import { Loading } from 'element-ui' // 引入Loading服务
-  import { requestPost } from '@/js/dai/request'
-  import Tinymce from '@c/tinymce2/index.vue'
-  import daiMap from "@/utils/dai-map";
-  // import UploadImage from './upload-image.vue'
-  import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
-  
-  var map
-  var search
-  var markers
-  var infoWindowList
-  var geocoder // 新建一个正逆地址解析类
-  
-  let loading // 加载动画
-  export default {
-    data () {
-      let initFormData = () => {
-        let _form = {
-          gridId: '',
-          serviceMatter: '',//服务事项
-          serviceMatterList: [],
-          unitId: '',//单位ID
-          unitIdList: [],
-          title: '',//活动标题
-          target: '',//活动目标
-          content: '',//活动内容
-          activityTime: '',//活动时间
-          peopleCount: 0,//服务人数
-          result: '', //活动结果
-          address: '', //详细地址
-          
-          endDate:'',
-          longitude: this.$store.state.user.longitude, //经度
-          latitude: this.$store.state.user.latitude//纬度
-        }
-  
-        return _form
-      }
-      return {
-        fileList: [],//图片
-        formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-        searchOptions: [],
-        searchValue: '',
-        resultList: [],
-        num: 0,
-        loading: false,
-        timeRange: [],
-        online:false,
-  
-        btnDisable: false,
-  
-        keyWords: '',
-        activityId: '',
-        formData: initFormData(),
-        serviceList: [],
-        // gridList: [],
-        agencyId: '',
-        
-        demandOptions:[],
-        typeList:[],
-        corganizerList:[]
-  
-      }
-    },
-    components: { Tinymce,UploadImage },
-    mounted () {
-      this.activityType()
-      this.listServerOrg()
-  
-    },
-  
-    methods: {
-      async listServerOrg() {
-        const url = "/actual/base/serviceitem/listServerOrgNewTask";
-        let params = {  
-          serverOrgCategoryCode: "",
-          serverOrgType: "party_unit",
-          serverParentOrgCategoryCode: ""
-        };
-
-        let { data, code, msg } = await requestPost(url, params);
-        if (code == 0) {
-          this.corganizerList = data;
-          // console.log("datadata",this.corganizerList)
-        } else if (code >= 8000) {
-          this.$message.error(msg);
-        }
-      },
-      async activityType () {
-        const url = "/actual/base/activityType/page"
-        let params = {
-          // agencyId: this.agencyId
-          pageSize: 20,
-          pageNo: 1,
-          typeName: "",
-          enabled: 0
-        }
-        const { data, code, msg } = await requestPost(url, params)
-        if (code === 0) {
-          this.typeList = data.list
-        } else {
-          this.$message.error(msg)
-        }
-      },
-
-      handleOnlineRegistration(value) {
-        console.log(value)
-        if (value) {
-          this.online = true;
-        } else {
-          this.online = false;
-        }
-      },
-
-      onChangeFileList (e, rowIndex=0) {
-      console.log('onChangeFileList', e)
-      if (e.length > 0) {
-        this.fileList = []
-        e.forEach(item => {
-          let ob = {
-            fileType: '0',
-            fileUrl: item.response.data.url
-          }
-          this.fileList.push(ob)
-        })
-      }
-    },
-    handleChange(value) {
-        console.log(value);
-      },
-        handleTimeChange (time) {
-        if (time) {
-          const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
-          const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
-  
-          this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
-          this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
-  
-          // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
-          // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
-        } else {
-          this.formData.startTime = ''
-          this.formData.endTime = ''
-          // this.startTimeShow = ''
-          // this.endTimeShow = ''
-        }
-  
-      },
-  
-      async initForm (type, activityId) {
-        this.startLoading()
-        this.$refs.ref_form.resetFields();
-  
-  
-        //获取服务事项
-        await this.getDemandOptions()
-  
-        let { latitude, longitude } = this.$store.state.user;
-  
-        this.formType = type
-        if (activityId) {
-          this.activityId = activityId
-          this.formData.id = activityId
-          await this.loadFormData()
-        } else {
-          this.formData.latitude = latitude
-          this.formData.longitude = longitude
-        }
-        this.$nextTick(() => {
-          if (!map) {
-            this.initMap(this.formData.latitude, this.formData.longitude);
-          } else {
-            map.setCenter(this.formData.latitude, this.formData.longitude);
-            map.setMarker(this.formData.latitude, this.formData.longitude);
-          }
-        })
-        this.endLoading()
-  
-      },
-  
-      async getDemandOptions() {
-        this.$http
-          .post("/actual/base/serviceitem/listAllCategory")
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg);
-            } else {
-              this.demandOptions = this.getFlagData(
-                this.getTreeData(res.data),
-                "usableFlag"
-              );
-            }
-          })
-          .catch(() => {
-            return this.$message.error("网络错误");
-          });
-      },
-      getFlagData(data, flag) {
-        if (!Array.isArray(data)) return [];
-        let arr1 = data.filter((item) => item[flag]);
-        let arr2 = arr1.map((item) => {
-          if (item.childCateList)
-            return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
-          else return item;
-        });
-        // console.log('arrr-oppp', arr2)
-        return arr2;
-      },
-      getTreeData(data) {
-        if (!Array.isArray(data)) return [];
-        let arr = data.map((item) => {
-          let _item = {};
-          if (item.childCateList) {
-            if (item.childCateList.length === 0)
-              _item = { ...item, childCateList: undefined };
-            else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
-          } else {
-            _item = { ...item };
-          }
-          return _item;
-        });
-        return arr;
-      },
-      async loadGrid () {
-        const url = "/gov/org/customergrid/gridoption"
-  
-        let params = {
-          agencyId: this.agencyId
-        }
-  
-        const { data, code, msg } = await requestPost(url, params)
-  
-        if (code === 0) {
-          this.gridList = data
-  
-        } else {
-          this.$message.error(msg)
-        }
-  
-      },
-  
-      
-      //加载组织
-      async loadFormData () {
-        const url = '/actual/base/icpartyactivity/detail'
-        // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
-        let params = {
-          id: this.activityId
-        }
-  
-        const { data, code, msg } = await requestPost(url, params)
-  
-        if (code === 0) {
-          this.formData = data
-          console.log(this.formData.content)
-          let style_img = "style='width:50px;height:40px;' "
-  
-          if (this.formData.content) {
-            // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
-            // let array=this.formData.content.split('<img')
-  
-          }
-          console.log(this.formData.content)
-  
-        } else {
-          this.$message.error(msg)
-        }
-      },
-  
-      async handleComfirm () {
-        this.btnDisable = true
-        setTimeout(() => {
-          this.btnDisable = false
-        }, 10000)
-        this.$refs['ref_form'].validate((valid, messageObj) => {
-          if (!valid) {
-            app.util.validateRule(messageObj)
-            this.btnDisable = false
-          } else {
-            this.addActivity()
-          }
-  
-        })
-  
-      },
-      async addActivity () {
-        let url = '/actual/base/icpartyactivity/save'
-        // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
-  
-  
-        const { data, code, msg } = await requestPost(url, this.formData)
-  
-        if (code === 0) {
-          this.$message({
-            type: 'success',
-            message: '操作成功'
-          })
-          this.resetData()
-          this.$emit('dialogOk')
-          this.btnDisable = false
-        } else {
-          this.btnDisable = false
-          this.$message.error(msg)
-        }
-  
-      },
-  
-      handleCancle () {
-  
-        this.resetData()
-        this.$emit('dialogCancle')
-  
-      },
-  
-      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-      initMap (latitude, longitude) {
-  
-        map = new daiMap(
-          document.getElementById("app_activity"),
-          { latitude, longitude },
-          {
-            zoom: 16.2, // 设置地图缩放级别
-            pitch: 43.5, // 设置俯仰角
-            rotation: 45, // 设置地图旋转角度
-          }
-        );
-  
-        // 监听地图平移结束
-      /*  map.on("dragend", (e) => {
-          this.handleMoveCenter(e);
-        });*/
-        map.on("click", (e) => {
-          this.handleMoveCenter(e);
-        });
-  
-        map.setCenter(latitude, longitude);
-        map.setMarker(latitude, longitude);
-  
-      },
-  
-  
-      async handleMoveCenter (e) {
-        //修改地图中心点
-        // const { lat, lng } = map.getCenter();
-        const { lat, lng } = e.latLng;
-        this.formData.latitude = lat;
-        this.formData.longitude = lng;
-        map.setMarker(lat, lng);
-  
-        let { msg, data } = await map.getAddress(lat, lng);
-        if (msg == "success") {
-          this.formData.address = data.address
-          this.searchValue = data.address
-          this.searchOptions = []
-  
-        }
-      },
-  
-      async remoteMethod (query) {
-  
-        if (query !== '') {
-          this.loading = true;
-  
-          const { msg, data } = await map.searchNearby(query);
-          this.loading = false;
-          this.resultList = []
-  
-          if (msg == "success" && data.resultList && data.resultList.length > 0) {
-  
-            if (data.resultList && data.resultList.length > 0) {
-              this.resultList = data.resultList
-              this.searchOptions = this.resultList.map(item => {
-                return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
-  
-              });
-            }
-          } else {
-            this.searchOptions = [
-              {
-                value: '0',
-                label: '未检索到结果'
-              }
-            ]
-          }
-        } else {
-          this.searchOptions = [];
-        }
-      },
-  
-      handleClickKey (index) {
-        let selPosition = this.resultList[index]
-        let lonlat = selPosition.lonlat.split(" ")
-        map.setCenter(lonlat[1], lonlat[0]);
-        map.setMarker(lonlat[1], lonlat[0]);
-        this.formData.latitude = lonlat[1];
-        this.formData.longitude = lonlat[0];
-        this.formData.address = selPosition.address + selPosition.name
-      },
-  
-      resetData () {
-        this.searchValue = ''
-        this.searchOptions = []
-        this.resultList = []
-        this.activityId = ''
-        this.keyWords = ''
-        this.formData = {
-          gridId: '',
-          serviceMatter: '',//服务事项
-          serviceMatterList: [],
-          unitId: '',//单位ID
-          unitIdList: [],
-          title: '',//活动标题
-          target: '',//活动目标
-          content: '',//活动内容
-          activityTime: '',//活动时间
-          peopleCount: 0,//服务人数
-          result: '', //活动结果
-          address: '', //详细地址
-          longitude: this.$store.state.user.longitude, //经度
-          latitude: this.$store.state.user.latitude//纬度
-        }
-  
-      },
-      // 开启加载动画
-      startLoading () {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: '正在加载……', // 加载中需要显示的文字
-          background: 'rgba(0,0,0,.7)' // 背景颜色
-        })
-      },
-      // 结束加载动画
-      endLoading () {
-        // clearTimeout(timer);
-        if (loading) {
-          loading.close()
-        }
-      }
-    },
-    computed: {
-      dataRule () {
-        return {
-          serviceMatterList: [
-            { required: true, message: '活动名称不能为空', trigger: 'blur' }
-          ],
-          unitIdList: [
-            { required: true, message: '单位名称不能为空', trigger: 'blur' },
-          ],
-          title: [
-            { required: true, message: '活动标题不能为空', trigger: 'blur' }
-          ],
-  
-          target: [
-            { required: true, message: '活动目标不能为空', trigger: 'blur' }
-          ],
-          content: [
-            { required: true, message: '活动内容不能为空', trigger: 'blur' }
-          ],
-          activityTime: [
-            { required: true, message: '活动时间不能为空', trigger: 'blur' }
-          ],
-          result: [
-            { required: true, message: '活动结果不能为空', trigger: 'blur' }
-          ],
-          address: [
-            { required: true, message: '详细地址不能为空', trigger: 'blur' }
-          ],
-          longitude: [
-            { required: true, message: '坐标不能为空', trigger: 'blur' }
-          ]
-        }
-      },
-  
-    },
-    props: {
-  
-      unitList: {
-        type: Array,
-        default: []
-      },
-      gridList: {
-        type: Array,
-        default: []
-      },
-  
-  
-    }
-  }
-  </script>
-  
-  
-  <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManageForm.scss";
-  </style>
-  <style  lang="scss" scoped>
-  .item_width_1 {
-    width: 560px;
-  
-    /deep/.tox .tox-dialog {
-      z-index: 20000;
-    }
-  }
-  .tinymce_view {
-    ::v-deep .tox .tox-dialog {
-      z-index: 2000000000;
-    }
-  }
-  
-  .div_map {
-    position: relative;
-  }
-  .div_searchmap {
-    z-index: 5000;
-    position: absolute;
-    top: 5px;
-    left: 5px;
-  }
-  
-  .tinymce_view {
-    height: 400px;
-    overflow: auto;
-  }
-  .text_p {
-    margin: 0;
-    padding: 0 10px;
-    border: 1px solid #d9d9d9;
-    border-radius: 5px;
-    > p {
-      margin: 0;
-    }
-  }
-  </style>
-  
-  
\ No newline at end of file
diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
index 5fe539a90..64849d7bc 100644
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -8,7 +8,7 @@
                         <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.unitName || "--" }}</span>
+                            <span>{{ formData.typeId || "--" }}</span>
                         </div>
                         <div class="m-info-prop" style="flex: 0 0 50%;">
                             <span class="u-info-title-2">活动名称: </span>
@@ -58,13 +58,13 @@
                         <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>2024-03-1123:59</span>
+                            <span>{{ formData.cutOffTime || "--" }}</span>
                         </div>
 
                         <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>3</span>
+                            <span>{{ formData.points || "--" }}</span>
                         </div>
                     </div>
 
@@ -77,7 +77,7 @@
                         <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动图片：</span>
                         <div v-for="(image, index) in formData.activityImgs" :key="index">
                             <img style="width: 200px; height: 160px; margin-right: 30px;margin-bottom: 10px;"
-                                :src="image.url" alt="Image" />
+                                :src="image" alt="Image" />
                         </div>
                     </div>
 
@@ -128,9 +128,6 @@
                             <el-table-column prop="type" header-align="center" align="center" label="实况内容"
                                 min-width="280">
                             </el-table-column>
-                            <!-- <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
-                                label="活动照片" show-overflow-tooltip min-width="120">
-                            </el-table-column> -->
                             <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
                                 label="活动照片" show-overflow-tooltip min-width="120">
                                 <template slot-scope="scope">
@@ -170,29 +167,31 @@ export default {
         return {
             formData: {},
             initLoading: false,
-            // imageArray: [
-            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            // ],
-            // tableData: [
-            //     { unitName: '张三', agencyName: '123456789', type: '内容1', serviceMatterListShow: [  { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] },
-            //     { unitName: '李四', agencyName: '987654321', type: '内容2', serviceMatterListShow: [  { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },
-            //     { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] },
-
-            // ],
         };
     },
     components: {},
     created() { },
 
+    mounted () {
+    },
+
     methods: {
+        async activityType () {
+        const url = "/actual/base/activityType/page"
+        let params = {
+          // agencyId: this.agencyId
+          pageSize: 20,
+          pageNo: 1,
+          typeName: "",
+          enabled: 0
+        }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.typeList = data.list
+        } else {
+          this.$message.error(msg)
+        }
+      },
         handleCancle() {
             this.diaDestroy();
             this.$emit("diaDetailClose");
@@ -208,7 +207,7 @@ export default {
             this.startLoading();
             this.formData = JSON.parse(JSON.stringify(row));
             this.initLoading = true;
-            console.log('this.formData,',this.formData);
+            // console.log('this.formData,',this.formData);
 
             let { latitude, longitude } = this.$store.state.user;
             console.log("lat" + latitude + ",lon" + longitude);
@@ -220,15 +219,6 @@ export default {
                 latitude = 39.9088810666821;
                 longitude = 116.39743841556731;
             }
-            // this.$nextTick(() => {
-            //     if (!map) {
-            //         // this.initMap(latitude, longitude);
-            //     } else {
-            //         // map.setCenter(latitude, longitude);
-            //         // map.setMarker(latitude, longitude);
-            //     }
-            // });
-
             this.endLoading();
         },
 
diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index 2ff14ab1b..fd2cc4ef9 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -4,22 +4,23 @@
       <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
         <div>
 
-          <el-form-item label="活动类型" prop="unitId">
-            <el-select class="item_width_1" v-model.trim="formData.unitId" size="small" placeholder="全部" clearable>
+          <el-form-item label="活动类型" prop="typtId">
+            <el-select class="item_width_1" v-model.trim="formData.typtId" size="small" placeholder="全部" clearable>
               <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.typeName">
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="活动状态" prop="unitId">
-            <el-select class="item_width_1" v-model.trim="formData.unitId" size="small" placeholder="全部" clearable>
-              <el-option v-for="item in unitList" :key="item.value" :label="item.label" :value="item.value">
+            <el-select class="item_width_1" v-model.trim="formData.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>
 
           <el-form-item label="活动名称" prop="activityName">
-            <el-input v-model.trim="formData.activityName" size="small" class="item_width_1" clearable placeholder="请输入关键字">
+            <el-input v-model.trim="formData.activityName" size="small" class="item_width_1" clearable
+              placeholder="请输入关键字">
             </el-input>
           </el-form-item>
 
@@ -39,13 +40,13 @@
           </el-form-item>
 
           <el-form-item label="协办方" prop="assistingParty">
-            <el-select class="item_width_1" v-model.trim="formData.assistingParty" size="small" placeholder="请选择" clearable>
+            <el-select class="item_width_1" v-model.trim="formData.assistingParty" size="small" placeholder="请选择"
+              clearable>
               <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name">
               </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>
@@ -69,7 +70,7 @@
         style="width: 100%">
 
         <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-        <el-table-column prop="activityName" header-align="center" align="center" label="活动类型" width="180">
+        <el-table-column prop="typeId" header-align="center" align="center" label="活动类型" width="180">
         </el-table-column>
         <el-table-column prop="activityName" header-align="center" align="center" label="活动名称" width="180">
         </el-table-column>
@@ -80,7 +81,11 @@
 
         <el-table-column prop="assistingParty" header-align="center" align="center" label="协办方" width="100">
         </el-table-column>
-        <el-table-column prop="activityTime" header-align="center" align="center" label="活动状态" width="230">
+
+        <el-table-column prop="status" header-align="center" align="center" label="活动状态" width="230">
+          <template slot-scope="scope">
+            {{ getStatusText(scope.row.status) }}
+          </template>
         </el-table-column>
         <el-table-column prop="online" header-align="center" align="center" label="线上报名" width="100">
           <template slot-scope="scope">
@@ -94,10 +99,17 @@
 
             <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
               @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="agencyId===scope.row.agencyId&&!scope.row.actId" type="text"
-              style="color:#00A7A9;text-decoration: underline;" size="small"
-              @click="handleEdit(scope.row)">修改</el-button>
 
+              <el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;text-decoration: underline;" size="small"
+              @click="handleEdit(scope.row)">编辑</el-button>
+
+              <el-button type="text" v-if="scope.row.status == 2" style="color:#1C6AFD;text-decoration: underline;" size="small"
+              @click="handleEdit(scope.row)">活动总结</el-button>
+
+            <!-- <el-button  type="text"
+              style="color:#00A7A9;text-decoration: underline;" size="small"
+              @click="handleEdit(scope.row)">修改</el-button> -->
+              
             <el-button v-if="agencyId===scope.row.agencyId" type="text"
               style="color:#D51010;text-decoration: underline;" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
@@ -120,22 +132,20 @@
 
     <el-dialog :visible.sync="initShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
       width="950px" top="5vh" class="dialog-h" @closed="diaInitClose">
-      <initiate-activity ref="ref_form" :unitList="corganizerList" :gridList="gridList" @dialogCancle="addFormCancleInit"
-        @dialogOk="addFormOkInit"></initiate-activity>
+      <initiate-activity ref="ref_form" :unitList="corganizerList" :gridList="gridList"
+        @dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></initiate-activity>
     </el-dialog>
-    
+
 
     <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
       width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
-      <event-details ref="ref_detail" :gridList="gridList"
-        @diaDetailClose="detailClosed"></event-details>
+      <event-details ref="ref_detail" :gridList="gridList" @diaDetailClose="detailClosed"></event-details>
     </el-dialog>
 
   </div>
 </template>
   <script>
   
-  import activityRecords from './activityRecords'
   import eventDetails from './eventDetails'
   import initiateActivity from './initiateActivity'
   import util from '@js/util.js';
@@ -154,7 +164,12 @@
         tableLoading: false,
         agencyId: '',
         gridList: [],//所属网格
-        unitList: [],//单位list
+        unitList: [],
+        statuslist: [
+          { value: 0, label: '未进行' },
+          { value: 1, label: '进行中' },
+          { value: 2, label: '已结束' }
+        ],
         typeList:[],//活动类型
         corganizerList:[],//协办方list
         pickerOptions: { //控制时间范围
@@ -166,13 +181,13 @@
         timeRange: [],
         unitId: '',
         formData: {
-          unitId: '',
-          xbf:'',
-          title: '',
-          serviceMatter:"",
-          startTime: '',
-          endTime: '',
-          gridId: ''
+          activityName: "",
+          status: "",
+          typtId: "",
+          startTime: "",
+          endTime: "",
+          address: "",
+          assistingParty: ""
         },
   
   
@@ -187,12 +202,12 @@
         files: "",
         fileName: "",
         uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
-        searchdemandOptions:[],
+        // searchdemandOptions:[],
         detail:{}
       }
     },
     components: {
-      activityRecords, eventDetails, initiateActivity
+       eventDetails, initiateActivity
     },
     async created () {
   
@@ -204,8 +219,6 @@
       const { user } = this.$store.state
       this.agencyId = user.agencyId
   
-      //获取建联单位
-      this.loadUnit()
       //获取活动类型
       this.activityType()
 
@@ -219,21 +232,35 @@
     },
   
     methods: {
+      getStatusText(status) {
+        switch (status) {
+          case 0:
+            return '未进行';
+          case 1:
+            return '进行中';
+          case 2:
+            return '已结束';
+          default:
+            return '';
+        }
+      },
       async listServerOrg() {
         const url = "/actual/base/serviceitem/listServerOrgNewTask";
+        // const url = "/actual/base/activityType/page";
         let params = {  
-          // serviceTypeId: "1037",
-          // serverOrgType: "1044",
-          // businessType: "party_unit",
           serverOrgCategoryCode: "",
           serverOrgType: "party_unit",
           serverParentOrgCategoryCode: ""
+          // "pageSize": 20,
+          // "pageNo": 1,
+          // "typeName": "",
+          // "enabled": 0
         };
 
         let { data, code, msg } = await requestPost(url, params);
         if (code == 0) {
           this.corganizerList = data;
-          // console.log("datadata",this.corganizerList)
+          // console.log("corganizerList",this.corganizerList)
         } else if (code >= 8000) {
           this.$message.error(msg);
         }
@@ -251,19 +278,19 @@
            if (code === 0) {
           this.total = data.total
           this.tableData = data.list
-          console.log("datadatadata",this.tableData)
+          // console.log("datadatadata",this.tableData)
         } else {
           this.$message.error(msg)
         }
       },
 
-      handleCateCHange(val) {
-        if (val.length === 2) {
-          this.formData.serviceMatter = val[1];
-        } else {
-          this.formData.serviceMatter = val[0];
-        }
-      },
+      // handleCateCHange(val) {
+      //   if (val.length === 2) {
+      //     this.formData.serviceMatter = val[1];
+      //   } else {
+      //     this.formData.serviceMatter = val[0];
+      //   }
+      // },
       async getDemandOptions() {
         this.$http
           .post("/actual/base/serviceitem/listAllCategory")
@@ -294,7 +321,6 @@
         return arr;
       },
       handleSearch () {
-        // this.loadTable()
         this.communityActivityList()
       },
       async loadGrid () {
@@ -314,19 +340,7 @@
         }
   
       },
-  
-      async loadUnit () {
-        const url = "/actual/base/icpartyunit/option"
-        let params = {
-          agencyId: this.agencyId
-        }
-        const { data, code, msg } = await requestPost(url, params)
-        if (code === 0) {
-          this.unitList = data
-        } else {
-          this.$message.error(msg)
-        }
-      },
+
 
       async activityType () {
         const url = "/actual/base/activityType/page"
@@ -373,36 +387,37 @@
         })
       },
   
-      handleAdd () {
-        this.formTitle = '新增'
+      // handleAdd () {
+      //   this.formTitle = '新增'
   
-        this.formShow = true
+      //   this.formShow = true
+      //   this.$nextTick(() => {
+      //     this.$refs.ref_form.initForm('add', null)
+      //   })
+      // },
+      handleAdd () {
+        this.formTitle = '活动记录'
+        this.initShow = true
+        // this.formShow = true
         this.$nextTick(() => {
-          this.$refs.ref_form.initForm('add', null)
+          this.$refs.ref_form.initForm('records', null)
         })
       },
-      handleInitAdd () {
-        this.formTitle = '新增'
-  
+      handleInitAdd (e) {
+        this.formTitle = '发起活动'
         this.initShow = true
         this.$nextTick(() => {
           this.$refs.ref_form.initForm('add', null)
+          // this.$refs.ref_detail.initForm(row)
         })
       },
-      // startProcess () {
-      //   this.formTitle = '新增'
-  
-      //   this.formShow = true
-      //   this.$nextTick(() => {
-      //     this.$refs.ref_form.initForm('add', null)
-      //   })
-      // },
-  
       handleEdit (row) {
         this.formTitle = '修改'
-        this.formShow = true
+        // this.formShow = true
+        this.initShow = true
         this.$nextTick(() => {
-          this.$refs.ref_form.initForm('edit', row.id)
+          // this.$refs.ref_form.initForm('edit', row.id)
+          this.$refs.ref_form.initForm('edit', row)
         })
       },
   
@@ -471,7 +486,7 @@
         this.timeRange = []
         this.formData = {
           activityName: "",
-          status: 0,
+          status: "",
           typtId: "",
           startTime: "",
           endTime: "",
diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
index 56fef782f..d53511b1e 100644
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -4,8 +4,8 @@
         <div class="dialog-h-content scroll-h">
             <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
                 class="form">
-                <el-form-item label="活动类型" label-width="150px" prop="gridId">
-                    <el-select class="item_width_1" v-model.trim="formData.gridId" placeholder="请选择" clearable>
+                <el-form-item label="活动类型" label-width="150px" prop="typeId">
+                    <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
                         <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
                             :value="item.typeName">
                         </el-option>
@@ -17,7 +17,7 @@
                         class="u-item-width-normal"></el-input>
                 </el-form-item>
 
-                <el-form-item label="活动时间" prop="timeRange" label-width="130px">
+                <el-form-item label="活动时间" prop="startTime" label-width="130px">
                     <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
                         value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至"
                         start-placeholder="开始时间" end-placeholder="结束时间">
@@ -25,33 +25,35 @@
                 </el-form-item>
 
                 <!-- <el-form-item label="协办方" prop="assistingParty" label-width="150px">
-                    <el-cascader v-model.trim="formData.assistingParty" :options="corganizerList"
-                        :props="{ label: 'label', value: 'name', multiple: true, emitPath: false }"
-                        clearable collapse-tags size="small" class="u-item-width-normal"></el-cascader>
-                </el-form-item> -->
-
-                <el-form-item label="协办方" prop="assistingParty" label-width="150px">
                     <el-cascader v-model.trim="formData.assistingParty" :options="corganizerList"
                         :props="{ label: 'label', value: 'name'}" clearable collapse-tags size="small"
                         class="u-item-width-normal"></el-cascader>
+                </el-form-item> -->
+                <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                    <el-select class="u-item-width-normal" v-model.trim="formData.assistingParty" placeholder="请选择"
+                        clearable>
+                        <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name"
+                            class="u-item-width-normal">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
 
-                <el-form-item label="活动封面图" label-width="140px" prop="fileList" >
+                <el-form-item label="活动封面图" label-width="140px" prop="coverPic">
                     <template>
-                        <upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"></upload-image>
+                        <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"></upload-image>
                     </template>
                 </el-form-item>
 
-
-                <el-form-item label="活动内容" prop="contentt" label-width="150px" style="display: block">
+                <el-form-item label="活动内容" prop="content" label-width="150px" style="display: block">
                     <div class="item_width_1">
-                        <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
-                            :height="250" placeholder="在这里输入文字" />
-                        <p v-else class="text_p" v-html="formData.content"></p>
+                        <!-- <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
+                            :height="250" placeholder="在这里输入文字" /> -->
+                        <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.content">
+                        </el-input>
                     </div>
                 </el-form-item>
 
-                <el-form-item label="活动地点" prop="searchValue" label-width="150px" style="display: block">
+                <el-form-item label="活动地点" prop="address" label-width="150px" style="display: block">
                     <div style="width: 500px">
                         <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
                             :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
@@ -65,10 +67,48 @@
                 </el-form-item>
 
                 <el-form-item label="线上报名" style="display: block" prop="peopleCount" label-width="150px">
-                    <el-switch v-model="formData.online" @change="handleOnlineRegistration"></el-switch>
-                    <!-- <el-switch v-model="formData.isOn" active-text="已报名" inactive-text="未报名" @change="handleOnlineRegistration"></el-switch> -->
+                    <el-switch v-model="online" @change="handleOnlineRegistration"></el-switch>
                 </el-form-item>
 
+                <div v-if="records">
+                    <div v-if="!online">
+                        <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
+                            <div class="item_width_1">
+                                <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
+                                </el-input>
+                            </div>
+                        </el-form-item>
+
+                        <!-- <el-form-item label="活动照片" label-width="140px">
+                            <template>
+                                <upload-image :defaultFileList="activityImgs" :limit="6"
+                                    @change="onChangeImgs"></upload-image>
+                            </template>
+                        </el-form-item> -->
+
+                        <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
+                            <div>
+                                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                                    :data="{ customerId: customerId }" :show-file-list="true"
+                                    :file-list="formData.activityImgs" :on-preview="handleImgPreview"
+                                    :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                                    :on-exceed="handleImgExceed" :before-upload="beforeImgUpload"
+                                    list-type="picture-card" :limit="3">
+                                    <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
+                            </div>
+                            <div>
+                                <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
+                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img"
+                                        alt="照片" style="width: 150px; margin-right: 10px;">
+                                </div>
+                                <div v-else>
+                                    暂无照片
+                                </div>
+                            </div>
+                        </el-form-item>
+                    </div>
+                </div>
+
                 <div v-if="online">
                     <el-form-item label="报名截止时间" label-width="140px" prop="cutOffTime">
                         <el-date-picker v-model.trim="formData.cutOffTime" type="date" value-format="yyyy-MM-dd"
@@ -115,6 +155,7 @@ import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
 import Tinymce from '@c/tinymce2/index.vue'
 import daiMap from "@/utils/dai-map";
+import util from '@js/util.js';
 // import UploadImage from './upload-image.vue'
 import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
 
@@ -129,24 +170,8 @@ export default {
     data() {
         let initFormData = () => {
             let _form = {
-                // gridId: '',
-                // serviceMatter: '',//服务事项
-                // serviceMatterList: [],
-                // unitId: '',//单位ID
-                // unitIdList: [],
-                // title: '',//活动标题
-                // target: '',//活动目标
-                // content: '',//活动内容
-                // activityTime: '',//活动时间
-                // peopleCount: 0,//服务人数
-                // result: '', //活动结果
-                // address: '', //详细地址
-                // endDate: '',
-                // longitude: this.$store.state.user.longitude, //经度
-                // latitude: this.$store.state.user.latitude,//纬度
-
-                id: "1790263323837440002",
-                typeId: "1111111111",
+                id: "",
+                typeId: "",
                 activityName: "",//活动名称
                 status: 0,//状态
                 assistingParty: "",//协办方
@@ -163,14 +188,17 @@ export default {
                 sumUp: "",//活动总结
                 activityImgs: [],//图片列表
                 longitude: this.$store.state.user.longitude, //经度
-                latitude: this.$store.state.user.latitude//纬度
+                latitude: this.$store.state.user.latitude,//纬度
+                imgList:[]
             }
 
             return _form
         }
         return {
-            fileList: [],//图片
-            formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+            fileList: [],//封面图片
+            activityImgs:[],//活动照片
+            formType: 'add', //表单操作类型 add新增，edit编辑,records记录
+            records:false,
             searchOptions: [],
             searchValue: '',
             resultList: [],
@@ -190,7 +218,9 @@ export default {
 
             demandOptions: [],
             typeList: [],
-            corganizerList: []
+            corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
 
         }
     },
@@ -202,6 +232,67 @@ export default {
     },
 
     methods: {
+        // 上传成功
+        handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                // this.formData.activityImgs.push({
+                //     format,
+                //     name: file.name,
+                //     size: file.size,
+                //     type,
+                //     url: res.data.url
+                // });
+                this.formData.activityImgs.push(res.data.url);
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.formData.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+                this.formData.activityImgs.splice(index, 1);
+            }
+        },
+        // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过三个'
+            });
+        },
+        // 上传前的验证
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
         async listServerOrg() {
             const url = "/actual/base/serviceitem/listServerOrgNewTask";
             let params = {
@@ -236,26 +327,57 @@ export default {
         },
 
         handleOnlineRegistration(value) {
-            console.log(value)
+            // console.log(value)
             if (value) {
                 this.online = true;
+                this.formData.online = 1;
             } else {
                 this.online = false;
+                this.formData.cutOffTime = ''
+                this.formData.online = 0;
             }
         },
 
         onChangeFileList(e) {
-            console.log('onChangeFileList', e)
             if (e.length > 0) {
                 let item = e[0];
                 let ob = {
                     fileType: '0',
                     fileUrl: item.response.data.url
                 };
-                this.formData.coverPic = [ob];
+                this.fileList = [ob];
+                this.formData.coverPic = ob.fileUrl;
             }
         },
 
+        onChangeImgs(e, rowIndex = 0) {
+            console.log('onChangeFileList', e)
+            if (e.length > 0) {
+                this.activityImgs = []
+                e.forEach(item => {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: item.response.data.url
+                    }
+                    this.activityImgs.push(ob)
+                })
+            }
+        },
+
+        // onChangeImgs(e) {
+        //     this.activityImgs = [];
+        //     if (e.length > 0) {
+        //         e.forEach(item => {
+        //             let ob = {
+        //                 fileType: '0',
+        //                 fileUrl: item.response.data.url
+        //             };
+        //             this.activityImgs.push(ob);
+        //         });
+        //         console.log('this.activityImgs',this.activityImgs)
+        //     }
+        // },
+
         handleChange(value) {
             console.log(value);
         },
@@ -266,7 +388,6 @@ export default {
 
                 this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
                 this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
-
                 // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
                 // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
             } else {
@@ -276,33 +397,73 @@ export default {
 
         },
 
+         // async initForm(row) {
+        //     this.startLoading();
+        //     this.formData = JSON.parse(JSON.stringify(row));
+        //     this.initLoading = true;
+        //     console.log('this.formData,',this.formData);
+
+        //     let { latitude, longitude } = this.$store.state.user;
+        //     console.log("lat" + latitude + ",lon" + longitude);
+        //     if (this.formData.latitude && this.formData.longitude) {
+        //         latitude = this.formData.latitude;
+        //         longitude = this.formData.longitude;
+        //     }
+        //     if (!latitude || latitude == "" || latitude == "0") {
+        //         latitude = 39.9088810666821;
+        //         longitude = 116.39743841556731;
+        //     }
+        //     this.endLoading();
+        // },
         async initForm(type, activityId) {
             this.startLoading()
-            this.$refs.ref_form.resetFields();
-
-
-            //获取服务事项
-            await this.getDemandOptions()
-
-            let { latitude, longitude } = this.$store.state.user;
-
+            console.log("啊实打实的", type, activityId)
             this.formType = type
-            if (activityId) {
-                this.activityId = activityId
-                this.formData.id = activityId
-                await this.loadFormData()
-            } else {
-                this.formData.latitude = latitude
-                this.formData.longitude = longitude
-            }
-            this.$nextTick(() => {
-                if (!map) {
-                    this.initMap(this.formData.latitude, this.formData.longitude);
-                } else {
-                    map.setCenter(this.formData.latitude, this.formData.longitude);
-                    map.setMarker(this.formData.latitude, this.formData.longitude);
+            if (type === 'edit') {
+                if(activityId.activityImgs || activityId.sumUp){
+                    this.records = true
                 }
-            })
+                // this.records = false
+                this.formData = activityId
+                this.timeRange = [this.formData.startTime, this.formData.endTime]
+                if (activityId.coverPic) {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: activityId.coverPic
+                    };
+                    this.fileList = [ob];
+                    this.formData.coverPic = ob.fileUrl;
+                    if(this.formData.online == 1){
+                        this.online = true
+                    }
+                }
+                // this.$refs.ref_form.resetFields();
+
+
+                // //获取服务事项
+                // await this.getDemandOptions()
+
+                // let { latitude, longitude } = this.$store.state.user;
+                // if (activityId) {
+                //     this.activityId = activityId
+                //     this.formData.id = activityId
+                //     await this.loadFormData()
+                // } else {
+                //     this.formData.latitude = latitude
+                //     this.formData.longitude = longitude
+                // }
+                this.$nextTick(() => {
+                    if (!map) {
+                        this.initMap(this.formData.latitude, this.formData.longitude);
+                    } else {
+                        map.setCenter(this.formData.latitude, this.formData.longitude);
+                        map.setMarker(this.formData.latitude, this.formData.longitude);
+                    }
+                })
+            }else if (type === 'records') {
+                this.records = true
+            }
+            
             this.endLoading()
 
         },
@@ -332,7 +493,6 @@ export default {
                     return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
                 else return item;
             });
-            // console.log('arrr-oppp', arr2)
             return arr2;
         },
         getTreeData(data) {
@@ -381,15 +541,12 @@ export default {
 
             if (code === 0) {
                 this.formData = data
-                console.log(this.formData.content)
                 let style_img = "style='width:50px;height:40px;' "
 
                 if (this.formData.content) {
                     // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
                     // let array=this.formData.content.split('<img')
-
                 }
-                console.log(this.formData.content)
 
             } else {
                 this.$message.error(msg)
@@ -401,31 +558,53 @@ export default {
             setTimeout(() => {
                 this.btnDisable = false
             }, 10000)
+            console.log("data/actual/base/communityActivity/save",this.formData)
             this.$refs['ref_form'].validate((valid, messageObj) => {
-                if (!valid) {
+                const dateObj = this.formData.startTime.split(' ');
+                const formattedDate = dateObj[0]; // 获取日期部分，即 '2424-10-22'
+                if(this.formData.cutOffTime  !=  '' && formattedDate <= this.formData.cutOffTime){
+                    this.$message.error('报名截止时间要小于活动开始时间')
+                }else  if (!valid) {
                     app.util.validateRule(messageObj)
                     this.btnDisable = false
-                } else {
+                } else{
                     this.addActivity()
                 }
             })
         },
         async addActivity() {
-            let url = '/actual/base/communityActivity/save'
-            const { data, code, msg } = await requestPost(url, this.formData)
-            console.log("data/actual/base/communityActivity/save",data)
-            if (code === 0) {
-                this.$message({
-                    type: 'success',
-                    message: '操作成功'
-                })
-                this.resetData()
-                this.$emit('dialogOk')
-                this.btnDisable = false
-            } else {
-                this.btnDisable = false
-                this.$message.error(msg)
+            if (this.formType === 'edit') {
+                let url = '/actual/base/communityActivity/update'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            }else{
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
             }
+            
 
         },
 
@@ -476,6 +655,7 @@ export default {
                 this.formData.address = data.address
                 this.searchValue = data.address
                 this.searchOptions = []
+                console.log('data,this.searchValue ',this.searchValue )
 
             }
         },
@@ -522,14 +702,17 @@ export default {
         },
 
         resetData() {
+            this.timeRange = []
+            this.fileList = []
             this.searchValue = ''
             this.searchOptions = []
             this.resultList = []
             this.activityId = ''
             this.keyWords = ''
+            this.online = false
             this.formData = {
-                id: "1790263323837440002",
-                typeId: "1111111111",
+                id: "",
+                typeId: "",
                 activityName: "",//活动名称
                 status: 0,//状态
                 assistingParty: "",//协办方
@@ -572,19 +755,19 @@ export default {
                 activityName: [
                     { required: true, message: '活动名称不能为空', trigger: 'blur' }
                 ],
-                gridId:[
+                typeId:[
                     { required: true, message: '请选择活动类型', trigger: 'blur' }
                 ],
-                timeRange:[
+                startTime:[
                     { required: true, message: '请选择活动时间', trigger: 'blur' }
                 ],
-                fileList:[
+                coverPic:[
                     { required: true, message: '请选择活动封面图', trigger: 'blur' }
                 ],
-                contentt: [
+                content: [
                     { required: true, message: '活动内容不能为空', trigger: 'blur' }
                 ],
-                searchValue: [
+                address: [
                     { required: true, message: '请选择活动地点', trigger: 'blur' }
                 ],
                 longitude: [
@@ -595,6 +778,12 @@ export default {
                 ],
                 points: [
                     { required: true, message: '请选择活动积分', trigger: 'blur' }
+                ],
+                sumUp: [
+                    { required: true, message: '请输入活动总结', trigger: 'blur' }
+                ],
+                activityImgs: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
                 ]
             }
         },
@@ -602,10 +791,10 @@ export default {
     },
     props: {
 
-        unitList: {
-            type: Array,
-            default: []
-        },
+        // unitList: {
+        //     type: Array,
+        //     default: []
+        // },
         gridList: {
             type: Array,
             default: []
diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue
index c8e4fc6d4..d645966c2 100644
--- a/src/views/modules/workSys/typeActivity/index.vue
+++ b/src/views/modules/workSys/typeActivity/index.vue
@@ -1,18 +1,18 @@
 <template>
     <div class="g-main">
         <div class="m-search">
-            <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+            <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
                 <div>
 
 
-                    <el-form-item label="标签名称" prop="title">
-                        <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable
+                    <el-form-item label="标签名称" >
+                        <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable
                             placeholder="请输入">
                         </el-input>
                     </el-form-item>
 
-                    <el-form-item label="首页显示" prop="unitId">
-                        <el-select class="item_width_1" v-model.trim="formData.unitId" size="small" placeholder="请选择"
+                    <el-form-item label="首页显示">
+                        <el-select class="item_width_1" v-model.trim="enabled" size="small" placeholder="请选择"
                             clearable>
                             <el-option v-for="item in unitList" :key="item.value" :label="item.name"
                                 :value="item.value">
@@ -42,7 +42,7 @@
 
                 <el-table-column label="序号" header-align="center" align="center" type="index"
                     width="80"></el-table-column>
-                <el-table-column prop="unitName" header-align="center" align="center" label="类型名称" width="380">
+                <el-table-column prop="typeName" header-align="center" align="center" label="类型名称" width="380">
                 </el-table-column>
                 
                 <el-table-column prop="peopleCount" header-align="center" align="center" label="创建时间" width="380">
@@ -54,13 +54,13 @@
 
                         <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
                             @click="handleDetail(scope.row)">查看</el-button>
-                        <el-button v-if="agencyId===scope.row.agencyId&&!scope.row.actId" type="text"
+                        <el-button type="text"
                             style="color:#00A7A9;text-decoration: underline;" size="small"
                             @click="handleEdit(scope.row)">修改</el-button>
 
-                        <el-button v-if="agencyId===scope.row.agencyId" type="text"
+                        <!-- <el-button type="text"
                             style="color:#D51010;text-decoration: underline;" size="small"
-                            @click="handleDelete(scope.row)">删除</el-button>
+                            @click="handleDelete(scope.row)">删除</el-button> -->
                     </template>
                 </el-table-column>
             </el-table>
@@ -80,18 +80,17 @@
         </el-dialog>
 
         <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false"
-            :title="'活动详情'" width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
-            <event-details ref="ref_detail" :serviceList="serviceList" :gridList="gridList"
-                @diaDetailClose="detailClosed"></event-details>
+            :title="'活动详情'" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
+            <type-details ref="ref_detail"  :gridList="gridList"
+            @dialogCancle="addFormQ"></type-details>
         </el-dialog>
-
     </div>
 </template>
 
     <script>
 
     import typeActivityadd from './typeActivityadd'
-    import eventDetails from '../../communityParty/activity/eventDetails'
+    import typeDetails from './typeDetails'
     import util from '@js/util.js';
     import { requestPost,requestGet } from "@/js/dai/request";
     import { mapGetters } from 'vuex'
@@ -108,190 +107,55 @@
           tableLoading: false,
           agencyId: '',
           gridList: [],//所属网格
-          unitList: [{value:'是',name:'是',id:'1'},{value:'否',name:'否',id:'2'}],//单位list
-          corganizerList:[],//协办方list
-          serviceList: [
-            {
-              id: "1",
-              name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
-            },
-            {
-              id: "2",
-              name: '积极配合'
-            },
-            {
-              id: "3",
-              name: '积极配合社区安全巡查员进行'
-            },
-            {
-              id: "4",
-              name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
-            },
-          ],//服务list
-          pickerOptions: { //控制时间范围
-            disabledDate (time) {
-              return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
-            }
-          },
-    
-          timeRange: [],
-          unitId: '',
-          formData: {
-            unitId: '',
-            xbf:'',
-            title: '',
-            serviceMatter:"",
-            startTime: '',
-            endTime: '',
-            gridId: ''
-          },
-    
-    
-          tableData: [],
-    
+          typeName:'',
+          enabled:'',
           //form相关
           formShow: false,
           formTitle: '新增活动',
           detailShow: false,
-    
-          files: "",
-          fileName: "",
-          uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
-          searchdemandOptions:[],
-          detail:{}
         }
       },
       components: {
-        typeActivityadd, eventDetails
+        typeActivityadd, typeDetails
       },
       async created () {
     
       },
       async mounted () {
         //获取服务事项
-        await this.getDemandOptions()
+        // await this.getDemandOptions()
     
         const { user } = this.$store.state
         this.agencyId = user.agencyId
     
         //获取建联单位
         // this.loadUnit()
-        this.loadGrid()
+        // this.loadGrid()
         //获取网格下拉框数据
-        this.loadTable()
-  
-        this.listServerOrg()
-    
+        this.loadTable()    
       },
     
       methods: {
-        async listServerOrg() {
-          const url = "/actual/base/serviceitem/listServerOrgNewTask";
-          let params = {  
-            // serviceTypeId: "1037",
-            // serverOrgType: "1044",
-            // businessType: "party_unit",
-            serverOrgCategoryCode: "",
-            serverOrgType: "party_unit",
-            serverParentOrgCategoryCode: ""
-          };
-  
-          let { data, code, msg } = await requestPost(url, params);
-          if (code == 0) {
-            this.corganizerList = data;
-            console.log("datadata",this.corganizerList)
-          } else if (code >= 8000) {
-            this.$message.error(msg);
-          }
-        },
-  
-        handleCateCHange(val) {
-          if (val.length === 2) {
-            this.formData.serviceMatter = val[1];
-          } else {
-            this.formData.serviceMatter = val[0];
-          }
-        },
-        async getDemandOptions() {
-          this.$http
-            .post("/actual/base/serviceitem/listAllCategory")
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                return this.$message.error(res.msg);
-              } else {
-                this.searchdemandOptions = this.getTreeData(res.data);
-              }
-            })
-            .catch(() => {
-              return this.$message.error("网络错误");
-            });
-        },
-        getTreeData(data) {
-          if (!Array.isArray(data)) return [];
-          let arr = data.map((item) => {
-            let _item = {};
-            if (item.childCateList) {
-              if (item.childCateList.length === 0)
-                _item = { ...item, childCateList: undefined };
-              else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
-            } else {
-              _item = { ...item };
-            }
-            return _item;
-          });
-          return arr;
-        },
         handleSearch () {
           this.loadTable()
         },
-        async loadGrid () {
-          const url = "/gov/org/customergrid/gridoption"
-    
-          let params = {
-            agencyId: this.agencyId
-          }
-    
-          const { data, code, msg } = await requestPost(url, params)
-    
-          if (code === 0) {
-            this.gridList = data
-    
-          } else {
-            this.$message.error(msg)
-          }
-    
-        },
-    
-        //获取服务事项下拉框
-        async loadService () {
-          const url = "/actual/base/serviceitem/dict-list"
-          let params = {
-            // parentCategoryCode: '1010'
-          }
-    
-          const { data, code, msg } = await requestPost(url, params)
-    
-          if (code === 0) {
-            this.serviceList = data
-    
-          } else {
-            this.$message.error(msg)
-          }
-    
-        },
         //展示表格
         async loadTable () {
           this.tableLoading = true
-          const url = "/actual/base/icpartyactivity/search"
-          // const url = "/actual/base/communityActivity/page"
+          const url = "/actual/base/activityType/page"
           let params = {
-            agencyId: this.agencyId,
-            pageSize: this.pageSize,
-            pageNo: this.pageNo,
-            ...this.formData
+            // agencyId: this.agencyId,
+            // pageSize: this.pageSize,
+            // pageNo: this.pageNo,
+            // ...this.formData
+            pageSize: 20,
+            pageNo: 1,
+            typeName: this.typeName,
+            enabled: 0
           }
           const { data, code, msg } = await requestPost(url, params)
           if (code === 0) {
+            // console.log("啊倒萨打算",data)
             this.total = data.total
             this.tableData = data.list
           } else {
@@ -304,13 +168,13 @@
     
         diaClose () {
     
-          this.$refs.ref_form.resetData()
+          // this.$refs.ref_form.resetData()
           this.formShow = false
         },
     
         detailClosed () {
           console.log(this.$refs.ref_detail)
-          this.$refs.ref_detail.diaDestroy()
+          // this.$refs.ref_detail.diaDestroy()
           this.detailShow = false
         },
     
@@ -330,29 +194,23 @@
     
           this.formShow = true
           this.$nextTick(() => {
-            this.$refs.ref_form.initForm('add', null)
+            // this.$refs.ref_form.initForm('add', null)
           })
         },
-        // startProcess () {
-        //   this.formTitle = '新增'
-    
-        //   this.formShow = true
-        //   this.$nextTick(() => {
-        //     this.$refs.ref_form.initForm('add', null)
-        //   })
-        // },
-    
         handleEdit (row) {
           this.formTitle = '修改'
           this.formShow = true
           this.$nextTick(() => {
-            this.$refs.ref_form.initForm('edit', row.id)
+            this.$refs.ref_form.initForm(row)
           })
         },
     
         addFormCancle () {
           this.formShow = false
         },
+        addFormQ(){
+          this.detailShow = false
+        },
         addFormOk () {
           this.formShow = false
           this.loadTable()
@@ -401,137 +259,10 @@
     
         //重置搜索条件
         resetSearch () {
-          this.timeRange = []
-          this.formData = {
-            gridId: '',
-            unitName: '',
-            serviceMatter: '',
-            type: '',
-            contact: '',
-            contactMobile: ''
-          }
-          this.pageSize = 10
-          this.pageNo = 0
+          this.typeName = ''
           this.loadTable()
         },
-    
-        //导出表格
-        async handleExport () {
-          let title = '联建活动列表'
-    
-          const url = "/heart/icpartyactivity/export"
-          let params = {
-            agencyId: this.agencyId,
-    
-            ...this.formData
-    
-          }
-    
-          app.ajax.exportFilePost(
-            url,
-            params,
-            (data, rspMsg) => {
-    
-              this.download(data, title + '.xls')
-            },
-            (rspMsg, data) => {
-              this.$message.error(rspMsg);
-            }
-          );
-    
-        },
-    
-        // 下载文件
-        download (data, fileName) {
-          if (!data) {
-            return
-          }
-    
-          var csvData = new Blob([data])
-    
-          if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-            window.navigator.msSaveOrOpenBlob(csvData, fileName);
-          }
-          // for Non-IE (chrome, firefox etc.)
-          else {
-            var a = document.createElement('a');
-            document.body.appendChild(a);
-            a.style = 'display: none';
-            var url = window.URL.createObjectURL(csvData);
-            a.href = url;
-            a.download = fileName;
-            a.click();
-            a.remove();
-            window.URL.revokeObjectURL(url);
-          }
-    
-        },
-    
-        // 上传文件之前的钩子
-        beforeUpload (file) {
-          this.files = file;
-    
-          const isText = file.type === 'application/vnd.ms-excel'
-          const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-    
-          if (!isText && !isTextComputer) {
-            this.$message.error('请选择正确格式的文件')
-            return false
-          } else {
-            this.fileName = file.name;
-            return true
-          }
-    
-        },
-        // 上传文件个数超过定义的数量
-        handleExceed (files, fileList) {
-          this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-        },
-    
-        async uploadFile () {
-          this.loading = true
-    
-          if (this.fileName == "") {
-            this.$message.warning('请选择要上传的文件！')
-            return false
-          }
-    
-          //清空上传列表
-          this.$refs['upload'].clearFiles()
-    
-          var url = '/heart/icpartyactivity/import'
-          let fileFormData = new FormData();
-          fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-    
-          const { data, code, msg } = await requestPost(url, fileFormData)
-          if (code === 0) {
-            this.$message({
-              type: "success",
-              message: "导入成功"
-            });
-    
-            this.loadTable()
-          } else {
-            this.$message.error(msg)
-          }
-    
-    
-        },
-    
-        handleTimeChange (time) {
-          if (time) {
-            const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
-            const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
-    
-            this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
-            this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
-          } else {
-            this.formData.startTime = ''
-            this.formData.endTime = ''
-          }
-    
-        },
-    
+
         handleSizeChange (val) {
           this.pageSize = val
           this.pageNo = 1
diff --git a/src/views/modules/workSys/typeActivity/typeActivityadd.vue b/src/views/modules/workSys/typeActivity/typeActivityadd.vue
index a17607484..0e2976a5e 100644
--- a/src/views/modules/workSys/typeActivity/typeActivityadd.vue
+++ b/src/views/modules/workSys/typeActivity/typeActivityadd.vue
@@ -2,25 +2,23 @@
     <div>
   
       <div class="dialog-h-content scroll-h">
-        <el-form ref="ref_form" :inline="true"  :rules="dataRule" :disabled="formType === 'detail'"
+        <el-form ref="ref_form" :inline="true"  :rules="dataRule"
           class="form">
 
-          <el-form-item label="活动地点" prop="longitude" label-width="150px" style="display: block">
+          <el-form-item label="活动类型" label-width="150px" style="display: block">
             <div style="width: 500px">
-              <el-input v-model.trim="searchValue" size="small" class="item_width_1" clearable placeholder="请输入">
+              <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
                 </el-input>
             </div>
           </el-form-item>
-  
         </el-form>
       </div>
   
       <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">确
+        <!-- <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确
           定</el-button> -->
-
-          <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable">确
+          <el-button size="small" type="primary" @click="handleComfirm">确
           定</el-button>
       </div>
     </div>
@@ -45,7 +43,8 @@
     export default {
       data () {
         return {
-          searchValue: ''
+          typeName: '',
+          marde:''
     
         }
       },
@@ -56,41 +55,74 @@
       },
     
       methods: { 
+        async initForm(activityId){
+          console.log('activityIddetailShow',activityId)
+          if(activityId !== ''){
+            this.marde = 'edi'
+            this.id = activityId.id
+            this.typeName = activityId.typeName
+          }
+
+            
+        },
         async handleComfirm () {
-          this.btnDisable = true
+          // this.btnDisable = true
           setTimeout(() => {
-            this.btnDisable = false
-          }, 10000)
-          this.$refs['ref_form'].validate((valid, messageObj) => {
-            if (!valid) {
-              app.util.validateRule(messageObj)
-              this.btnDisable = false
-            } else {
+            // this.btnDisable = false
+          }, 100)
+            if (this.typeName === '') {
+              this.$message.error('活动类型不能为空')
+            }else {
               this.addActivity()
             }
     
-          })
-    
         },
         async addActivity () {
-          let url = '/actual/base/icpartyactivity/save'
-          // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
-    
-    
-          const { data, code, msg } = await requestPost(url, this.formData)
-    
-          if (code === 0) {
-            this.$message({
-              type: 'success',
-              message: '操作成功'
-            })
-            this.resetData()
-            this.$emit('dialogOk')
-            this.btnDisable = false
-          } else {
-            this.btnDisable = false
-            this.$message.error(msg)
+          if (this.marde === 'edi') {
+            let url = '/actual/base/activityType/update'
+            let parmer = {
+              typeName: this.typeName,
+              enabled: 0,
+              // id: this.id
+            }
+            const { data, code, msg } = await requestPost(url, parmer)
+
+            if (code === 0) {
+              this.$message({
+                type: 'success',
+                message: '操作成功'
+              })
+              this.resetData()
+              this.$emit('dialogOk')
+              // this.btnDisable = false
+            } else {
+              // this.btnDisable = false
+              this.$message.error(msg)
+            }
+          }else{
+            let url = '/actual/base/activityType/save'
+            // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
+            let parmer = {
+              typeName: this.typeName,
+              enabled: 0
+            }
+
+            const { data, code, msg } = await requestPost(url, parmer)
+
+            if (code === 0) {
+              this.$message({
+                type: 'success',
+                message: '操作成功'
+              })
+              this.resetData()
+              this.$emit('dialogOk')
+              // this.btnDisable = false
+            } else {
+              // this.btnDisable = false
+              this.$message.error(msg)
+            }
           }
+          
     
         },
     
@@ -102,9 +134,8 @@
         },
     
         resetData () {
-          this.formData = {
-            gridId: '',
-          }
+          this.typeName = '',
+          this.marde = ''
     
         },
         // 开启加载动画
@@ -126,25 +157,15 @@
       computed: {
         dataRule () {
           return {
-            longitude: [
-              { required: true, message: '活动地点不能为空', trigger: 'blur' }
+            small: [
+              { required: true, message: '活动类型不能为空', trigger: 'blur' }
             ]
           }
         },
     
       },
       props: {
-    
-        unitList: {
-          type: Array,
-          default: []
-        },
-        gridList: {
-          type: Array,
-          default: []
-        },
-    
-    
+       
       }
     }
     </script>
diff --git a/src/views/modules/workSys/typeActivity/typeDetails.vue b/src/views/modules/workSys/typeActivity/typeDetails.vue
new file mode 100644
index 000000000..71eb552fb
--- /dev/null
+++ b/src/views/modules/workSys/typeActivity/typeDetails.vue
@@ -0,0 +1,163 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
+
+                <el-form-item label="活动类型" label-width="150px" style="display: block">
+                    <div style="width: 500px">
+                        <span>{{ typeName }}</span>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+        </div>
+    </div>
+</template>
+    
+    <script>
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost } from '@/js/dai/request'
+    import Tinymce from '@c/tinymce2/index.vue'
+    import daiMap from "@/utils/dai-map";
+    // import UploadImage from './upload-image.vue'
+    import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+    
+    var map
+    var search
+    var markers
+    var infoWindowList
+    var geocoder // 新建一个正逆地址解析类
+    
+    let loading // 加载动画
+    export default {
+      data () {
+        return {
+          typeName: ''
+    
+        }
+      },
+      components: { Tinymce,UploadImage },
+      mounted () {
+        // this.initMap()
+    
+      },
+    
+      methods: { 
+          handleCancle() {
+
+              this.resetData()
+              this.$emit('dialogCancle')
+
+          },
+
+          resetData() {
+              this.typeName = '',
+                  this.marde = ''
+
+          },
+          async handleComfirm() {
+              // this.btnDisable = true
+            //   setTimeout(() => {
+            //       // this.btnDisable = false
+            //   }, 100)
+            //   if (this.typeName === '') {
+            //       this.$message.error('活动类型不能为空')
+            //   } else {
+            //       this.addActivity()
+            //   }
+
+          },
+          async initForm(activityId) {
+              this.typeName = activityId.typeName
+          },
+          handleComfirm() {
+            //   this.resetData()
+              this.$emit('dialogCancle')
+
+          },
+          resetData() {
+              this.typeName = ''
+
+          },
+        // 开启加载动画
+        startLoading () {
+          loading = Loading.service({
+            lock: true, // 是否锁定
+            text: '正在加载……', // 加载中需要显示的文字
+            background: 'rgba(0,0,0,.7)' // 背景颜色
+          })
+        },
+        // 结束加载动画
+        endLoading () {
+          // clearTimeout(timer);
+          if (loading) {
+            loading.close()
+          }
+        }
+      },
+      computed: {
+        dataRule () {
+          return {
+            small: [
+              { required: true, message: '活动类型不能为空', trigger: 'blur' }
+            ]
+          }
+        },
+    
+      },
+      props: {
+       
+      }
+    }
+    </script>
+    
+    
+    <style lang="scss" scoped >
+    @import "@/assets/scss/modules/visual/communityManageForm.scss";
+    </style>
+    <style  lang="scss" scoped>
+    .item_width_1 {
+      width: 560px;
+    
+      /deep/.tox .tox-dialog {
+        z-index: 20000;
+      }
+    }
+    .tinymce_view {
+      ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+      }
+    }
+    
+    .div_map {
+      position: relative;
+    }
+    .div_searchmap {
+      z-index: 5000;
+      position: absolute;
+      top: 5px;
+      left: 5px;
+    }
+    
+    .tinymce_view {
+      height: 400px;
+      overflow: auto;
+    }
+    .text_p {
+      margin: 0;
+      padding: 0 10px;
+      border: 1px solid #d9d9d9;
+      border-radius: 5px;
+      > p {
+        margin: 0;
+      }
+    }
+    </style>
+    
+    
+        
\ No newline at end of file

From f2a4004b0ba93efd5877a0b9f61c71fb820f7dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Tue, 28 May 2024 18:00:34 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A80.5,?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=861?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/activity/index.vue |  84 ++--
 .../activity/initiateActivity.vue             |  17 +-
 .../communityParty/activity/summDetails.vue   | 360 ++++++++++++++++++
 .../modules/workSys/typeActivity/index.vue    |  39 +-
 .../workSys/typeActivity/typeActivityadd.vue  |  84 ++--
 .../workSys/typeActivity/typeDetails.vue      |  37 +-
 6 files changed, 516 insertions(+), 105 deletions(-)
 create mode 100644 src/views/modules/communityParty/activity/summDetails.vue

diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index fd2cc4ef9..b48fde690 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -4,9 +4,9 @@
       <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
         <div>
 
-          <el-form-item label="活动类型" prop="typtId">
-            <el-select class="item_width_1" v-model.trim="formData.typtId" size="small" placeholder="全部" clearable>
-              <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.typeName">
+          <el-form-item label="活动类型" prop="typeId">
+            <el-select class="item_width_1" v-model.trim="formData.typeId" size="small" placeholder="全部" clearable>
+              <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
@@ -63,7 +63,7 @@
           <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 活动记录</el-button>
         </div>
 
-        <el-button style="" class="diy-button--add" size="small">导出</el-button>
+        <!-- <el-button style="" class="diy-button--add" size="small">导出</el-button> -->
       </div>
 
       <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
@@ -94,7 +94,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" fixed="right" width="140" header-align="center" align="center" class="operate">
+        <el-table-column label="操作" fixed="right" width="180" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
 
             <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
@@ -104,13 +104,13 @@
               @click="handleEdit(scope.row)">编辑</el-button>
 
               <el-button type="text" v-if="scope.row.status == 2" style="color:#1C6AFD;text-decoration: underline;" size="small"
-              @click="handleEdit(scope.row)">活动总结</el-button>
+              @click="handleSumm(scope.row)">活动总结</el-button>
 
             <!-- <el-button  type="text"
               style="color:#00A7A9;text-decoration: underline;" size="small"
               @click="handleEdit(scope.row)">修改</el-button> -->
               
-            <el-button v-if="agencyId===scope.row.agencyId" type="text"
+            <el-button v-if="scope.row.status !== 2" type="text"
               style="color:#D51010;text-decoration: underline;" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
           </template>
@@ -142,12 +142,18 @@
       <event-details ref="ref_detail" :gridList="gridList" @diaDetailClose="detailClosed"></event-details>
     </el-dialog>
 
+    <el-dialog :visible.sync="summShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
+      width="950px" top="5vh" class="dialog-h" @closed="summDetailClose">
+      <summ-details ref="ref_detail" :gridList="gridList" @summDetailClose="summDetailClose"></summ-details>
+    </el-dialog>
+
   </div>
 </template>
   <script>
   
   import eventDetails from './eventDetails'
   import initiateActivity from './initiateActivity'
+  import summDetails from './summDetails'
   import util from '@js/util.js';
   import { requestPost,requestGet } from "@/js/dai/request";
   import { mapGetters } from 'vuex'
@@ -183,15 +189,14 @@
         formData: {
           activityName: "",
           status: "",
-          typtId: "",
+          typeId: "",
           startTime: "",
           endTime: "",
           address: "",
           assistingParty: ""
         },
-  
-  
         tableData: [],
+        summShow:false,
   
         //form相关
         formShow: false,
@@ -207,7 +212,7 @@
       }
     },
     components: {
-       eventDetails, initiateActivity
+       eventDetails, initiateActivity,summDetails
     },
     async created () {
   
@@ -283,14 +288,6 @@
           this.$message.error(msg)
         }
       },
-
-      // handleCateCHange(val) {
-      //   if (val.length === 2) {
-      //     this.formData.serviceMatter = val[1];
-      //   } else {
-      //     this.formData.serviceMatter = val[0];
-      //   }
-      // },
       async getDemandOptions() {
         this.$http
           .post("/actual/base/serviceitem/listAllCategory")
@@ -357,6 +354,7 @@
         } else {
           this.$message.error(msg)
         }
+        console.log("饿么么么么么",this.typeList)
       },
   
       diaClose () {
@@ -375,6 +373,11 @@
         this.$refs.ref_detail.diaDestroy()
         this.detailShow = false
       },
+      summDetailClose () {
+        // console.log('this.$refs.ref_detail关闭不了为什么')
+        // this.$refs.ref_detail.diaDestroy()
+        this.summShow = false
+      },
   
   
       handleDetail (row) {
@@ -386,6 +389,15 @@
           // this.$refs.ref_form.initForm('detail', row.id)
         })
       },
+      handleSumm(row){
+        this.summShow = true
+        this.formTitle = '总结'
+        // console.log('row',row)
+        this.$nextTick(() => {
+          this.$refs.ref_detail.initForm(row.id)
+          // this.$refs.ref_form.initForm('detail', row.id)    activityImgs   sumUp
+        })
+      },
   
       // handleAdd () {
       //   this.formTitle = '新增'
@@ -413,7 +425,6 @@
       },
       handleEdit (row) {
         this.formTitle = '修改'
-        // this.formShow = true
         this.initShow = true
         this.$nextTick(() => {
           // this.$refs.ref_form.initForm('edit', row.id)
@@ -459,26 +470,27 @@
       },
   
       async deleteActivity (row) {
-        const url = "/actual/base/icpartyactivity/delete"
+
+        // const url = "/actual/base/icpartyactivity/delete"//等待删除接口
         // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
   
-        let params = {
-          id: row.id
-        }
+        // let params = {
+        //   id: row.id
+        // }
   
-        const { data, code, msg } = await requestPost(url, params)
+        // const { data, code, msg } = await requestPost(url, params)
   
-        if (code === 0) {
-          this.$message({
-            type: "success",
-            message: "删除成功"
-          });
+        // if (code === 0) {
+        //   this.$message({
+        //     type: "success",
+        //     message: "删除成功"
+        //   });
   
-          // this.loadTable()
-          this.communityActivityList()
-        } else {
-          this.$message.error(msg)
-        }
+        //   // this.loadTable()
+        //   this.communityActivityList()
+        // } else {
+        //   this.$message.error(msg)
+        // }
       },
   
       //重置搜索条件
@@ -487,7 +499,7 @@
         this.formData = {
           activityName: "",
           status: "",
-          typtId: "",
+          typeId: "",
           startTime: "",
           endTime: "",
           address: "",
diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
index d53511b1e..09af43164 100644
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -7,7 +7,7 @@
                 <el-form-item label="活动类型" label-width="150px" prop="typeId">
                     <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
                         <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
-                            :value="item.typeName">
+                            :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -132,11 +132,6 @@
                         </el-checkbox-group>
                     </el-form-item>
                 </div>
-
-
-
-
-
             </el-form>
         </div>
 
@@ -189,7 +184,6 @@ export default {
                 activityImgs: [],//图片列表
                 longitude: this.$store.state.user.longitude, //经度
                 latitude: this.$store.state.user.latitude,//纬度
-                imgList:[]
             }
 
             return _form
@@ -228,6 +222,7 @@ export default {
     mounted() {
         this.activityType()
         this.listServerOrg()
+        // this.initForm()
 
     },
 
@@ -455,15 +450,19 @@ export default {
                 this.$nextTick(() => {
                     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)
                     }
                 })
             }else if (type === 'records') {
                 this.records = true
             }
-            
+            // this.initMap(this.dataForm.latitude, this.dataForm.longitude);
+            this.initMap(this.formData.latitude, this.formData.longitude);
+            console.log("mapmapmap", map)
             this.endLoading()
 
         },
@@ -558,7 +557,7 @@ export default {
             setTimeout(() => {
                 this.btnDisable = false
             }, 10000)
-            console.log("data/actual/base/communityActivity/save",this.formData)
+            // console.log("data/actual/base/communityActivity/save",this.formData)
             this.$refs['ref_form'].validate((valid, messageObj) => {
                 const dateObj = this.formData.startTime.split(' ');
                 const formattedDate = dateObj[0]; // 获取日期部分，即 '2424-10-22'
diff --git a/src/views/modules/communityParty/activity/summDetails.vue b/src/views/modules/communityParty/activity/summDetails.vue
new file mode 100644
index 000000000..e90f0ea3d
--- /dev/null
+++ b/src/views/modules/communityParty/activity/summDetails.vue
@@ -0,0 +1,360 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule"
+                class="form">
+                        <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
+                            <div class="item_width_1">
+                                <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
+                                </el-input>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
+                            <div>
+                                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                                    :data="{ customerId: customerId }" :show-file-list="true"
+                                    :file-list="formData.activityImgs" :on-preview="handleImgPreview"
+                                    :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                                    :on-exceed="handleImgExceed" :before-upload="beforeImgUpload"
+                                    list-type="picture-card" :limit="3">
+                                    <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
+                            </div>
+                            <div>
+                                <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
+                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img"
+                                        alt="照片" style="width: 150px; margin-right: 10px;">
+                                </div>
+                                <div v-else>
+                                    暂无照片
+                                </div>
+                            </div>
+                        </el-form-item>
+            </el-form>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable"
+                @click="handleComfirm">确
+                定</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import Tinymce from '@c/tinymce2/index.vue'
+import daiMap from "@/utils/dai-map";
+import util from '@js/util.js';
+// import UploadImage from './upload-image.vue'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+    data() {
+        let initFormData = () => {
+            let _form = {
+                id: "",
+                // typeId: "",
+                // activityName: "",//活动名称
+                // status: 0,//状态
+                // assistingParty: "",//协办方
+                // startTime: "",//开始时间
+                // endTime: "",//结束时间
+                // coverPic: "",//封面图片地址
+                // content: "",//活动内容
+                // address: "",//地址
+                // online: 0,//开关
+                // cutOffTime: "",//截止时间
+                // points: 0,//积分
+                // participants: 1,//活动人数
+                // sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                // longitude: this.$store.state.user.longitude, //经度
+                // latitude: this.$store.state.user.latitude,//纬度
+            }
+
+            return _form
+        }
+        return {
+            activityImgs:[],//活动照片
+            records:false,
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            num: 0,
+            loading: false,
+            timeRange: [],
+            online: false,
+
+            btnDisable: false,
+
+            keyWords: '',
+            activityId: '',
+            formData: initFormData(),
+            serviceList: [],
+            // gridList: [],
+            agencyId: '',
+
+            demandOptions: [],
+            // typeList: [],
+            // corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+
+        }
+    },
+    components: { Tinymce, UploadImage },
+    mounted() {
+    },
+
+    methods: {
+        // 上传成功
+        handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                this.formData.activityImgs.push(res.data.url);
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.formData.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+                this.formData.activityImgs.splice(index, 1);
+            }
+        },
+        // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过三个'
+            });
+        },
+        // 上传前的验证
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
+       
+        onChangeImgs(e, rowIndex = 0) {
+            console.log('onChangeFileList', e)
+            if (e.length > 0) {
+                this.activityImgs = []
+                e.forEach(item => {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: item.response.data.url
+                    }
+                    this.activityImgs.push(ob)
+                })
+            }
+        },
+
+        handleChange(value) {
+            console.log(value);
+        },
+    
+        async initForm(type, activityId) {
+            this.startLoading()
+            // console.log("啊实打实的", type, activityId)
+            this.formData.id = type           
+            this.endLoading()
+
+        },
+
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption"
+
+            let params = {
+                agencyId: this.agencyId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.gridList = data
+
+            } else {
+                this.$message.error(msg)
+            }
+
+        },
+
+        async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            // console.log("data/actual/base/communityActivity/save",this.formData)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else{
+                    this.addActivity()
+                }
+            })
+        },
+        async addActivity() {
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            
+
+        },
+
+        handleCancle() {
+            console.log("点击取消了点击取消了点击取消了")
+            this.resetData()
+            this.$emit('summDetailClose')
+            this.$emit("diaDetailClose");
+
+        },
+
+        resetData() {
+            this.formData = {
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+            }
+
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                sumUp: [
+                    { required: true, message: '请输入活动总结', trigger: 'blur' }
+                ],
+                activityImgs: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                ]
+            }
+        },
+
+    },
+    props: {
+
+        // unitList: {
+        //     type: Array,
+        //     default: []
+        // },
+        gridList: {
+            type: Array,
+            default: []
+        },
+
+
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style lang="scss" scoped>
+.item_width_1 {
+    width: 560px;
+
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
+
+.tinymce_view {
+    ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+    }
+}
+
+.div_map {
+    position: relative;
+}
+
+.div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+}
+
+.tinymce_view {
+    height: 400px;
+    overflow: auto;
+}
+
+.text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+
+    >p {
+        margin: 0;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue
index d645966c2..78dbc0e24 100644
--- a/src/views/modules/workSys/typeActivity/index.vue
+++ b/src/views/modules/workSys/typeActivity/index.vue
@@ -14,8 +14,7 @@
                     <el-form-item label="首页显示">
                         <el-select class="item_width_1" v-model.trim="enabled" size="small" placeholder="请选择"
                             clearable>
-                            <el-option v-for="item in unitList" :key="item.value" :label="item.name"
-                                :value="item.value">
+                            <el-option v-for="item in enabledList" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -45,7 +44,7 @@
                 <el-table-column prop="typeName" header-align="center" align="center" label="类型名称" width="380">
                 </el-table-column>
                 
-                <el-table-column prop="peopleCount" header-align="center" align="center" label="创建时间" width="380">
+                <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"
@@ -57,10 +56,12 @@
                         <el-button type="text"
                             style="color:#00A7A9;text-decoration: underline;" size="small"
                             @click="handleEdit(scope.row)">修改</el-button>
+                            
 
-                        <!-- <el-button type="text"
+                        <el-button type="text"
                             style="color:#D51010;text-decoration: underline;" size="small"
-                            @click="handleDelete(scope.row)">删除</el-button> -->
+                            @click="handleDelete(scope.row)">删除</el-button>
+
                     </template>
                 </el-table-column>
             </el-table>
@@ -75,7 +76,7 @@
         <!-- 修改弹出框 -->
         <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
             :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
-            <type-activityadd ref="ref_form" :unitList="corganizerList" :gridList="gridList"
+            <type-activityadd ref="ref_form" :gridList="gridList"
                 @dialogCancle="addFormCancle" @dialogOk="addFormOk"></type-activityadd>
         </el-dialog>
 
@@ -107,8 +108,13 @@
           tableLoading: false,
           agencyId: '',
           gridList: [],//所属网格
-          typeName:'',
-          enabled:'',
+          typeName: '',
+          enabledList: [
+            { value: 0, label: '显示' },
+            { value: 1, label: '不显示' }
+          ],
+          tableData: [],
+          enabled: '',
           //form相关
           formShow: false,
           formTitle: '新增活动',
@@ -136,6 +142,9 @@
       },
     
       methods: {
+        handleSelectionChange(){
+          // console.log("啊倒萨打算")
+        },
         handleSearch () {
           this.loadTable()
         },
@@ -151,7 +160,7 @@
             pageSize: 20,
             pageNo: 1,
             typeName: this.typeName,
-            enabled: 0
+            enabled: this.enabled
           }
           const { data, code, msg } = await requestPost(url, params)
           if (code === 0) {
@@ -236,14 +245,9 @@
         },
     
         async deleteActivity (row) {
-          const url = "/actual/base/icpartyactivity/delete"
-          // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
-    
-          let params = {
-            id: row.id
-          }
-    
-          const { data, code, msg } = await requestPost(url, params)
+          const url = "/actual/base/activityType/delete"
+          let id = [row.id]
+          const { data, code, msg } = await requestPost(url, id)
     
           if (code === 0) {
             this.$message({
@@ -260,6 +264,7 @@
         //重置搜索条件
         resetSearch () {
           this.typeName = ''
+          this.enabled = null
           this.loadTable()
         },
 
diff --git a/src/views/modules/workSys/typeActivity/typeActivityadd.vue b/src/views/modules/workSys/typeActivity/typeActivityadd.vue
index 0e2976a5e..2973511cc 100644
--- a/src/views/modules/workSys/typeActivity/typeActivityadd.vue
+++ b/src/views/modules/workSys/typeActivity/typeActivityadd.vue
@@ -1,28 +1,31 @@
 <template>
-    <div>
-  
-      <div class="dialog-h-content scroll-h">
-        <el-form ref="ref_form" :inline="true"  :rules="dataRule"
-          class="form">
+  <div>
 
-          <el-form-item label="活动类型" label-width="150px" style="display: block">
-            <div style="width: 500px">
-              <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
-                </el-input>
-            </div>
-          </el-form-item>
-        </el-form>
-      </div>
-  
-      <div class="div_btn">
-        <el-button size="small" @click="handleCancle">取 消</el-button>
-        <!-- <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
+
+        <el-form-item label="活动类型" label-width="150px" style="display: block">
+          <div style="width: 500px">
+            <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
+            </el-input>
+          </div>
+        </el-form-item>
+
+        <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+          <el-switch v-model="enabledChange" @change="handleDisplay"></el-switch>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <!-- <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确
           定</el-button> -->
-          <el-button size="small" type="primary" @click="handleComfirm">确
-          定</el-button>
-      </div>
+      <el-button size="small" type="primary" @click="handleComfirm">确
+        定</el-button>
     </div>
-  </template>
+  </div>
+</template>
     
     <script>
     import { mapGetters } from 'vuex'
@@ -44,7 +47,9 @@
       data () {
         return {
           typeName: '',
-          marde:''
+          marde:'',
+          enabledChange: false,
+          enabled: 1
     
         }
       },
@@ -55,12 +60,30 @@
       },
     
       methods: { 
+        handleDisplay(value){
+            
+            if (value) {
+                this.enabledChange = true;
+                this.enabled = 0;
+            } else {
+                this.enabledChange = false;
+                this.enabled = 1;
+            }
+            // console.log('valuevaluevalue',this.enabled)
+        },
+
         async initForm(activityId){
           console.log('activityIddetailShow',activityId)
           if(activityId !== ''){
             this.marde = 'edi'
             this.id = activityId.id
             this.typeName = activityId.typeName
+            this.enabled = activityId.enabled
+            if (this.enabled === 0) {
+              this.enabledChange = true;
+            } else {
+              this.enabledChange = false;
+            }
           }
 
             
@@ -82,10 +105,11 @@
             let url = '/actual/base/activityType/update'
             let parmer = {
               typeName: this.typeName,
-              enabled: 0,
+              enabled: this.enabled,
+              id: this.id 
               // id: this.id
             }
-            const { data, code, msg } = await requestPost(url, parmer)
+            const { data, code, msg, internalMsg} = await requestPost(url, parmer)
 
             if (code === 0) {
               this.$message({
@@ -97,17 +121,17 @@
               // this.btnDisable = false
             } else {
               // this.btnDisable = false
-              this.$message.error(msg)
+              this.$message.error(internalMsg)
             }
           }else{
             let url = '/actual/base/activityType/save'
             // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
             let parmer = {
               typeName: this.typeName,
-              enabled: 0
+              enabled: this.enabled
             }
 
-            const { data, code, msg } = await requestPost(url, parmer)
+            const { data, code, msg, internalMsg} = await requestPost(url, parmer)
 
             if (code === 0) {
               this.$message({
@@ -119,7 +143,7 @@
               // this.btnDisable = false
             } else {
               // this.btnDisable = false
-              this.$message.error(msg)
+              this.$message.error(internalMsg)
             }
           }
           
@@ -135,7 +159,9 @@
     
         resetData () {
           this.typeName = '',
-          this.marde = ''
+          this.marde = '',
+          this.enabled  = 1,
+          this.enabledChange = false
     
         },
         // 开启加载动画
diff --git a/src/views/modules/workSys/typeActivity/typeDetails.vue b/src/views/modules/workSys/typeActivity/typeDetails.vue
index 71eb552fb..57ae86359 100644
--- a/src/views/modules/workSys/typeActivity/typeDetails.vue
+++ b/src/views/modules/workSys/typeActivity/typeDetails.vue
@@ -1,21 +1,27 @@
 <template>
-    <div>
+  <div>
 
-        <div class="dialog-h-content scroll-h">
-            <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
 
-                <el-form-item label="活动类型" label-width="150px" style="display: block">
-                    <div style="width: 500px">
-                        <span>{{ typeName }}</span>
-                    </div>
-                </el-form-item>
-            </el-form>
-        </div>
+        <el-form-item label="活动类型" label-width="150px" style="display: block">
+          <div style="width: 500px">
+            <span>{{ typeName }}</span>
+          </div>
+        </el-form-item>
 
-        <div class="div_btn">
-            <el-button size="small" @click="handleCancle">取 消</el-button>
-        </div>
+        <el-form-item label="首页显示" label-width="150px" style="display: block">
+          <div style="width: 500px">
+            <el-switch :value="enabled  === 0 ? true : false" :disabled="true"></el-switch>
+          </div>
+        </el-form-item>
+      </el-form>
     </div>
+
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+    </div>
+  </div>
 </template>
     
     <script>
@@ -37,7 +43,8 @@
     export default {
       data () {
         return {
-          typeName: ''
+          typeName: '',
+          enabled:null
     
         }
       },
@@ -73,7 +80,9 @@
 
           },
           async initForm(activityId) {
+            // console.log('activityId',activityId.enabled)
               this.typeName = activityId.typeName
+              this.enabled = activityId.enabled
           },
           handleComfirm() {
             //   this.resetData()

From 4254373872c3a0d7c86604f7f2cb47967a4456c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Thu, 30 May 2024 09:46:28 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/activity/index.vue | 59 ++++++------
 .../activity/initiateActivity.vue             | 94 +++++++------------
 2 files changed, 63 insertions(+), 90 deletions(-)

diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index b48fde690..41746a8ff 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -79,10 +79,16 @@
         <el-table-column prop="address" header-align="center" align="center" label="活动地点" min-width="230">
         </el-table-column>
 
-        <el-table-column prop="assistingParty" header-align="center" align="center" label="协办方" width="100">
+        <el-table-column prop="assistingParty" header-align="center" align="center" label="协办方" width="230">
         </el-table-column>
 
-        <el-table-column prop="status" header-align="center" align="center" label="活动状态" width="230">
+        <el-table-column prop="participants" header-align="center" align="center" label="活动人数" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.participants === 0 ? '不限' : scope.row.participants }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="status" header-align="center" align="center" label="活动状态" width="100">
           <template slot-scope="scope">
             {{ getStatusText(scope.row.status) }}
           </template>
@@ -100,19 +106,14 @@
             <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
               @click="handleDetail(scope.row)">查看</el-button>
 
-              <el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;text-decoration: underline;" size="small"
-              @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;text-decoration: underline;"
+              size="small" @click="handleEdit(scope.row)">编辑</el-button>
 
-              <el-button type="text" v-if="scope.row.status == 2" style="color:#1C6AFD;text-decoration: underline;" size="small"
-              @click="handleSumm(scope.row)">活动总结</el-button>
+            <el-button type="text" v-if="scope.row.status == 2" style="color:#1C6AFD;text-decoration: underline;"
+              size="small" @click="handleSumm(scope.row)">活动总结</el-button>
 
-            <!-- <el-button  type="text"
-              style="color:#00A7A9;text-decoration: underline;" size="small"
-              @click="handleEdit(scope.row)">修改</el-button> -->
-              
-            <el-button v-if="scope.row.status !== 2" type="text"
-              style="color:#D51010;text-decoration: underline;" size="small"
-              @click="handleDelete(scope.row)">删除</el-button>
+            <el-button v-if="scope.row.status == 2 || scope.row.status == 0" type="text" style="color:#D51010;text-decoration: underline;"
+              size="small" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -354,7 +355,7 @@
         } else {
           this.$message.error(msg)
         }
-        console.log("饿么么么么么",this.typeList)
+        // console.log("饿么么么么么",this.typeList)
       },
   
       diaClose () {
@@ -471,26 +472,22 @@
   
       async deleteActivity (row) {
 
-        // const url = "/actual/base/icpartyactivity/delete"//等待删除接口
-        // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
+        const url = "/actual/base/communityActivity/delete"
+        let id = [row.id]
   
-        // let params = {
-        //   id: row.id
-        // }
+        const { data, code, msg } = await requestPost(url, id)
   
-        // const { data, code, msg } = await requestPost(url, params)
-  
-        // if (code === 0) {
-        //   this.$message({
-        //     type: "success",
-        //     message: "删除成功"
-        //   });
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "删除成功"
+          });
   
-        //   // this.loadTable()
-        //   this.communityActivityList()
-        // } else {
-        //   this.$message.error(msg)
-        // }
+          // this.loadTable()
+          this.communityActivityList()
+        } else {
+          this.$message.error(msg)
+        }
       },
   
       //重置搜索条件
diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
index 09af43164..bba3e2f04 100644
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -178,7 +178,7 @@ export default {
                 online: 0,//开关
                 cutOffTime: "",//截止时间
                 points: 0,//积分
-                participants: 1,//活动人数
+                participants: 0,//活动人数
                 sendMessage: 0,//推送数
                 sumUp: "",//活动总结
                 activityImgs: [],//图片列表
@@ -222,8 +222,6 @@ export default {
     mounted() {
         this.activityType()
         this.listServerOrg()
-        // this.initForm()
-
     },
 
     methods: {
@@ -333,15 +331,27 @@ export default {
             }
         },
 
+        // onChangeFileList(e) {
+        //     if (e.length > 0) {
+        //         let item = e[0];
+        //         let ob = {
+        //             fileType: '0',
+        //             fileUrl: item.response.data.url
+        //         };
+        //         this.fileList = [ob];
+        //         this.formData.coverPic = ob.fileUrl;
+        //     }
+        // },
+
         onChangeFileList(e) {
+            this.fileList = e.length > 0 ? e.map(item => ({
+                fileType: '0',
+                fileUrl: item.response.data.url
+            })) : []; // 当e为空时清空fileList
             if (e.length > 0) {
-                let item = e[0];
-                let ob = {
-                    fileType: '0',
-                    fileUrl: item.response.data.url
-                };
-                this.fileList = [ob];
-                this.formData.coverPic = ob.fileUrl;
+                this.formData.coverPic = e[0].response.data.url;
+            } else {
+                this.formData.coverPic = '';
             }
         },
 
@@ -391,34 +401,26 @@ export default {
             }
 
         },
-
-         // async initForm(row) {
-        //     this.startLoading();
-        //     this.formData = JSON.parse(JSON.stringify(row));
-        //     this.initLoading = true;
-        //     console.log('this.formData,',this.formData);
-
-        //     let { latitude, longitude } = this.$store.state.user;
-        //     console.log("lat" + latitude + ",lon" + longitude);
-        //     if (this.formData.latitude && this.formData.longitude) {
-        //         latitude = this.formData.latitude;
-        //         longitude = this.formData.longitude;
-        //     }
-        //     if (!latitude || latitude == "" || latitude == "0") {
-        //         latitude = 39.9088810666821;
-        //         longitude = 116.39743841556731;
-        //     }
-        //     this.endLoading();
-        // },
         async initForm(type, activityId) {
             this.startLoading()
-            console.log("啊实打实的", type, activityId)
+            // console.log("啊实打实的", type, activityId)
+            
+            this.$nextTick(() => {
+                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){
                     this.records = true
                 }
-                // this.records = false
                 this.formData = activityId
                 this.timeRange = [this.formData.startTime, this.formData.endTime]
                 if (activityId.coverPic) {
@@ -432,37 +434,9 @@ export default {
                         this.online = true
                     }
                 }
-                // this.$refs.ref_form.resetFields();
-
-
-                // //获取服务事项
-                // await this.getDemandOptions()
-
-                // let { latitude, longitude } = this.$store.state.user;
-                // if (activityId) {
-                //     this.activityId = activityId
-                //     this.formData.id = activityId
-                //     await this.loadFormData()
-                // } else {
-                //     this.formData.latitude = latitude
-                //     this.formData.longitude = longitude
-                // }
-                this.$nextTick(() => {
-                    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)
-                    }
-                })
             }else if (type === 'records') {
                 this.records = true
             }
-            // this.initMap(this.dataForm.latitude, this.dataForm.longitude);
-            this.initMap(this.formData.latitude, this.formData.longitude);
-            console.log("mapmapmap", map)
             this.endLoading()
 
         },
@@ -729,6 +703,8 @@ export default {
                 activityImgs: [],//图片列表
                 longitude: this.$store.state.user.longitude, //经度
                 latitude: this.$store.state.user.latitude//纬度
+                // longitude: null, //经度
+                // latitude: null//纬度
             }
 
         },

From 078ae5a70ac6973f99683d3031874686745f9442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Thu, 30 May 2024 15:31:54 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=AF=8C=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/activity/eventDetails.vue  |  6 ++--
 .../activity/initiateActivity.vue             | 31 ++++++++++++-------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
index 64849d7bc..10f7c4d4d 100644
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -34,7 +34,8 @@
                     <div class="m-info-prop">
                         <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动内容: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.content || "--" }}</span>
+                        <!-- <span>{{ formData.content || "--" }}</span> -->
+                        <p class="text_p" v-html="formData.content"></p>
                     </div>
 
                     <div class="m-info-prop">
@@ -71,7 +72,8 @@
                     <div class="m-info-prop">
                         <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动总结：</span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.sumUp || "--" }}</span>
+                        <!-- <span>{{ formData.sumUp || "--" }}</span> -->
+                        <p class="text_p" v-html="formData.sumUp"></p>
                     </div>
                     <div class="m-info-prop" style="display: flex; flex-wrap: wrap; align-items: flex-start;">
                         <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动图片：</span>
diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
index bba3e2f04..5d505647b 100644
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -46,10 +46,12 @@
 
                 <el-form-item label="活动内容" prop="content" label-width="150px" style="display: block">
                     <div class="item_width_1">
+                        <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250"
+                            placeholder="请输入活动内容" />
                         <!-- <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
-                            :height="250" placeholder="在这里输入文字" /> -->
-                        <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.content">
-                        </el-input>
+                            :height="250" placeholder="请输入活动内容" /> -->
+                        <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.content">
+                        </el-input> -->
                     </div>
                 </el-form-item>
 
@@ -74,8 +76,10 @@
                     <div v-if="!online">
                         <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
                             <div class="item_width_1">
-                                <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
-                                </el-input>
+                                <!-- <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="请输入活动总结" />
                             </div>
                         </el-form-item>
 
@@ -98,8 +102,8 @@
                             </div>
                             <div>
                                 <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
-                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img"
-                                        alt="照片" style="width: 150px; margin-right: 10px;">
+                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img" alt="照片"
+                                        style="width: 150px; margin-right: 10px;">
                                 </div>
                                 <div v-else>
                                     暂无照片
@@ -404,22 +408,24 @@ export default {
         async initForm(type, activityId) {
             this.startLoading()
             // console.log("啊实打实的", type, activityId)
-            
+
             this.$nextTick(() => {
                 if (!map) {
                     this.initMap(this.formData.latitude, this.formData.longitude);
-                    console.log("map", map)
+                    // 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)
+                    // console.log("mapmapmap", map)
                 }
             })
 
             this.formType = type
-            if (type === 'edit') {
+            if (type === 'edit' ) {
                 if(activityId.activityImgs || activityId.sumUp){
                     this.records = true
+                }else{
+                    this.records = false
                 }
                 this.formData = activityId
                 this.timeRange = [this.formData.startTime, this.formData.endTime]
@@ -436,6 +442,8 @@ export default {
                 }
             }else if (type === 'records') {
                 this.records = true
+            }else{
+                this.records = false
             }
             this.endLoading()
 
@@ -683,6 +691,7 @@ export default {
             this.activityId = ''
             this.keyWords = ''
             this.online = false
+            this.formType=''
             this.formData = {
                 id: "",
                 typeId: "",

From 117e51c49fff1b2b7dd0e31e8b8f8a252bcfa580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Mon, 3 Jun 2024 13:36:49 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/activity/index.vue | 146 +++++++++++----
 .../activity/initiateActivity.vue             | 138 ++++++++-------
 .../communityParty/activity/summDetails.vue   |  57 +++---
 .../communityParty/comPromotion/event.vue     | 166 ++++++++++++++++++
 4 files changed, 384 insertions(+), 123 deletions(-)
 create mode 100644 src/views/modules/communityParty/comPromotion/event.vue

diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index 41746a8ff..f848a804e 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -100,7 +100,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" fixed="right" width="180" header-align="center" align="center" class="operate">
+        <el-table-column label="操作" fixed="right" width="230" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
 
             <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
@@ -109,11 +109,20 @@
             <el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;text-decoration: underline;"
               size="small" @click="handleEdit(scope.row)">编辑</el-button>
 
-            <el-button type="text" v-if="scope.row.status == 2" style="color:#1C6AFD;text-decoration: underline;"
+            <!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;text-decoration: underline;"
+              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;text-decoration: underline;"
               size="small" @click="handleSumm(scope.row)">活动总结</el-button>
 
-            <el-button v-if="scope.row.status == 2 || scope.row.status == 0" type="text" style="color:#D51010;text-decoration: underline;"
-              size="small" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button v-if="scope.row.status == 2 || scope.row.status == 3" type="text"
+              style="color:#D51010;text-decoration: underline;" size="small"
+              @click="handleDelete(scope.row)">删除</el-button>
+
+            <el-button v-if="scope.row.status == 0" type="text"
+              style="color:#D51010;text-decoration: underline;" size="small"
+              @click="handleCancel(scope.row)">取消</el-button>
+
           </template>
         </el-table-column>
       </el-table>
@@ -175,7 +184,8 @@
         statuslist: [
           { value: 0, label: '未进行' },
           { value: 1, label: '进行中' },
-          { value: 2, label: '已结束' }
+          { value: 2, label: '已结束' },
+          { value: 3, label: '已取消' }
         ],
         typeList:[],//活动类型
         corganizerList:[],//协办方list
@@ -246,6 +256,8 @@
             return '进行中';
           case 2:
             return '已结束';
+          case 3:
+            return '已取消';
           default:
             return '';
         }
@@ -273,7 +285,7 @@
       },
       async communityActivityList() {
         const url = "/actual/base/communityActivity/page";
-        
+
         let params = {
           pageSize: this.pageSize,
           pageNo: this.pageNo,
@@ -281,10 +293,40 @@
           ...this.formData,
         };
         let { data, code, msg } = await requestPost(url, params);
-           if (code === 0) {
+        if (code === 0) {
           this.total = data.total
           this.tableData = data.list
-          // console.log("datadatadata",this.tableData)
+
+          this.tableData.forEach((item) => {
+            const currentTime = new Date();
+            if (item.startTime > currentTime) {
+              if( item.status === 0 ){
+                return
+              }else{
+                item.status = 0
+                this.formData = item;
+                this.updatetow()
+              }
+            } else if (item.startTime < currentTime && item.endTime > currentTime) {
+              if( item.status === 1 ){
+                return
+              }else{
+                item.status = 1
+                this.formData = item;
+                this.updatetow()
+              }
+            } else {
+              if (item.status = 2) {
+                return
+              } else {
+                item.status = 2
+                this.formData = item;
+                this.updatetow()
+              }            
+            }
+          });
+          
+
         } else {
           this.$message.error(msg)
         }
@@ -355,7 +397,6 @@
         } else {
           this.$message.error(msg)
         }
-        // console.log("饿么么么么么",this.typeList)
       },
   
       diaClose () {
@@ -375,7 +416,6 @@
         this.detailShow = false
       },
       summDetailClose () {
-        // console.log('this.$refs.ref_detail关闭不了为什么')
         // this.$refs.ref_detail.diaDestroy()
         this.summShow = false
       },
@@ -384,30 +424,31 @@
       handleDetail (row) {
         this.detailShow = true
         this.formTitle = '详情'
-  
+        console.log('rowmememmeme',row)
         this.$nextTick(() => {
           this.$refs.ref_detail.initForm(row)
           // this.$refs.ref_form.initForm('detail', row.id)
         })
       },
+
+      handleEdit (row) {
+        this.formTitle = '修改'
+        this.initShow = true
+        this.$nextTick(() => {
+          // this.$refs.ref_form.initForm('edit', row.id)
+          this.$refs.ref_form.initForm('edit', row)
+        })
+      },
+
       handleSumm(row){
-        this.summShow = true
+        this.initShow = true
         this.formTitle = '总结'
-        // console.log('row',row)
         this.$nextTick(() => {
-          this.$refs.ref_detail.initForm(row.id)
-          // this.$refs.ref_form.initForm('detail', row.id)    activityImgs   sumUp
+          this.$refs.ref_form.initForm('summary', row)
         })
+        this.communityActivityList()
       },
   
-      // handleAdd () {
-      //   this.formTitle = '新增'
-  
-      //   this.formShow = true
-      //   this.$nextTick(() => {
-      //     this.$refs.ref_form.initForm('add', null)
-      //   })
-      // },
       handleAdd () {
         this.formTitle = '活动记录'
         this.initShow = true
@@ -424,14 +465,6 @@
           // this.$refs.ref_detail.initForm(row)
         })
       },
-      handleEdit (row) {
-        this.formTitle = '修改'
-        this.initShow = true
-        this.$nextTick(() => {
-          // this.$refs.ref_form.initForm('edit', row.id)
-          this.$refs.ref_form.initForm('edit', row)
-        })
-      },
   
       addFormCancle () {
         this.formShow = false
@@ -469,6 +502,57 @@
   
           });
       },
+      async handleCancel(row) {
+        this.$confirm("确认取消?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.update(row)
+          })
+          .catch(err => {
+            // console.log("hehheheheh",row)
+            if (err == "cancel") {
+
+            }
+
+          });
+      },
+
+      async update(row) {
+        let url = '/actual/base/communityActivity/update'
+        this.formData = row
+        this.formData.status = 3
+        const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
+        if (code === 0) {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+          
+        } else if(internalMsg !== ''){
+          this.$message.error(internalMsg)
+        }else{
+          this.$message.error(msg)
+        }
+        this.resetSearch()
+      },
+      async updatetow(){
+        let url = '/actual/base/communityActivity/update'
+        const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
+        if (code === 0) {
+          this.$message({
+            type: 'success',
+            // message: '操作成功'
+          })
+        } else if (internalMsg !== '') {
+          this.$message.error(internalMsg)
+        } else {
+          this.$message.error(msg)
+        }
+        this.resetSearch()
+      },
   
       async deleteActivity (row) {
 
diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
index 5d505647b..57d6f3785 100644
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -2,75 +2,79 @@
     <div>
 
         <div class="dialog-h-content scroll-h">
+
             <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
                 class="form">
-                <el-form-item label="活动类型" label-width="150px" prop="typeId">
-                    <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
-                        <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
-                            :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item label="活动名称" prop="activityName" label-width="150px">
-                    <el-input v-model.trim="formData.activityName" size="small" clearable placeholder="请输入活动名称"
-                        class="u-item-width-normal"></el-input>
-                </el-form-item>
-
-                <el-form-item label="活动时间" prop="startTime" label-width="130px">
-                    <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
-                        value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至"
-                        start-placeholder="开始时间" end-placeholder="结束时间">
-                    </el-date-picker>
-                </el-form-item>
-
-                <!-- <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                <div v-if="summary">
+                    <el-form-item label="活动类型" label-width="150px" prop="typeId">
+                        <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
+                            <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
+                                :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="活动名称" prop="activityName" label-width="150px">
+                        <el-input v-model.trim="formData.activityName" size="small" clearable placeholder="请输入活动名称"
+                            class="u-item-width-normal"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="活动时间" prop="startTime" label-width="130px">
+                        <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
+                            value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至"
+                            start-placeholder="开始时间" end-placeholder="结束时间">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <!-- <el-form-item label="协办方" prop="assistingParty" label-width="150px">
                     <el-cascader v-model.trim="formData.assistingParty" :options="corganizerList"
                         :props="{ label: 'label', value: 'name'}" clearable collapse-tags size="small"
                         class="u-item-width-normal"></el-cascader>
                 </el-form-item> -->
-                <el-form-item label="协办方" prop="assistingParty" label-width="150px">
-                    <el-select class="u-item-width-normal" v-model.trim="formData.assistingParty" placeholder="请选择"
-                        clearable>
-                        <el-option v-for="item in corganizerList" :key="item.id" :label="item.label" :value="item.name"
-                            class="u-item-width-normal">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item label="活动封面图" label-width="140px" prop="coverPic">
-                    <template>
-                        <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"></upload-image>
-                    </template>
-                </el-form-item>
-
-                <el-form-item label="活动内容" prop="content" label-width="150px" style="display: block">
-                    <div class="item_width_1">
-                        <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250"
-                            placeholder="请输入活动内容" />
-                        <!-- <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
-                            :height="250" placeholder="请输入活动内容" /> -->
-                        <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.content">
-                        </el-input> -->
-                    </div>
-                </el-form-item>
-
-                <el-form-item label="活动地点" prop="address" label-width="150px" style="display: block">
-                    <div style="width: 500px">
-                        <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
-                            :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
-                            :loading="loading">
-                            <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
-                                :key="item.value" :label="item.label" :value="item.value">
+                    <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                        <el-select class="u-item-width-normal" v-model.trim="formData.assistingParty" placeholder="请选择"
+                            clearable>
+                            <el-option v-for="item in corganizerList" :key="item.id" :label="item.label"
+                                :value="item.name" class="u-item-width-normal">
                             </el-option>
                         </el-select>
-                        <div id="app_activity" class="div_map"></div>
-                    </div>
-                </el-form-item>
+                    </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-item label="活动封面图" label-width="140px" prop="coverPic">
+                        <template>
+                            <upload-image :defaultFileList="fileList" :limit="1"
+                                @change="onChangeFileList"></upload-image>
+                        </template>
+                    </el-form-item>
+
+                    <el-form-item label="活动内容" prop="content" label-width="150px" style="display: block">
+                        <div class="item_width_1">
+                            <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250"
+                                placeholder="请输入活动内容" />
+                            <!-- <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
+                            :height="250" placeholder="请输入活动内容" /> -->
+                            <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.content">
+                        </el-input> -->
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item label="活动地点" prop="address" label-width="150px" style="display: block">
+                        <div style="width: 500px">
+                            <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                                :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                                :loading="loading">
+                                <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                    :key="item.value" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <div id="app_activity" class="div_map"></div>
+                        </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>
+                </div>
 
                 <div v-if="records">
                     <div v-if="!online">
@@ -204,6 +208,7 @@ export default {
             loading: false,
             timeRange: [],
             online: false,
+            summary:true,
 
             btnDisable: false,
 
@@ -247,7 +252,9 @@ export default {
                 //     type,
                 //     url: res.data.url
                 // });
+                // console.log('this.formData.activityImgs',res.data.url)
                 this.formData.activityImgs.push(res.data.url);
+                
             } else {
                 this.$message.error(res.msg);
             }
@@ -407,7 +414,7 @@ export default {
         },
         async initForm(type, activityId) {
             this.startLoading()
-            // console.log("啊实打实的", type, activityId)
+            console.log("啊实打实的", type, activityId)
 
             this.$nextTick(() => {
                 if (!map) {
@@ -442,6 +449,12 @@ export default {
                 }
             }else if (type === 'records') {
                 this.records = true
+            }else if(type === 'summary'){
+                this.formData = activityId
+                this.formData.activityImgs = []
+                console.log("this.formData",this.formData)
+                this.records = true
+                this.summary = false
             }else{
                 this.records = false
             }
@@ -554,7 +567,7 @@ export default {
             })
         },
         async addActivity() {
-            if (this.formType === 'edit') {
+            if (this.formType === 'edit' || this.formType === 'summary') {
                 let url = '/actual/base/communityActivity/update'
                 const { data, code, msg } = await requestPost(url, this.formData)
                 if (code === 0) {
@@ -692,6 +705,7 @@ export default {
             this.keyWords = ''
             this.online = false
             this.formType=''
+            this.summary=true
             this.formData = {
                 id: "",
                 typeId: "",
diff --git a/src/views/modules/communityParty/activity/summDetails.vue b/src/views/modules/communityParty/activity/summDetails.vue
index e90f0ea3d..c6c3c58fb 100644
--- a/src/views/modules/communityParty/activity/summDetails.vue
+++ b/src/views/modules/communityParty/activity/summDetails.vue
@@ -2,41 +2,38 @@
     <div>
 
         <div class="dialog-h-content scroll-h">
-            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule"
-                class="form">
-                        <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
-                            <div class="item_width_1">
-                                <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
-                                </el-input>
-                            </div>
-                        </el-form-item>
-                        <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
-                            <div>
-                                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
-                                    :data="{ customerId: customerId }" :show-file-list="true"
-                                    :file-list="formData.activityImgs" :on-preview="handleImgPreview"
-                                    :on-success="handleImgSuccess" :on-remove="handleImgRemove"
-                                    :on-exceed="handleImgExceed" :before-upload="beforeImgUpload"
-                                    list-type="picture-card" :limit="3">
-                                    <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
-                            </div>
-                            <div>
-                                <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
-                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img"
-                                        alt="照片" style="width: 150px; margin-right: 10px;">
-                                </div>
-                                <div v-else>
-                                    暂无照片
-                                </div>
-                            </div>
-                        </el-form-item>
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
+                <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
+                    <div class="item_width_1">
+                        <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
+                        </el-input>
+                    </div>
+                </el-form-item>
+                <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
+                    <div>
+                        <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                            :data="{ customerId: customerId }" :show-file-list="true" :file-list="formData.activityImgs"
+                            :on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                            :on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card"
+                            :limit="3">
+                            <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
+                    </div>
+                    <div>
+                        <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
+                            <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img" alt="照片"
+                                style="width: 150px; margin-right: 10px;">
+                        </div>
+                        <div v-else>
+                            暂无照片
+                        </div>
+                    </div>
+                </el-form-item>
             </el-form>
         </div>
 
         <div class="div_btn">
             <el-button size="small" @click="handleCancle">取 消</el-button>
-            <el-button size="small" type="primary" :disabled="btnDisable"
-                @click="handleComfirm">确
+            <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确
                 定</el-button>
         </div>
     </div>
diff --git a/src/views/modules/communityParty/comPromotion/event.vue b/src/views/modules/communityParty/comPromotion/event.vue
new file mode 100644
index 000000000..7cc5d2512
--- /dev/null
+++ b/src/views/modules/communityParty/comPromotion/event.vue
@@ -0,0 +1,166 @@
+<template>
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <div v-if="initLoading" class="m-detail-main">
+                <div class="m-info">
+
+                    <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.title || "--" }}</span>
+                        </div>
+                        <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.tagId || "--" }}</span>
+                        </div>
+                    </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.releaseTime || "--" }}至<span>{{ formData.endTime || "--" }}</span></span>
+                        </div>
+                        <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.status === 1 ? '已下线' : '已发布' || "--" }}</span>
+                        </div>
+                    </div>
+
+
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动内容: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <!-- <span>{{ formData.content || "--" }}</span> -->
+                        <p class="text_p" v-html="formData.content"></p>
+                    </div>
+
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">是否置顶: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <el-switch :value="formData.top === 1 ? true : false" :disabled="true"></el-switch>
+                      
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2"></span>
+                        <div class="div_map">
+                            <div id="app_detail_unit"></div>
+                        </div>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">点赞数: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <span>{{ formData.address || "--" }}</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>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+        <div class="m-detail-btn">
+            <el-button size="small" @click="handleCancle">关 闭</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import nextTick from "dai-js/tools/nextTick";
+import daiMap from "@/utils/dai-map";
+
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+let loading; // 加载动画
+export default {
+    data() {
+        return {
+            formData: {},
+            initLoading: false,
+        };
+    },
+    components: {},
+    created() { },
+
+    mounted () {
+    },
+
+    methods: {
+        async activityType () {
+        const url = "/actual/base/activityType/page"
+        let params = {
+          // agencyId: this.agencyId
+          pageSize: 20,
+          pageNo: 1,
+          typeName: "",
+          enabled: 0
+        }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.typeList = data.list
+        } else {
+          this.$message.error(msg)
+        }
+      },
+        handleCancle() {
+            // this.diaDestroy();
+            this.$emit("dialogCancle");
+        },
+
+        diaDestroy() {
+            if (map) {
+                // map.destroy()
+            }
+        },
+
+        async initForm(row) {
+            this.startLoading();
+            this.formData = JSON.parse(JSON.stringify(row));
+            this.initLoading = true;
+
+            this.endLoading();
+        },
+
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
+    },
+    computed: {},
+    props: {},
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+// span {
+//     display: inline-block;
+//     white-space: nowrap; /* 避免换行 */
+// }
+
+</style>
+<style scoped></style>