diff --git a/src/assets/scss/modules/management/form-main.scss b/src/assets/scss/modules/management/form-main.scss
index 6e0cfa6f..60f24394 100644
--- a/src/assets/scss/modules/management/form-main.scss
+++ b/src/assets/scss/modules/management/form-main.scss
@@ -21,6 +21,18 @@
   .list_item_width_2 {
     width: 135px;
   }
+
+  .list_item_width_3 {
+    width: 185px;
+  }
+
+
+  .item_width_5{
+    width: 320px;
+  }
+  .item_width_6{
+    width: 404px;
+  }
 }
 
 
@@ -51,7 +63,14 @@
   }
 }
 
+.form_flex{
+  display:flex;
+  justify-content: space-around;
 
+  .form_item{
+width:50%;
+  }
+}
 
 .twoline {
   display: -webkit-box;
diff --git a/src/views/modules/communityParty/heart/heartAudit.vue b/src/views/modules/communityParty/heart/heartAudit.vue
new file mode 100644
index 00000000..656ea08c
--- /dev/null
+++ b/src/views/modules/communityParty/heart/heartAudit.vue
@@ -0,0 +1,387 @@
+<template>
+  <div class="dialog-h-content scroll-h">
+    <div class="div_table">
+      <el-button size="small"
+                 class="diy-button--add"
+                 @click="handleReject">审核拒绝</el-button>
+      <el-button size="small"
+                 class="diy-button--add"
+                 @click="handleAudit('pass')">审核通过</el-button>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                @selection-change="selectionChange"
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         :selectable="checkSelect"
+                         width="55">
+        </el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50">
+        </el-table-column>
+
+        <el-table-column prop="realName"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="250">
+
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机"
+                         width="100">
+
+        </el-table-column>
+
+        <el-table-column prop="idNum"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         min-width="180">
+
+        </el-table-column>
+        <el-table-column prop="nickName"
+                         header-align="center"
+                         align="center"
+                         label="昵称"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="signUpActNum"
+                         header-align="center"
+                         align="center"
+                         label="报名活动个数"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="signInActNum"
+                         header-align="center"
+                         align="center"
+                         label="实际参加活动个数"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="obtainPointsActNum"
+                         header-align="center"
+                         align="center"
+                         label="获得积分活动个数"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="signUpTime"
+                         header-align="center"
+                         align="center"
+                         label="报名时间"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="statusShow"
+                         header-align="center"
+                         align="center"
+                         label="状态"
+                         width="120">
+
+        </el-table-column>
+
+      </el-table>
+
+    </div>
+
+    <!-- 拒绝理由 -->
+
+    <el-dialog :visible.sync="cancleShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :append-to-body="true"
+               :title="'拒绝理由'"
+               width="550px"
+               top="5vh"
+               class="dialog-h"
+               @closed="cancleDiaClose">
+      <div style="padding:30px">
+
+        <el-input class="item_width_5"
+                  type="textarea"
+                  maxlength="100"
+                  show-word-limit
+                  :rows="4"
+                  placeholder="请输入拒绝理由"
+                  v-model="cancelReason"></el-input>
+        <div style="display:flex;  justify-content: center;margin-top:20px">
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="cancleDiaClose">取消</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="handleAudit('refused')">确定</el-button>
+        </div>
+      </div>
+
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      tableLoading: false,
+      actId: '',
+      tableData: [],
+      actUserRelationIdList: [],
+
+      cancelReason: '',
+      cancleShow: false,//拒绝审核
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initTable (actId) {
+      this.actId = actId
+      await this.loadTable()
+
+    },
+
+    checkSelect (row, index) {
+      //待审核：auditing；已通过：passed；已拒绝：refused；已取消：canceled
+      let isChecked = false;
+      if (row.status === 'auditing') { // 判断里面是否存在某个参数
+        isChecked = true
+      } else {
+        isChecked = false
+      }
+      return isChecked
+    },
+
+    selectionChange (selection) {
+      this.actUserRelationIdList = []
+      this.actUserRelationIdList = selection
+
+    },
+
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      // const url = '/heart/work/act/userlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/heart/work/act/userlist'
+      let params = {
+        actId: this.actId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+
+        if (data.list && data.list.length > 0) {
+          data.list.forEach(item => {
+            //待审核：auditing；已通过：passed；已拒绝：refused；已取消：canceled
+            if (item.status === 'auditing') {
+              item.statusShow = '待审核'
+            } else if (item.status === 'passed') {
+              item.statusShow = '已通过'
+            } else if (item.status === 'refused') {
+              item.statusShow = '已拒绝'
+            } else if (item.status === 'canceled') {
+              item.statusShow = '已取消'
+            } else {
+              item.statusShow = ''
+            }
+
+          });
+
+          this.tableData = [...data.list]
+        } else {
+          this.tableData = []
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleReject () {
+      // if (this.actUserRelationIdList.length === 0) {
+      //   this.$message({
+      //     type: "info",
+      //     message: "请选择人员"
+      //   });
+      //   return false
+      // }
+      this.cancleShow = true
+
+    },
+
+    async handleComfirm (row, tableIndex) {
+      let valiMsg = this.validata(row)
+      if (valiMsg) {
+        this.$message({
+          type: 'warning',
+          message: valiMsg
+        })
+        return false
+      }
+
+      this.addReview(row, tableIndex)
+
+    },
+    async addReview (row, tableIndex) {
+
+      let url = "/gov/org/placepatrolreviewrecord/add"
+      if (row.placePatrolReviewRecordId) {
+        url = "/gov/org/placepatrolreviewrecord/edit"
+      }
+
+      let params = JSON.parse(JSON.stringify(row))
+      params.inspectors = params.inspectorArray.join(',')
+      params.reviewTime = params.reviewTime + ' 00:00:00'
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        let array = data.reviewTime.split(' ')
+        data.reviewTime = array[0]
+        data.isEdit = false
+        data.isNew = false
+
+        this.$set(this.tableData, tableIndex, data)
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    async handleAudit (type) {
+      if (this.actUserRelationIdList.length === 0) {
+        this.$message({
+          type: "info",
+          message: "请选择人员"
+        });
+        return false
+      }
+      if (type = 'refused' && !this.cancelReason) {
+        this.$message({
+          type: "info",
+          message: "请填写拒绝理由"
+        });
+        return false
+      }
+      const url = "/heart/work/actuser/audit-user"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/work/actuser/audit-user"
+
+      let params = {
+        actId: this.actId,
+        type: type,
+        rejectReason: this.cancelReason,
+        actUserRelationIdList: this.actUserRelationIdList
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    cancleDiaClose () {
+      this.cancelReason = ''
+      this.cancleShow = false//审核拒绝
+    },
+
+    handleCancle () {
+      this.$emit('dialogCancle')
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+
+    ...mapGetters(['clientHeight'])
+
+  },
+  props: {
+
+
+    resultList: {
+      type: Array,
+      default: []
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+.item_width_1 {
+  width: 250px;
+}
+.item_width_2 {
+  width: 100px;
+}
+.div_table {
+  margin-top: 10px;
+
+  .table {
+    margin-top: 10px;
+  }
+}
+.div_btn {
+  margin-top: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue
new file mode 100644
index 00000000..8567a5bd
--- /dev/null
+++ b/src/views/modules/communityParty/heart/heartFinish.vue
@@ -0,0 +1,374 @@
+<template>
+  <div class="dialog-h-content scroll-h">
+    <div>
+      <el-form ref="ref_form"
+               :inline="false"
+               :model="formData"
+               :rules="dataRule"
+               class="div_form ">
+        <el-form-item label="实际活动时间"
+                      label-width="150px"
+                      style="display: block"
+                      prop="actualStartTime">
+          <el-date-picker v-model="formData.actualStartTime"
+                          class="list_item_width_3"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm"
+                          format="yyyy-MM-dd HH:mm"
+                          placeholder="开始时间">
+          </el-date-picker>
+          <span class="data-tag">至</span>
+          <el-date-picker v-model="formData.actualEndTime"
+                          class="list_item_width_3 data-tag"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm"
+                          format="yyyy-MM-dd HH:mm"
+                          placeholder="结束时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="积分发放"
+                      label-width="150px"
+                      style="display: block"
+                      prop="actualStartTime">
+
+        </el-form-item>
+
+        <div class="div_table">
+          <el-table class="m_table"
+                    :data="tableData"
+                    border
+                    :height="tableHeight"
+                    v-loading="tableLoading"
+                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}">
+            <el-table-column label="序号"
+                             header-align="center"
+                             align="center"
+                             type="index"
+                             width="50">
+            </el-table-column>
+
+            <el-table-column prop="realName"
+                             header-align="center"
+                             align="center"
+                             label="姓名"
+                             width="150">
+
+            </el-table-column>
+
+            <el-table-column prop="nickName"
+                             header-align="center"
+                             align="center"
+                             label="昵称"
+                             width="120">
+
+            </el-table-column>
+            <el-table-column prop="signUpTime"
+                             header-align="center"
+                             align="center"
+                             label="报名时间"
+                             width="150">
+
+            </el-table-column>
+            <el-table-column prop="signInFlagShow"
+                             header-align="center"
+                             align="center"
+                             label="是否签到"
+                             width="100">
+
+            </el-table-column>
+
+            <el-table-column prop="grantPointShow"
+                             header-align="center"
+                             align="center"
+                             label="操作"
+                             min-width="200">
+
+              <template slot-scope="scope">
+
+                <el-radio v-model="scope.row.grantPointShow"
+                          label="1">给分</el-radio>
+                <el-radio v-model="scope.row.grantPointShow"
+                          label="2">不给分</el-radio>
+
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="denyRewardReason"
+                             header-align="center"
+                             align="center"
+                             label="理由"
+                             min-width="350">
+
+              <template slot-scope="scope">
+
+                <el-input class="item_width_5"
+                          placeholder="请输入理由"
+                          v-model="scope.row.denyRewardReason">
+                </el-input>
+
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </div>
+      </el-form>
+
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <el-button type="primary"
+                 size="small"
+                 @click="handleConfirm">确 定</el-button>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      tableLoading: false,
+      actId: '',
+      tableData: [],
+
+      formData: {
+        actId: '',
+        actualStartTime: '',
+        actualEndTime: '',
+      }
+
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initTable (actId) {
+      this.actId = actId
+      this.formData.actId = actId
+      this.formData.actualStartTime = this.actStartTime
+      this.formData.actualEndTime = this.actEndTime
+
+      await this.loadTable()
+
+    },
+
+    //点击分队切换人员
+    async hancleChangeTeam (row, index, tableIndex) {
+      this.tableData[tableIndex].inspectorArray = [...[]]
+      let teamId = this.teamsList[index].teamId
+      await this.loadInspectors(teamId, tableIndex)
+    },
+
+    //加载分队下人员
+    async loadInspectors (teamId, tableIndex) {
+
+      const url = '/gov/org/placepatrolteamstaff/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
+      let params = {
+        teamId: teamId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // let obj = this.tableData[tableIndex]
+        this.tableData[tableIndex].inspectorsList = [...data]
+        // this.tableData[tableIndex]=
+        //         obj.inspectorsList = data
+        //         this.$set(this.tableData, tableIndex, obj)
+        console.log(this.tableData)
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      // const url = '/heart/work/act/userlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/heart/work/act/userlist'
+      let params = {
+        actId: this.actId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+
+        if (data.list && data.list.length > 0) {
+          data.list.forEach(item => {
+            if (item.signInFlag) {
+              item.signInFlagShow = '是'
+              item.grantPointShow = '1'
+              item.grantPoint = true
+
+              item.denyRewardReason = ''
+            } else {
+              item.signInFlagShow = '否'
+              item.grantPointShow = '2'
+              item.grantPoint = false
+              item.denyRewardReason = '活动未签到'
+            }
+
+          });
+
+          this.tableData = [...data.list]
+        } else {
+          this.tableData = []
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleConfirm () {
+      if (!this.formData.actualStartTime || !this.formData.actualEndTime) {
+        this.$message({
+          type: "info",
+          message: '请填写实际活动时间'
+        });
+        return false
+      }
+
+
+      let userList = []
+      let reqmsg = ''
+      // actUserRelationId	grantPoint	true:给分；false：不给分	denyRewardReason	拒绝理由
+      this.tableData.forEach(item => {
+        let obj = {}
+        obj.actUserRelationId = item.userId
+        obj.denyRewardReason = item.denyRewardReason
+
+        if (item.grantPointShow === '1') {
+          obj.grantPoint = true
+        } else {
+          obj.grantPoint = false
+          if (!item.denyRewardReason) {
+            reqmsg = '不给分的理由必填'
+          }
+
+        }
+        userList.push(obj)
+      });
+
+      if (reqmsg) {
+        this.$message({
+          type: "info",
+          message: reqmsg
+        });
+        return false
+      } else {
+        console.log(userList)
+        this.finishAct(userList)
+
+      }
+
+
+
+    },
+    async finishAct (userList) {
+
+      // let url = "/heart/work/act/finish"
+      let url = "http://yapi.elinkservice.cn/mock/245/heart/work/act/finish"
+
+
+      let params = {
+        userList: userList,
+        ...this.formData
+      }
+
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: '操作成功'
+        });
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.$emit('finishDiaClose')
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        actualStartTime: [
+          { required: true, message: '活动时间不能为空', trigger: 'blur' }
+        ],
+
+
+      }
+    },
+    tableHeight () {
+      return (this.clientHeight - 440)
+
+    },
+
+    ...mapGetters(['clientHeight'])
+
+  },
+  props: {
+
+
+    actStartTime: {
+      type: String,
+      default: ''
+    },
+    actEndTime: {
+      type: String,
+      default: ''
+    },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/form-main.scss";
+
+.div_table {
+  display: flex;
+  justify-content: center;
+  .m_table {
+    flex: 0 0 1200px;
+    // padding: 20px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue
new file mode 100644
index 00000000..edcb283a
--- /dev/null
+++ b/src/views/modules/communityParty/heart/heartForm.vue
@@ -0,0 +1,982 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="div_form ">
+        <div class="form_flex">
+
+          <div class="form_item">
+            <el-form-item label="主办方"
+                          prop="sponsorId"
+                          label-width="150px">
+              <el-cascader class="item_width_6"
+                           ref="myCascader"
+                           v-model="agencyIdArray"
+                           :options="orgOptions"
+                           :props="orgOptionProps"
+                           :show-all-levels="false"
+                           @change="handleChangeAgency"></el-cascader>
+            </el-form-item>
+
+            <el-form-item label="活动标题"
+                          prop="title"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_6"
+                        type="textarea"
+                        maxlength="50"
+                        show-word-limit
+                        :rows="2"
+                        placeholder="请输入活动标题，不超过50字"
+                        v-model="formData.title"></el-input>
+            </el-form-item>
+
+            <el-form-item label="封面"
+                          prop="coverPic"
+                          label-width="150px"
+                          style="display:block">
+              <el-upload :class="['avatar-uploader', {'hide': hideUploadBtn}] "
+                         ref="uploadPic"
+                         :action="uploadUlr"
+                         list-type="picture-card"
+                         :on-exceed="exceedPic"
+                         :on-remove="removePic"
+                         :file-list="replayImgList"
+                         :on-change="handleEditChange"
+                         :on-success="handleSuccess"
+                         :limit="1">
+                <span class="font-14">选择图片</span>
+
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item label="活动时间"
+                          label-width="150px"
+                          prop="actStartTime">
+              <el-date-picker v-model="formData.actStartTime"
+                              class="list_item_width_3"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="开始时间">
+              </el-date-picker>
+              <span class="data-tag">至</span>
+              <el-date-picker v-model="formData.actEndTime"
+                              class="list_item_width_3 data-tag"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="结束时间">
+              </el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="活动人数"
+                          prop="actQuota"
+                          style="display: block"
+                          label-width="150px">
+              <el-input-number class="item_width_6"
+                               v-model="formData.actQuota"
+                               label="活动人数"></el-input-number>
+            </el-form-item>
+
+            <el-form-item label="活动积分"
+                          prop="reward"
+                          style="display: block"
+                          label-width="150px">
+              <el-input-number class="item_width_6"
+                               v-model="formData.reward"
+                               label="活动积分"></el-input-number>
+            </el-form-item>
+            <el-form-item label="联系人"
+                          prop="sponsorContacts"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_6"
+                        maxlength="10"
+                        placeholder="请输入联系人"
+                        v-model="formData.sponsorContacts">
+              </el-input>
+            </el-form-item>
+          </div>
+          <div class="form_item">
+
+            <el-form-item label="联系电话"
+                          prop="sponsorTel"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_6"
+                        maxlength="10"
+                        placeholder="请输入联系电话"
+                        v-model="formData.sponsorTel">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="报名仅限志愿者"
+                          prop="volunteerLimit"
+                          label-width="150px"
+                          style="display: block">
+              <el-checkbox v-model="formData.volunteerLimit"></el-checkbox>
+
+            </el-form-item>
+
+            <el-form-item label="报名无需审核"
+                          prop="auditSwitch"
+                          label-width="150px"
+                          style="display: block">
+              <el-checkbox v-model="formData.auditSwitch"></el-checkbox>
+              <span class="div-tooltip">（选中后报名参加活动人员可以直接审核通过）</span>
+
+            </el-form-item>
+
+            <el-form-item label="报名截止时间"
+                          style="display: block"
+                          prop="signUpEndTime"
+                          label-width="150px">
+              <el-date-picker class="item_width_6"
+                              v-model="formData.signUpEndTime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              type="datetime"
+                              placeholder="选择时间">
+              </el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="报名条件"
+                          prop="requirement"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_6"
+                        type="textarea"
+                        maxlength="200"
+                        show-word-limit
+                        :rows="5"
+                        placeholder="请输入报名条件，不超过200字"
+                        v-model="formData.requirement"></el-input>
+            </el-form-item>
+
+            <el-form-item label="签到时间"
+                          label-width="150px"
+                          prop="signInStartTime">
+              <el-date-picker v-model="formData.signInStartTime"
+                              class="list_item_width_3"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="开始时间">
+              </el-date-picker>
+              <span class="data-tag">至</span>
+              <el-date-picker v-model="formData.signInEndTime"
+                              class="list_item_width_3 data-tag"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="结束时间">
+              </el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="签到有效范围（米）"
+                          prop="signInRadius"
+                          style="display: block"
+                          label-width="150px">
+              <el-input-number class="item_width_6"
+                               v-model="formData.signInRadius"
+                               label="签到有效范围"></el-input-number>
+            </el-form-item>
+          </div>
+        </div>
+        <div class="form_flex">
+          <div class="form_item">
+            <el-form-item label="活动地点"
+                          prop="actAddress"
+                          label-width="150px">
+              <div style="width: 400px">
+                <el-input class="item_width_4"
+                          maxlength="100"
+                          style="width: 330px"
+                          show-word-limit
+                          placeholder="请输入所在地址"
+                          v-model="formData.actAddress">
+                </el-input>
+                <el-button style="margin-left: 10px"
+                           type="default"
+                           size="small"
+                           @click="handleSearchMapAct">查询</el-button>
+                <div id="map_act_id"
+                     class="div_map"></div>
+                <!-- <div style="margin-top: 10px">
+                  <span>经度</span>
+                  <el-input class="item_width_3"
+                            maxlength="50"
+                            placeholder="请输入经度"
+                            v-model="formData.actLatitude">
+                  </el-input>
+                  <span style="margin-left: 20px">纬度</span>
+                  <el-input class="item_width_3"
+                            maxlength="50"
+                            placeholder="请输入纬度"
+                            v-model="formData.actLongitude">
+                  </el-input>
+                </div> -->
+              </div>
+            </el-form-item>
+          </div>
+          <div class="form_item">
+            <el-form-item label="签到地点"
+                          prop="signInAddress"
+                          label-width="150px">
+              <div style="width: 400px">
+                <el-input class="item_width_4"
+                          maxlength="100"
+                          style="width: 330px"
+                          show-word-limit
+                          placeholder="请输入所在地址"
+                          v-model="formData.signInAddress">
+                </el-input>
+                <el-button style="margin-left: 10px"
+                           type="default"
+                           size="small"
+                           @click="handleSearchMapSignin">查询</el-button>
+                <div id="map_signin_id"
+                     class="div_map"></div>
+                <!-- <div style="margin-top: 10px">
+                  <span>经度</span>
+                  <el-input class="item_width_3"
+                            maxlength="50"
+                            placeholder="请输入经度"
+                            v-model="formData.signInLatitude">
+                  </el-input>
+                  <span style="margin-left: 20px">纬度</span>
+                  <el-input class="item_width_3"
+                            maxlength="50"
+                            placeholder="请输入纬度"
+                            v-model="formData.signInLongitude">
+                  </el-input>
+                </div> -->
+              </div>
+            </el-form-item>
+          </div>
+        </div>
+        <el-form-item label="活动详情"
+                      prop="actContentHtml"
+                      label-width="150px">
+          <!-- <div style="width:400px"> -->
+          <Tinymce class="tinymce_view"
+                   v-if="formType!='detail'"
+                   v-model="formData.actContentHtml"
+                   :height="250"
+                   style="width:1000px"
+                   :customerId="customerId"
+                   placeholder="在这里输入文字" />
+          <p v-else
+             class="text_p"
+             v-html="formData.actContentHtml"></p>
+          <!-- </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>
+    </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'
+
+let loading // 加载动画
+
+var map_act;
+var search_act;
+var markers_act;
+var infoWindowList_act;
+var geocoder_act; // 新建一个正逆地址解析类
+
+var map_signin;
+var search_signin;
+var markers_signin;
+var infoWindowList_signin;
+var geocoder_signin; // 新建一个正逆地址解析类
+
+export default {
+  data () {
+    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      if (this.formData.actStartTime) {
+        let startTime = new Date(this.formData.actStartTime + ':00')
+        return time.getTime() < startTime
+      } else {
+        return ''
+      }
+
+    }
+    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      return time.getTime() > nowData
+    }
+    const valActTime = (rule, value, callback) => {
+      if (value === '' || value === null) {
+        callback(new Error('请选择活动开始时间'))
+      } else if (!this.formData.actEndTime) {
+        callback(new Error('请选择活动结束时间'))
+      } else {
+        callback()
+      }
+    }
+    const valSigninTime = (rule, value, callback) => {
+      if (value === '' || value === null) {
+        callback(new Error('请选择签到开始时间'))
+      } else if (!this.formData.signInEndTime) {
+        callback(new Error('请选择签到结束时间'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      customerId: '',
+      actId: '',
+      valActTime: valActTime,
+      valSigninTime: valSigninTime,
+
+      formData: {
+        actAddress: "",
+        actContentHtml: "",
+        actContent: {},
+        actDraftId: "",
+        actEndTime: "",
+        actId: "",
+        actLatitude: null,
+        actLongitude: null,
+        actQuota: undefined,
+        actStartTime: "",
+        actType: "heart",
+        auditSwitch: false,
+        coverPic: "",
+        coverPicAuditStatus: "",
+        customerId: "",
+
+        noticePassedPeople: false,
+        requirement: "",
+        reward: undefined,
+
+        signInAddress: "",
+        signInEndTime: "",
+        signInLatitude: null,
+        signInLongitude: null,
+        signInRadius: undefined,
+        signInStartTime: "",
+        signUpEndTime: "",
+        sponsorContacts: "",
+        sponsorId: "",
+        sponsorPath: '',
+        sponsorName: "",
+        sponsorTel: "",
+        sponsorType: "",
+        target: "",
+        title: "",
+
+        volunteerLimit: false,
+      },
+      formDataTemp: {
+        actAddress: "山东省青岛市市北区安达路",
+        actContent: {},
+
+        actContentHtml: "",
+        actDraftId: "",
+        actEndTime: "2022-07-20 00:00",
+        actId: "",
+        actLatitude: 36.102321679746424,
+        actLongitude: 120.37441423359928,
+        actQuota: 50,
+        actStartTime: "2022-07-15 00:00",
+        actType: "heart",
+        auditSwitch: true,
+        coverPic: "",
+        coverPicAuditStatus: "",
+        customerId: "",
+        noticePassedPeople: false,
+        requirement: "报名条件报名条件报名条件",
+        reward: 100,
+        signInAddress: "山东省青岛市市南区南京路79号丁",
+        signInEndTime: "2022-07-14 11:00",
+        signInLatitude: 36.07208450171733,
+        signInLongitude: 120.38920734352655,
+        signInRadius: 100,
+        signInStartTime: "2022-07-14 10:00",
+        signUpEndTime: "2022-07-13 00:00",
+        sponsorContacts: "王二麻",
+        sponsorPath: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28,63d5ff92ea981b1c58e4914ac894c610",
+        sponsorId: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
+        sponsorName: "市北区",
+        sponsorTel: "1511111111",
+        sponsorType: "agency",
+        target: "",
+        title: "31231",
+        volunteerLimit: true,
+      },
+
+      orgOptions: [],
+      orgOptionProps: {
+        multiple: false,
+        value: 'gridId',
+        label: 'agencyGridName',
+        children: 'agencyGridList',
+        checkStrictly: true
+      },
+      agencyIdArray: [],
+
+      endPickerOptions: {
+        disabledDate: endDisabledDate
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate
+      },
+
+      //图片相关  oss/file/uploadvariedfile
+      dialogImageUrl: 'oss/file/uploadvariedfile',
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+      //  upload_url: '', // 上传URL
+      upload_name: '', // 图片或视频名称
+      replayImgList: [
+        // {
+        //   id: '1',
+        //   url: 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png'
+        // }
+      ],
+      hideUploadBtn: false
+
+    }
+  },
+  components: { Tinymce },
+  mounted () {
+    this.customerId = localStorage.getItem('customerId')
+    this.initMap()
+    this.loadSponsorlist()
+
+
+
+    // this.replayImgList.push()
+  },
+
+  methods: {
+
+    async initForm (type, actId) {
+      this.$refs.ref_form.resetFields();
+
+      this.formData = JSON.parse(JSON.stringify(this.formDataTemp));
+      this.agencyIdArray = this.formData.sponsorPath.split(',')
+
+      this.formType = type
+      if (actId) {
+        this.startLoading()
+        this.actId = actId
+        this.formData.actId = actId
+        await this.loadFormData()
+        this.endLoading()
+
+      }
+
+    },
+
+    //获取主办方
+    async loadSponsorlist () {
+      const url = "/heart/work/act/sponsorlist"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        data.agencyGridName = data.agencyName
+        data.gridId = data.agencyId
+        data.level = 'agency'
+        this.orgOptions.push(data)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleChangeAgency (val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      if (obj) {
+        this.formData.sponsorId = obj.gridId
+        this.formData.sponsorName = obj.agencyName
+        this.formData.sponsorPath = this.agencyIdArray.join(',')
+
+
+        if (obj.level === 'agency') {
+          this.formData.sponsorType = 'agency'
+        } else {
+          this.formData.sponsorType = 'grid'
+        }
+
+      } else {
+        this.formData.sponsorId = ''
+        this.formData.sponsorPath = ''
+        this.formData.sponsorName = ''
+        this.formData.sponsorType = ''
+      }
+
+    },
+
+    //加载form
+    async loadFormData () {
+      const url = '/heart/work/act/detail'
+
+      let params = {
+        actId: this.actId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        this.formData = JSON.parse(JSON.stringify(data));
+        this.agencyIdArray = this.formData.sponsorPath.split(',')
+        if (this.formData.actContent && this.formData.actContent.length > 0) {
+          this.formData.actContentHtml = this.formData.actContent[0].content
+        }
+
+        if (this.formData.coverPic) {
+          let obj = {
+            id: '111',
+            url: this.formData.coverPic
+          }
+
+          this.replayImgList = []
+          this.replayImgList.push(obj)
+
+          this.hideUploadBtn = true
+        }
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+      console.log(this.formData)
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 3000)
+
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+
+        if (!valid) {
+
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+          this.addHeartAct()
+        }
+
+      })
+
+    },
+    async addHeartAct () {
+      let obj = {
+        contentType: 'rich_text',
+        content: this.dormatHtml(this.formData.actContentHtml)
+      }
+      this.formData.actContent = []
+      this.formData.actContent.push(obj)
+
+      this.formData.customerId = this.customerId
+
+      let url = "/heart/work/act/publishV2"
+      if (this.actId) {
+        url = '/heart/work/act/republishV2'
+      } else {
+        url = "/heart/work/act/publishV2"
+      }
+
+      // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
+
+
+      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)
+      }
+
+    },
+
+    dormatHtml (content) {
+      let c = ''
+      if (content.indexOf('DOCTYPE') != -1) {
+        c = content.slice(45, -16);
+      }
+      console.log('content', typeof content)
+      return c || content
+    },
+
+    removePic (file, fileList) {
+
+      this.formData.coverPic = ''
+      this.replayImgList = []
+      this.hideUploadBtn = fileList.length >= 1;
+
+    },
+    // 最多上传3张图，超过时隐藏上传按钮
+    handleEditChange (file, fileList) {
+
+      this.hideUploadBtn = fileList.length >= 1;
+    },
+    exceedPic () {
+      this.$message.warning("只能上传1张封面图")
+
+    },
+    handleSuccess (response, file, fileList) {
+      this.replayImgList.push(file)
+      this.formData.coverPic = response.data.url
+
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519);
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map_act = new window.TMap.Map(document.getElementById("map_act_id"), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
+      });
+      map_signin = new window.TMap.Map(document.getElementById("map_signin_id"), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
+      });
+
+      search_act = new window.TMap.service.Search({ pageSize: 10 });
+      // 新建一个地点搜索类
+      markers_act = new TMap.MultiMarker({
+        map: map_act,
+        geometries: [],
+      });
+      infoWindowList_act = Array(10);
+
+      geocoder_act = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      search_signin = new window.TMap.service.Search({ pageSize: 10 });
+      // 新建一个地点搜索类
+      markers_signin = new TMap.MultiMarker({
+        map: map_signin,
+        geometries: [],
+      });
+      infoWindowList_signin = Array(10);
+
+      geocoder_signin = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map_act.on("panend", (e) => {
+        this.handleMoveCenterAct(e);
+      });
+      this.handleMoveCenterAct();
+
+      // 监听地图平移结束
+      map_signin.on("panend", (e) => {
+        this.handleMoveCenterSignin(e);
+      });
+      this.handleMoveCenterSignin();
+    },
+
+    setMarkerAct (lat, lng) {
+      markers_act.setGeometries([]);
+      markers_act.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
+
+    handleSearchMapAct () {
+      infoWindowList_act.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList_act.length = 0;
+      markers_act.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search_act
+        .searchRectangle({
+          keyword: this.formData.actAddress,
+          bounds: map_act.getBounds(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+            map_act.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarkerAct(lat, lng);
+            this.formData.actLatitude = lat;
+            this.formData.actLongitude = lng;
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
+
+    handleMoveCenterAct (e) {
+      //修改地图中心点
+      const center = map_act.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.formData.actLatitude = lat;
+      this.formData.actLongitude = lng;
+      this.setMarkerAct(lat, lng);
+
+      if (e && e.originalEvent) {
+        geocoder_act
+          .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
+          .then((result) => {
+            this.formData.actAddress = result.result.address;
+          });
+      }
+    },
+    setMarkerSignin (lat, lng) {
+      markers_signin.setGeometries([]);
+      markers_signin.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
+
+    handleSearchMapSignin () {
+      infoWindowList_signin.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList_signin.length = 0;
+      markers_signin.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search_signin
+        .searchRectangle({
+          keyword: this.formData.signInAddress,
+          bounds: map_signin.getBounds(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+            map_signin.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarkerSignin(lat, lng);
+            this.formData.signInLatitude = lat;
+            this.formData.signInLongitude = lng;
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
+
+    handleMoveCenterSignin (e) {
+      //修改地图中心点
+      const center = map_signin.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.formData.signInLatitude = lat;
+      this.formData.signInLongitude = lng;
+      this.setMarkerSignin(lat, lng);
+
+      if (e && e.originalEvent) {
+        geocoder_signin
+          .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
+          .then((result) => {
+            this.formData.signInAddress = result.result.address;
+          });
+      }
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.formData = {
+        actAddress: "",
+        actContentHtml: "",
+        actContent: {},
+        actDraftId: "",
+        actEndTime: "",
+        actId: "",
+        actLatitude: null,
+        actLongitude: null,
+        actQuota: undefined,
+        actStartTime: "",
+        actType: "heart",
+        auditSwitch: false,
+        coverPic: "",
+        coverPicAuditStatus: "",
+        customerId: "",
+
+        noticePassedPeople: false,
+        requirement: "",
+        reward: undefined,
+
+        signInAddress: "",
+        signInEndTime: "",
+        signInLatitude: null,
+        signInLongitude: null,
+        signInRadius: undefined,
+        signInStartTime: "",
+        signUpEndTime: "",
+        sponsorContacts: "",
+        sponsorId: "",
+        sponsorPath: '',
+        sponsorName: "",
+        sponsorTel: "",
+        sponsorType: "",
+        target: "",
+        title: "",
+
+        volunteerLimit: false,
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+        sponsorId: [
+          { required: true, message: '主办方不能为空', trigger: 'change' }
+        ],
+        title: [
+          { required: true, message: '活动标题不能为空', trigger: 'change' },
+        ],
+
+        coverPic: [
+          { required: true, message: '封面图不能为空', trigger: 'change' }
+        ],
+
+        actContentHtml: [
+          { required: true, message: '活动详情不能为空', trigger: 'change' }
+        ],
+        actAddress: [
+          { required: true, message: '活动地点不能为空', trigger: 'change' }
+        ],
+        actStartTime: [
+          { required: true, validator: this.valActTime, message: '活动时间不能为空', trigger: 'change' }
+        ],
+        actQuota: [
+          { required: true, message: '活动人数不能为空', trigger: 'change' }
+        ],
+        reward: [
+          { required: true, message: '活动积分不能为空', trigger: 'change' }
+        ],
+        signUpEndTime: [
+          { required: true, message: '报名截止时间不能为空', trigger: 'change' }
+        ],
+        signInStartTime: [
+          { required: true, validator: this.valSigninTime, message: '签到时间不能为空', trigger: 'change' }
+        ],
+        signInAddress: [
+          { required: true, message: '签到地点不能为空', trigger: 'change' }
+        ],
+        signInRadius: [
+          { required: true, message: '签到有效范围不能为空', trigger: 'change' }
+        ],
+        sponsorContacts: [
+          { required: true, message: '联系人不能为空', trigger: 'change' }
+        ],
+        sponsorTel: [
+          { required: true, message: '联系电话不能为空', trigger: 'change' }
+        ],
+      }
+    },
+
+  },
+  props: {
+
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/form-main.scss";
+
+.avatar-uploader {
+  margin: 0 0 0 20px;
+}
+.div-tooltip {
+  margin-left: 10px;
+  color: red;
+}
+</style>
+
+<style lang="scss">
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+
+.hide {
+  .el-upload--picture-card {
+    display: none !important;
+  }
+}
+</style>
+
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
new file mode 100644
index 00000000..8bdfcad9
--- /dev/null
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -0,0 +1,649 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'100px'">
+
+        <el-form-item label="活动标题"
+                      prop="title">
+          <el-input v-model="formData.title"
+                    size="small"
+                    class="item_width_1"
+                    clearable
+                    placeholder="请输入活动标题">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="活动时间"
+                      prop="actStartTime">
+          <el-date-picker v-model="formData.actStartTime"
+                          :picker-options="startPickerOptions"
+                          class="item_width_2"
+                          size="small"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd"
+                          placeholder="开始时间">
+          </el-date-picker>
+          <span class="data-tag">至</span>
+          <el-date-picker v-model="formData.actEndTime"
+                          :picker-options="endPickerOptions"
+                          class="item_width_2 data-tag"
+                          size="small"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd"
+                          placeholder="结束时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="状态"
+                      prop="status">
+          <el-select class="item_width_1"
+                     v-model="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-button style="margin-left:30px"
+                   size="small"
+                   class="diy-button--search"
+                   @click="handleSearch">查询</el-button>
+        <el-button style="margin-left:10px"
+                   size="small"
+                   class="diy-button--reset"
+                   @click="resetSearch">重置</el-button>
+
+      </el-form>
+    </div>
+    <div class="div_table">
+      <el-button class="diy-button--add"
+                 size="small"
+                 @click="handleAdd">新增</el-button>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="title"
+                         header-align="center"
+                         align="center"
+                         label="活动标题"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="actAddress"
+                         header-align="center"
+                         align="center"
+                         label="活动地址"
+                         min-width="180">
+        </el-table-column>
+
+        <el-table-column prop="actStartTime"
+                         header-align="center"
+                         align="center"
+                         label="活动时间"
+                         min-width="180">
+          <template slot-scope="scope">
+            <span>{{scope.row.actStartTime+'至'+scope.row.actEndTime}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="signUpEndTime"
+                         header-align="center"
+                         align="center"
+                         label="报名截止时间"
+                         min-width="110">
+        </el-table-column>
+        <el-table-column prop="statusShow"
+                         header-align="center"
+                         align="center"
+                         label="状态"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="richTextFlagShow"
+                         header-align="center"
+                         align="center"
+                         label="来源"
+                         width="100">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="240"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+
+            <el-button v-if="scope.row.isMyPublish&&(scope.row.status==='signing_up' || scope.row.status==='end_sign_up' || scope.row.status==='enough')&&scope.row.richTextFlag"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="scope.row.isMyPublish&&scope.row.status==='signing_up' || scope.row.status==='end_sign_up' || scope.row.status==='enough'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleAudit(scope.row)">报名审核</el-button>
+
+            <el-button v-if="scope.row.isMyPublish&&scope.row.status==='signing_up' || scope.row.status==='end_sign_up' || scope.row.status==='enough'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleCancleAct(scope.row)">取消活动</el-button>
+
+            <el-button v-if="scope.row.isMyPublish&&scope.row.status==='in_progress' || scope.row.status==='finished'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handlePerson(scope.row)">查看人员</el-button>
+
+            <el-button v-if="scope.row.isMyPublish&&scope.row.status==='in_progress'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleFinishAct(scope.row)">结束活动</el-button>
+
+            <el-button v-if="scope.row.isMyPublish&&scope.row.status==='finished' && !scope.row.summaryFlag"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleReview(scope.row)">添加回顾</el-button>
+
+            <!-- <el-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left:10px"
+                        width="20"
+                        trigger="click">
+              <div class="table-more-btn">
+                <el-button type="text"
+                           class="div-table-button--edit"
+                           size="small"
+                           @click="handleReview(scope.row)">报名审核</el-button>
+              </div>
+
+              <div class="table-more-btn">
+                <el-button type="text"
+                           class="div-table-button--delete"
+                           size="small"
+                           @click="handleDelete(scope.row)">删除</el-button>
+              </div>
+
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--more"
+                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+            </el-popover> -->
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :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="1350px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <heart-form ref="ref_form"
+                  @dialogCancle="addFormCancle"
+                  @dialogOk="addFormOk"></heart-form>
+    </el-dialog>
+
+    <!-- 活动取消原因 -->
+
+    <el-dialog :visible.sync="cancleShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'活动取消原因'"
+               width="550px"
+               top="5vh"
+               class="dialog-h"
+               @closed="cancleDiaClose">
+      <div style="padding:30px">
+
+        <el-input class="item_width_5"
+                  type="textarea"
+                  maxlength="100"
+                  show-word-limit
+                  :rows="4"
+                  placeholder="请输入取消理由"
+                  v-model="cancelReason"></el-input>
+        <div style="display:flex;  justify-content: center;margin-top:20px">
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="cancleDiaClose">取消</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="cancleAct">确定</el-button>
+        </div>
+      </div>
+
+    </el-dialog>
+
+    <!-- 报名审核弹出框 -->
+    <el-dialog :visible.sync="auditShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'报名审核'"
+               width="80%"
+               top="5vh"
+               class="dialog-h"
+               @closed="auditDiaClose">
+      <heart-audit ref="ref_audit"></heart-audit>
+    </el-dialog>
+
+    <!-- 查看人员弹出框 -->
+    <el-dialog :visible.sync="personShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'查看人员'"
+               width="80%"
+               top="5vh"
+               class="dialog-h"
+               @closed="personDiaClose">
+      <heart-person ref="ref_person"></heart-person>
+    </el-dialog>
+
+    <!-- 活动结束弹出框 -->
+    <el-dialog :visible.sync="finishShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'活动结束'"
+               width="1350px"
+               top="5vh"
+               class="dialog-h"
+               @closed="finishDiaClose">
+      <heart-finish ref="ref_finish"
+                    :actStartTime="actStartTime"
+                    :actEndTime="actEndTime"
+                    @finishDiaClose="finishDiaClose"></heart-finish>
+    </el-dialog>
+
+    <!-- 活动回顾弹出框 -->
+    <el-dialog :visible.sync="reviewShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'活动回顾'"
+               width="1350px"
+               top="5vh"
+               class="dialog-h"
+               @closed="reviewDiaClose">
+      <heart-review ref="ref_review"
+                    @reviewDiaClose="reviewDiaClose"></heart-review>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import heartForm from './heartForm'
+import heartAudit from './heartAudit'
+import heartPerson from './heartPerson'
+import heartFinish from './heartFinish'
+import heartReview from './heartReview'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      if (this.formData.actactStartTime) {
+        let actStartTime = new Date(this.formData.actactStartTime + ':00')
+        return time.getTime() < actStartTime || time.getTime() === actStartTime
+      } else {
+        return time.getTime() > nowData
+      }
+
+    }
+    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      return time.getTime() > nowData
+    }
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      endPickerOptions: {
+        disabledDate: endDisabledDate
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate
+      },
+
+      agencyId: '',
+
+      statusList: [
+        {
+          value: 'published',
+          label: '进行中'
+        },
+        {
+          value: 'finished',
+          label: '已结束'
+        },
+        {
+          value: 'canceled',
+          label: '已取消'
+        }
+      ],//是否合格list
+
+      formData: {
+        title: '',//活动标题
+        actStartTime: '',
+        actEndTime: '',
+        status: ''
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增爱心互助',
+      actId: '',
+      actStartTime: '',
+      actEndTime: '',
+
+      cancelReason: '',
+      cancleShow: false,//活动取消
+      auditShow: false,//报名审核
+      personShow: false,//查看人员
+      finishShow: false,//活动结束
+      reviewShow: false,//添加回顾
+
+    }
+  },
+  components: {
+    heartForm, heartAudit, heartPerson, heartFinish, heartReview
+  },
+  async created () {
+
+  },
+  async mounted () {
+
+    this.customerId = localStorage.getItem('customerId')
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/heart/work/act/pagelist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/work/act/pagelist"
+      let params = {
+
+        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
+        if (this.tableData && this.tableData.length > 0) {
+          this.tableData.forEach(element => {
+            if (element.richTextFlag) {
+              element.richTextFlagShow = '管理平台'
+            } else {
+              element.richTextFlagShow = '小程序'
+            }
+            //活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough；已取消：canceled; 已结束：finished
+            if (element.status === 'signing_up') {
+              element.statusShow = '报名中'
+            } else if (element.status === 'end_sign_up') {
+              element.statusShow = '截止报名'
+            } else if (element.status === 'in_progress') {
+              element.statusShow = '已开始'
+            } else if (element.status === 'enough') {
+              element.statusShow = '已报满'
+            } else if (element.status === 'canceled') {
+              element.statusShow = '已取消'
+            } else if (element.status === 'finished') {
+              element.statusShow = '已结束'
+            } else {
+              element.statusShow = ''
+            }
+          });
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+
+    reviewDiaClose () {
+      this.reviewShow = false
+    },
+
+
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.actId)
+      })
+    },
+
+    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.actId)
+      })
+    },
+
+    handleAudit (row) {
+      this.auditShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_audit.initTable(row.actId)
+      })
+    },
+    handlePerson (row) {
+      this.personShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_person.initTable(row.actId)
+      })
+    },
+    handleReview (row) {
+      this.reviewShow = true
+
+    },
+    handleFinishAct (row) {
+      this.finishShow = true
+      // this.actStartTime = row.actStartTime
+      // this.actEndTime = row.actEndTime
+      this.actStartTime = '2022-06-30 10:00:00'
+      this.actEndTime = '2022-06-30 10:00:00'
+      this.$nextTick(() => {
+        this.$refs.ref_finish.initTable(row.actId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+    },
+
+    async handleCancleAct (row) {
+      this.cancleShow = true
+      this.actId = row.actId
+    },
+
+    async cancleAct () {
+      const url = "/heart/work/act/cancelact"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/del"
+
+      let params = {
+        actId: this.actId,
+        cancelReason: this.cancelReason,
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.cancleShow = false
+        this.$message({
+          type: "success",
+          message: "取消成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    auditDiaClose () {
+
+      this.auditShow = false//
+    },
+    personDiaClose () {
+
+      this.personShow = false//
+    },
+    finishDiaClose () {
+
+      this.finishShow = false//
+    },
+    cancleDiaClose () {
+      this.cancelReason = ''
+      this.cancleShow = false//活动取消
+    },
+
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        title: '',//活动标题
+
+        actStartTime: '',
+        actEndTime: '',
+        status: ''
+      }
+      this.pageSize = 20
+      this.pageNo = 0
+      this.loadTable()
+    },
+
+
+    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 - 340 + this.iframeHeight : this.clientHeight - 340
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
diff --git a/src/views/modules/communityParty/heart/heartPerson.vue b/src/views/modules/communityParty/heart/heartPerson.vue
new file mode 100644
index 00000000..44307c0c
--- /dev/null
+++ b/src/views/modules/communityParty/heart/heartPerson.vue
@@ -0,0 +1,338 @@
+<template>
+  <div class="dialog-h-content scroll-h">
+    <div class="div_table">
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50">
+        </el-table-column>
+
+        <el-table-column prop="realName"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="250">
+
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机"
+                         width="100">
+
+        </el-table-column>
+
+        <el-table-column prop="idNum"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         min-width="180">
+
+        </el-table-column>
+        <el-table-column prop="nickName"
+                         header-align="center"
+                         align="center"
+                         label="昵称"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="signUpActNum"
+                         header-align="center"
+                         align="center"
+                         label="报名活动个数"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="signInActNum"
+                         header-align="center"
+                         align="center"
+                         label="实际参加活动个数"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="obtainPointsActNum"
+                         header-align="center"
+                         align="center"
+                         label="获得积分活动个数"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="signUpTime"
+                         header-align="center"
+                         align="center"
+                         label="报名时间"
+                         width="120">
+
+        </el-table-column>
+        <el-table-column prop="statusShow"
+                         header-align="center"
+                         align="center"
+                         label="状态"
+                         width="120">
+
+        </el-table-column>
+
+      </el-table>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      tableLoading: false,
+      actId: '',
+      tableData: [],
+      actUserRelationIdList: [],
+
+      cancelReason: '',
+      cancleShow: false,//拒绝审核
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initTable (actId) {
+      this.actId = actId
+      await this.loadTable()
+
+    },
+
+    checkSelect (row, index) {
+      //待审核：auditing；已通过：passed；已拒绝：refused；已取消：canceled
+      let isChecked = false;
+      if (row.status === 'auditing') { // 判断里面是否存在某个参数
+        isChecked = true
+      } else {
+        isChecked = false
+      }
+      return isChecked
+    },
+
+    selectionChange (selection) {
+      this.actUserRelationIdList = []
+      this.actUserRelationIdList = selection
+
+    },
+
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      // const url = '/heart/work/act/userlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/heart/work/act/userlist'
+      let params = {
+        actId: this.actId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+
+        if (data.list && data.list.length > 0) {
+          data.list.forEach(item => {
+            //待审核：auditing；已通过：passed；已拒绝：refused；已取消：canceled
+            if (item.status === 'auditing') {
+              item.statusShow = '待审核'
+            } else if (item.status === 'passed') {
+              item.statusShow = '已通过'
+            } else if (item.status === 'refused') {
+              item.statusShow = '已拒绝'
+            } else if (item.status === 'canceled') {
+              item.statusShow = '已取消'
+            } else {
+              item.statusShow = ''
+            }
+
+          });
+
+          this.tableData = [...data.list]
+        } else {
+          this.tableData = []
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleReject () {
+      // if (this.actUserRelationIdList.length === 0) {
+      //   this.$message({
+      //     type: "info",
+      //     message: "请选择人员"
+      //   });
+      //   return false
+      // }
+      this.cancleShow = true
+
+    },
+
+    async handleComfirm (row, tableIndex) {
+      let valiMsg = this.validata(row)
+      if (valiMsg) {
+        this.$message({
+          type: 'warning',
+          message: valiMsg
+        })
+        return false
+      }
+
+      this.addReview(row, tableIndex)
+
+    },
+    async addReview (row, tableIndex) {
+
+      let url = "/gov/org/placepatrolreviewrecord/add"
+      if (row.placePatrolReviewRecordId) {
+        url = "/gov/org/placepatrolreviewrecord/edit"
+      }
+
+      let params = JSON.parse(JSON.stringify(row))
+      params.inspectors = params.inspectorArray.join(',')
+      params.reviewTime = params.reviewTime + ' 00:00:00'
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        let array = data.reviewTime.split(' ')
+        data.reviewTime = array[0]
+        data.isEdit = false
+        data.isNew = false
+
+        this.$set(this.tableData, tableIndex, data)
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    async handleAudit (type) {
+      if (this.actUserRelationIdList.length === 0) {
+        this.$message({
+          type: "info",
+          message: "请选择人员"
+        });
+        return false
+      }
+      if (type = 'refused' && !this.cancelReason) {
+        this.$message({
+          type: "info",
+          message: "请填写拒绝理由"
+        });
+        return false
+      }
+      const url = "/heart/work/act/audit-user"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/work/act/audit-user"
+
+      let params = {
+        actId: this.actId,
+        type: type,
+        rejectReason: this.cancelReason,
+        actUserRelationIdList: this.actUserRelationIdList
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    cancleDiaClose () {
+      this.cancelReason = ''
+      this.cancleShow = false//审核拒绝
+    },
+
+    handleCancle () {
+      this.$emit('dialogCancle')
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+
+    ...mapGetters(['clientHeight'])
+
+  },
+  props: {
+
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+.item_width_1 {
+  width: 250px;
+}
+.item_width_2 {
+  width: 100px;
+}
+.div_table {
+  margin-top: 10px;
+
+  .table {
+    margin-top: 10px;
+  }
+}
+.div_btn {
+  margin-top: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/src/views/modules/communityParty/heart/heartReview.vue b/src/views/modules/communityParty/heart/heartReview.vue
new file mode 100644
index 00000000..8724d640
--- /dev/null
+++ b/src/views/modules/communityParty/heart/heartReview.vue
@@ -0,0 +1,234 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               class="div_form ">
+
+        <el-form-item label="活动回顾"
+                      prop="actContent"
+                      label-width="150px">
+          <!-- <div style="width:400px"> -->
+          <Tinymce class="tinymce_view"
+                   v-if="formType!='detail'"
+                   v-model="formData.actContent"
+                   :height="450"
+                   style="width:1000px"
+                   :customerId="customerId"
+                   placeholder="在这里输入文字" />
+          <p v-else
+             class="text_p"
+             v-html="formData.actContent"></p>
+          <!-- </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>
+    </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'
+
+let loading // 加载动画
+
+
+export default {
+  data () {
+
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      customerId: '',
+      actId: '',
+
+      formData: {
+        actContent: '',
+      },
+
+
+
+
+    }
+  },
+  components: { Tinymce },
+  mounted () {
+    this.customerId = localStorage.getItem('customerId')
+
+  },
+
+  methods: {
+
+    async initForm (type, actId) {
+      this.$refs.ref_form.resetFields();
+      this.startLoading()
+
+      this.formType = type
+      if (actId) {
+        this.actId = actId
+        this.formData.actId = actId
+
+
+      }
+      this.endLoading()
+    },
+
+
+
+
+    async handleComfirm () {
+      console.log(this.formData)
+      // 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.addRecord()
+      //   }
+
+      // })
+
+    },
+    async addRecord () {
+      this.formData.actContent = this.dormatHtml(this.formData.actContent)
+
+      let url = "/gov/org/placepatrolrecord/add"
+      // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
+      this.formData.inspectors = this.formData.inspectorArray.join(',')
+
+      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)
+      }
+
+    },
+
+    dormatHtml (content) {
+      let c = ''
+      if (content.indexOf('DOCTYPE') != -1) {
+        c = content.slice(45, -16);
+      }
+      console.log('content', typeof content)
+      return c || content
+    },
+
+
+
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.formData = {
+        actContent: '',
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+        gridId: [
+          { required: true, message: '场所网格不能为空', trigger: 'blur' }
+        ],
+        ninePlaceVal: [
+          { required: true, message: '场所类型不能为空', trigger: 'blur' },
+        ],
+        placeOrgId: [
+          { required: true, message: '场所名称不能为空', trigger: 'blur' }
+        ],
+        placePatrolTeamId: [
+          { required: true, message: '分队不能为空', trigger: 'blur' }
+        ],
+
+        inspectorArray: [
+          { required: true, message: '巡检人员不能为空', trigger: 'blur' }
+        ],
+        firstTime: [
+          { required: true, message: '首次巡查时间不能为空', trigger: 'blur' }
+        ],
+        detailed: [
+          { required: true, message: '隐患明细不能为空', trigger: 'blur' }
+        ],
+        firstResult: [
+          { required: true, message: '首次巡查结果不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/form-main.scss";
+
+.avatar-uploader {
+  margin: 0 0 0 20px;
+}
+</style>
+
+<style lang="scss">
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+
+.hide {
+  .el-upload--picture-card {
+    display: none !important;
+  }
+}
+</style>
+
diff --git a/src/views/modules/workPc/guidance/DetailForm.vue b/src/views/modules/workPc/guidance/DetailForm.vue
index 8b878642..8bea54ce 100644
--- a/src/views/modules/workPc/guidance/DetailForm.vue
+++ b/src/views/modules/workPc/guidance/DetailForm.vue
@@ -334,7 +334,7 @@ export default {
         this.$message.error(msg)
       }
     },
-    dormatHtml(content) {
+    dormatHtml (content) {
       let c = ''
       if (content.indexOf('DOCTYPE') != -1) {
         c = content.slice(45, -16);