diff --git a/src/views/modules/events/epdcevents-add-or-update.vue b/src/views/modules/events/epdcevents-add-or-update.vue
new file mode 100644
index 00000000..52110a4e
--- /dev/null
+++ b/src/views/modules/events/epdcevents-add-or-update.vue
@@ -0,0 +1,229 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="议题内容" prop="issueContent">
+          <el-input v-model="dataForm.issueContent" placeholder="议题内容"></el-input>
+      </el-form-item>
+          <el-form-item label="区" prop="area">
+          <el-input v-model="dataForm.area" placeholder="区"></el-input>
+      </el-form-item>
+          <el-form-item label="区ID" prop="areaId">
+          <el-input v-model="dataForm.areaId" placeholder="区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="街道" prop="street">
+          <el-input v-model="dataForm.street" placeholder="街道"></el-input>
+      </el-form-item>
+          <el-form-item label="街道ID" prop="streetId">
+          <el-input v-model="dataForm.streetId" placeholder="街道ID"></el-input>
+      </el-form-item>
+          <el-form-item label="社区" prop="community">
+          <el-input v-model="dataForm.community" placeholder="社区"></el-input>
+      </el-form-item>
+          <el-form-item label="社区ID" prop="communityId">
+          <el-input v-model="dataForm.communityId" placeholder="社区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="网格" prop="grid">
+          <el-input v-model="dataForm.grid" placeholder="网格"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="议题位置地址" prop="issueAddress">
+          <el-input v-model="dataForm.issueAddress" placeholder="议题位置地址"></el-input>
+      </el-form-item>
+          <el-form-item label="议题分类ID" prop="issueCategoryId">
+          <el-input v-model="dataForm.issueCategoryId" placeholder="议题分类ID"></el-input>
+      </el-form-item>
+          <el-form-item label="议题位置纬度" prop="issusLatitude">
+          <el-input v-model="dataForm.issusLatitude" placeholder="议题位置纬度"></el-input>
+      </el-form-item>
+          <el-form-item label="议题位置经度" prop="issueLongitude">
+          <el-input v-model="dataForm.issueLongitude" placeholder="议题位置经度"></el-input>
+      </el-form-item>
+          <el-form-item label="友邻社区ID" prop="friendlyCommunityId">
+          <el-input v-model="dataForm.friendlyCommunityId" placeholder="友邻社区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="事件状态 0-待审核，2-驳回，4-审核通过" prop="eventState">
+          <el-input v-model="dataForm.eventState" placeholder="事件状态 0-待审核，2-驳回，4-审核通过"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        issueContent: '',
+        area: '',
+        areaId: '',
+        street: '',
+        streetId: '',
+        community: '',
+        communityId: '',
+        grid: '',
+        gridId: '',
+        issueAddress: '',
+        issueCategoryId: '',
+        issusLatitude: '',
+        issueLongitude: '',
+        friendlyCommunityId: '',
+        eventState: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        issueContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        area: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        areaId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        street: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        streetId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        community: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        grid: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        issueAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        issueCategoryId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        issusLatitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        issueLongitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        friendlyCommunityId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        eventState: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/demo/epdcevents/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/demo/epdcevents/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/events/epdcevents.vue b/src/views/modules/events/epdcevents.vue
new file mode 100644
index 00000000..1189bca9
--- /dev/null
+++ b/src/views/modules/events/epdcevents.vue
@@ -0,0 +1,101 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-demo__epdcevents}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="时间" prop="startTime">
+          <el-date-picker
+                  v-model="dataForm.startTime"
+                  type="date"
+                  :picker-options="pickerBeginDateBefore"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" label-width = "25px" prop="endTime">
+          <el-date-picker
+                  v-model="dataForm.endTime"
+                  type="date"
+                  :picker-options="pickerBeginDateAfter"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('events:epdcevents:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('events:epdcevents:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
+        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('events:epdcevents:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('events:epdcevents:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './epdcevents-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/epdcevents/page',
+        getDataListIsPage: true,
+        deleteURL: '/events/epdcevents',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        startTime: '',
+        endTime: ''
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>