From de12870bbaf0d44c1f452e7da987c55f297e78b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Wed, 4 Sep 2019 20:59:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/item-add-or-update.vue     | 264 ++++++++++++++++++
 src/views/modules/events/item.vue             |  77 +++++
 2 files changed, 341 insertions(+)
 create mode 100755 src/views/modules/events/item-add-or-update.vue
 create mode 100755 src/views/modules/events/item.vue

diff --git a/src/views/modules/events/item-add-or-update.vue b/src/views/modules/events/item-add-or-update.vue
new file mode 100755
index 00000000..bed768bb
--- /dev/null
+++ b/src/views/modules/events/item-add-or-update.vue
@@ -0,0 +1,264 @@
+<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="eventId">
+          <el-input v-model="dataForm.eventId" placeholder="事件ID"></el-input>
+      </el-form-item>
+          <el-form-item label="议题ID" prop="issueId">
+          <el-input v-model="dataForm.issueId" placeholder="议题ID"></el-input>
+      </el-form-item>
+          <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="nickName">
+          <el-input v-model="dataForm.nickName" placeholder="用户昵称"></el-input>
+      </el-form-item>
+          <el-form-item label="用户头像" prop="userFace">
+          <el-input v-model="dataForm.userFace" placeholder="用户头像"></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="评价打分" prop="issueScore">
+          <el-input v-model="dataForm.issueScore" placeholder="评价打分"></el-input>
+      </el-form-item>
+          <el-form-item label="项目状态 0-待网格长处理，5-待社区处理，10-待街道党建办处理，15-待街道处理，20-待区直部门党建办处理，25-待区直部门处理，30-处理，35-关闭，40-结束议题" prop="itemState">
+          <el-input v-model="dataForm.itemState" placeholder="项目状态 0-待网格长处理，5-待社区处理，10-待街道党建办处理，15-待街道处理，20-待区直部门党建办处理，25-待区直部门处理，30-处理，35-关闭，40-结束议题"></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: '',
+        eventId: '',
+        issueId: '',
+        userId: '',
+        nickName: '',
+        userFace: '',
+        issueContent: '',
+        area: '',
+        areaId: '',
+        street: '',
+        streetId: '',
+        community: '',
+        communityId: '',
+        grid: '',
+        gridId: '',
+        issueAddress: '',
+        issueCategoryId: '',
+        issusLatitude: '',
+        issueLongitude: '',
+        friendlyCommunityId: '',
+        issueScore: '',
+        itemState: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        eventId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        issueId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userFace: [
+          { 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' }
+        ],
+        issueScore: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        itemState: [
+          { 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(`/events/item/${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']('/events/item/', 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/item.vue b/src/views/modules/events/item.vue
new file mode 100755
index 00000000..ddfac40f
--- /dev/null
+++ b/src/views/modules/events/item.vue
@@ -0,0 +1,77 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-item__item}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </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('item:item:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('item:item: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 type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="eventId" label="事件ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueId" label="议题ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="userId" label="用户ID" 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 prop="userFace" label="用户头像" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueAddress" label="议题位置地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueCategoryId" label="议题分类ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issusLatitude" label="议题位置纬度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueLongitude" label="议题位置经度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="friendlyCommunityId" label="友邻社区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueScore" label="评价打分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="itemState" label="项目状态 0-待网格长处理，5-待社区处理，10-待街道党建办处理，15-待街道处理，20-待区直部门党建办处理，25-待区直部门处理，30-处理，35-关闭，40-结束议题" 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('item:item:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('item:item: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 './item-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true,
+        deleteURL: '/events/item',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From d1678cdfb9a56995e1d4e0e259e114ca14be7b72 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 5 Sep 2019 09:59:33 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/news/notice-add-or-update.vue     | 266 ++++++++++++++++++
 src/views/modules/news/notice.vue             | 111 ++++++++
 2 files changed, 377 insertions(+)
 create mode 100644 src/views/modules/news/notice-add-or-update.vue
 create mode 100644 src/views/modules/news/notice.vue

diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
new file mode 100644
index 00000000..9a2753d5
--- /dev/null
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -0,0 +1,266 @@
+<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="所属街道"
+                    prop="deptId">
+        <el-select v-model="streetId"
+                   @change="changeStreet"
+                   placeholder="所属街道">
+          <el-option v-for="item in streetList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属社区">
+        <el-select v-model="communityId"
+                   @change="changeCommunity"
+                   placeholder="所属社区">
+          <el-option v-for="item in communityList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属网格">
+        <el-select v-model="gridId"
+                   @change="changeGrid"
+                   placeholder="所属网格">
+          <el-option v-for="item in gridList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="通知标题"
+                    prop="noticeTitle">
+        <el-input v-model="dataForm.noticeTitle"
+                  placeholder="通知标题"></el-input>
+      </el-form-item>
+      <el-form-item prop="noticeContent"
+                    label="通知内容">
+        <!-- 富文本编辑器, 容器 -->
+        <div id="J_quillEditor"></div>
+        <!-- 自定义上传图片功能 (使用element upload组件) -->
+        <el-upload :action="uploadUrl"
+                   :show-file-list="false"
+                   :before-upload="uploadBeforeUploadHandle"
+                   :on-success="uploadSuccessHandle"
+                   style="display: none;">
+          <el-button ref="uploadBtn"
+                     type="primary"
+                     size="small">{{ $t('upload.button') }}</el-button>
+        </el-upload>
+      </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 Cookies from 'js-cookie'
+import debounce from 'lodash/debounce'
+import 'quill/dist/quill.snow.css'
+import Quill from 'quill'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        dept: '',
+        deptId: '',
+        noticeTitle: '',
+        noticeContent: ''
+      },
+      // 富文本
+      quillEditor: null,
+      quillEditorToolbarOptions: [
+        ['bold', 'italic', 'underline', 'strike'],
+        ['blockquote', 'code-block', 'image'],
+        [{ 'header': 1 }, { 'header': 2 }],
+        [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+        [{ 'script': 'sub' }, { 'script': 'super' }],
+        [{ 'indent': '-1' }, { 'indent': '+1' }],
+        [{ 'direction': 'rtl' }],
+        [{ 'size': ['small', false, 'large', 'huge'] }],
+        [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+        [{ 'color': [] }, { 'background': [] }],
+        [{ 'font': [] }],
+        [{ 'align': [] }],
+        ['clean']
+      ],
+      uploadUrl: '',
+      // 富文本end
+      streetId: '',
+      streetList: [],
+      communityId: '',
+      communityList: [],
+      gridId: '',
+      gridList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        noticeTitle: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        noticeContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getDeptInfoList('street', '1169154711480528897')
+  },
+  methods: {
+    // 富文本编辑器
+    quillEditorHandle () {
+      this.quillEditor = new Quill('#J_quillEditor', {
+        modules: {
+          toolbar: this.quillEditorToolbarOptions
+        },
+        theme: 'snow'
+      })
+      // // 自定义上传图片功能 (使用element upload组件)
+      this.quillEditor.getModule('toolbar').addHandler('image', () => {
+        this.$refs.uploadBtn.$el.click()
+      })
+      // 监听内容变化，动态赋值
+      this.quillEditor.on('text-change', () => {
+        this.dataForm.noticeContent = this.quillEditor.root.innerHTML
+      })
+    },
+    // 上传图片之前 (富文本)
+    uploadBeforeUploadHandle (file) {
+      if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
+        this.$message.error(this.$t('upload.tip', { 'format': 'jpg、png、gif' }))
+        return false
+      }
+    },
+    // 上传图片成功 (富文本)
+    uploadSuccessHandle (res, file, fileList) {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.quillEditor.insertEmbed(this.quillEditor.getSelection().index, 'image', res.data.url)
+    },
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.communityId = this.streetId = this.gridId = null
+        // 富文本
+        this.hideUpload = false
+        this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+        if (this.quillEditor) {
+          this.quillEditor.deleteText(0, this.quillEditor.getLength())
+        } else {
+          this.quillEditorHandle()
+        }
+        // 富文本end
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/news/notice/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = res.data
+        this.quillEditor.root.innerHTML = res.data.noticeContent
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/notice/', 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 }),
+    // 获取部门列表
+    getDeptInfoList (dataReceiver, faDeptId) {
+      this.$http.get(`/sys/dept/sublist/` + faDeptId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        if (dataReceiver === 'street') {
+          this.streetList = res.data
+        } else if (dataReceiver === 'community') {
+          this.communityList = res.data
+        } else if (dataReceiver === 'grid') {
+          this.gridList = res.data
+        }
+      }).catch(() => { })
+    },
+    changeStreet (event) {
+      this.streetId = event
+      let choosenItem = this.streetList.filter(item => item.id === this.streetId)[0]
+      this.initDeptIdAndName(choosenItem)
+      this.communityId = this.gridId = null
+      this.communityList = this.gridList = []
+      this.getDeptInfoList('community', event)
+    },
+    changeCommunity (event) {
+      this.communityId = event
+      let choosenItem = this.communityList.filter(item => item.id === this.communityId)[0]
+      this.initDeptIdAndName(choosenItem)
+      this.gridId = null
+      this.gridList = []
+      this.getDeptInfoList('grid', event)
+    },
+    changeGrid (event) {
+      this.gridId = event
+      let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
+      this.initDeptIdAndName(choosenItem)
+    },
+    initDeptIdAndName (choosenItem) {
+      this.dataForm.dept = choosenItem.name
+      this.dataForm.deptId = choosenItem.id
+    }
+
+  }
+}
+</script>
+<style>
+.richText {
+  height: 500px;
+}
+</style>
diff --git a/src/views/modules/news/notice.vue b/src/views/modules/news/notice.vue
new file mode 100644
index 00000000..b7b83114
--- /dev/null
+++ b/src/views/modules/news/notice.vue
@@ -0,0 +1,111 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-news__notice}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id"
+                    placeholder="id"
+                    clearable></el-input>
+        </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('news:notice:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:notice: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 type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="noticeTitle"
+                         label="通知标题"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="dept"
+                         label="发布通知部门"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="readingAmount"
+                         label="阅读量"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="creatorName"
+                         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 :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('news:notice:update')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('news:notice: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 './notice-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/notice/page',
+        getDataListIsPage: true,
+        deleteURL: '/news/notice',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From 5d74771f97b08ce083982b56b28b9832f59c9bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Thu, 5 Sep 2019 11:04:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=84=E5=88=99=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/eventcategory-add-or-update.vue    | 103 ++++++++++++++++++
 src/views/modules/events/eventcategory.vue    |  80 ++++++++++++++
 src/views/modules/events/item.vue             |   8 +-
 3 files changed, 187 insertions(+), 4 deletions(-)
 create mode 100755 src/views/modules/events/eventcategory-add-or-update.vue
 create mode 100755 src/views/modules/events/eventcategory.vue

diff --git a/src/views/modules/events/eventcategory-add-or-update.vue b/src/views/modules/events/eventcategory-add-or-update.vue
new file mode 100755
index 00000000..2724b564
--- /dev/null
+++ b/src/views/modules/events/eventcategory-add-or-update.vue
@@ -0,0 +1,103 @@
+<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="分类名称" prop="categoryName">
+          <el-input v-model="dataForm.categoryName" placeholder="分类名称"></el-input>
+      </el-form-item>
+      <el-form-item label="类别编码" prop="categoryCode">
+        <el-select v-model="dataForm.categoryCode" placeholder="请选择">
+          <el-option
+            v-for="item in categoryOptions"
+            :key="item.categoryFlag"
+            :label="item.categoryTitle"
+            :value="item.categoryFlag">
+          </el-option>
+        </el-select>
+      </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: '',
+        categoryName: '',
+        categoryCode: ''
+      },
+      categoryOptions: [{
+        categoryFlag: '0',
+        categoryTitle: '类别'
+      }, {
+        categoryFlag: '1',
+        categoryTitle: '敏感词'
+      }]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        categoryName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        categoryCode: [
+          { 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(`/events/eventcategory/${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']('/events/eventcategory/', 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/eventcategory.vue b/src/views/modules/events/eventcategory.vue
new file mode 100755
index 00000000..d545f969
--- /dev/null
+++ b/src/views/modules/events/eventcategory.vue
@@ -0,0 +1,80 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-category__eventcategory}">
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="类别设置" name="first"></el-tab-pane>
+        <el-tab-pane label="敏感词设置" name="second"></el-tab-pane>
+      </el-tabs>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-button v-if="$hasPermission('events:category:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('events:category: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 type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column type="index" width="50" label="序号"></el-table-column>
+        <el-table-column prop="categoryName" 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:category:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('events:category: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 './eventcategory-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/eventcategory/page',
+        getDataListIsPage: true,
+        deleteURL: '/events/eventcategory',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        categoryCode: '0'
+      },
+      activeName: 'first'
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  methods: {
+    handleClick (tab, event) {
+      if (tab.label === '类别设置') {
+        this.activeName = 'first'
+        this.dataForm.categoryCode = '0'
+        this.getDataList()
+      }
+      if (tab.label === '敏感词设置') {
+        this.activeName = 'second'
+        this.dataForm.categoryCode = '1'
+        this.getDataList()
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/item.vue b/src/views/modules/events/item.vue
index ddfac40f..7604da4a 100755
--- a/src/views/modules/events/item.vue
+++ b/src/views/modules/events/item.vue
@@ -9,10 +9,10 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('item:item:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('events:item:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('item:item:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('events:item: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%;">
@@ -32,8 +32,8 @@
         <el-table-column prop="itemState" label="项目状态 0-待网格长处理，5-待社区处理，10-待街道党建办处理，15-待街道处理，20-待区直部门党建办处理，25-待区直部门处理，30-处理，35-关闭，40-结束议题" 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('item:item:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('item:item:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('events:item:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('events:item:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>

From 5c7510f85e687858923b94298f4e88f24f5334e9 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 5 Sep 2019 11:08:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/issue-add-or-update.vue    | 250 ++++++++++++++++++
 src/views/modules/events/issue.vue            |  90 +++++++
 2 files changed, 340 insertions(+)
 create mode 100644 src/views/modules/events/issue-add-or-update.vue
 create mode 100644 src/views/modules/events/issue.vue

diff --git a/src/views/modules/events/issue-add-or-update.vue b/src/views/modules/events/issue-add-or-update.vue
new file mode 100644
index 00000000..878e9717
--- /dev/null
+++ b/src/views/modules/events/issue-add-or-update.vue
@@ -0,0 +1,250 @@
+<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="eventId">
+          <el-input v-model="dataForm.eventId" placeholder="事件ID"></el-input>
+      </el-form-item>
+          <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="nickName">
+          <el-input v-model="dataForm.nickName" placeholder="用户昵称"></el-input>
+      </el-form-item>
+          <el-form-item label="用户头像" prop="userFace">
+          <el-input v-model="dataForm.userFace" placeholder="用户头像"></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="issueState">
+          <el-input v-model="dataForm.issueState" 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: '',
+        eventId: '',
+        userId: '',
+        nickName: '',
+        userFace: '',
+        issueContent: '',
+        area: '',
+        areaId: '',
+        street: '',
+        streetId: '',
+        community: '',
+        communityId: '',
+        grid: '',
+        gridId: '',
+        issueAddress: '',
+        issueCategoryId: '',
+        issusLatitude: '',
+        issueLongitude: '',
+        friendlyCommunityId: '',
+        issueState: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        eventId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userFace: [
+          { 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' }
+        ],
+        issueState: [
+          { 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(`/news/issue/${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']('/news/issue/', 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/issue.vue b/src/views/modules/events/issue.vue
new file mode 100644
index 00000000..8af0ecc8
--- /dev/null
+++ b/src/views/modules/events/issue.vue
@@ -0,0 +1,90 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__issue}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </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('news:issue:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:issue: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 type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="eventId" label="事件ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="userId" label="用户ID" 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 prop="userFace" label="用户头像" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="area" label="区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="areaId" label="区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="street" label="街道" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="streetId" label="街道ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="community" label="社区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityId" label="社区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="grid" label="网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueAddress" label="议题位置地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueCategoryId" label="议题分类ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issusLatitude" label="议题位置纬度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueLongitude" label="议题位置经度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="friendlyCommunityId" label="友邻社区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueState" label="议题状态 0-审核通过，2-已关闭，4-已转项目" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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('news:issue:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('news:issue: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 './issue-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/issue/page',
+        getDataListIsPage: true,
+        deleteURL: '/news/issue',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>