From d646bc40146ff55c657d0278a1ffb46b01fc1774 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Mon, 28 Oct 2019 18:16:42 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/issue-close-detail-view.vue        | 269 ++++++++++++++++
 src/views/modules/events/issue-close-list.vue | 230 ++++++++++++++
 src/views/modules/events/issue-close.vue      | 232 +-------------
 .../events/issue-process-detail-view.vue      | 269 ++++++++++++++++
 .../modules/events/issue-process-list.vue     | 247 +++++++++++++++
 src/views/modules/events/issue-process.vue    | 249 +--------------
 .../events/issue-reject-detail-view.vue       | 187 ++++++++++++
 .../modules/events/issue-reject-list.vue      | 211 +++++++++++++
 src/views/modules/events/issue-reject.vue     | 213 +------------
 .../events/issue-review-detail-view.vue       | 286 +++++++++++++++++
 .../modules/events/issue-review-list.vue      | 211 +++++++++++++
 src/views/modules/events/issue-review.vue     | 213 +------------
 .../modules/events/item-close-detail-view.vue | 287 ++++++++++++++++++
 src/views/modules/events/item-close-list.vue  | 230 ++++++++++++++
 src/views/modules/events/item-close.vue       | 232 +-------------
 src/views/modules/events/item-deal.vue        | 237 +--------------
 16 files changed, 2499 insertions(+), 1304 deletions(-)
 create mode 100644 src/views/modules/events/issue-close-detail-view.vue
 create mode 100644 src/views/modules/events/issue-close-list.vue
 create mode 100644 src/views/modules/events/issue-process-detail-view.vue
 create mode 100644 src/views/modules/events/issue-process-list.vue
 create mode 100644 src/views/modules/events/issue-reject-detail-view.vue
 create mode 100644 src/views/modules/events/issue-reject-list.vue
 create mode 100644 src/views/modules/events/issue-review-detail-view.vue
 create mode 100644 src/views/modules/events/issue-review-list.vue
 create mode 100644 src/views/modules/events/item-close-detail-view.vue
 create mode 100644 src/views/modules/events/item-close-list.vue

diff --git a/src/views/modules/events/issue-close-detail-view.vue b/src/views/modules/events/issue-close-detail-view.vue
new file mode 100644
index 00000000..7a533a43
--- /dev/null
+++ b/src/views/modules/events/issue-close-detail-view.vue
@@ -0,0 +1,269 @@
+<template>
+    <div class="project-handle">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" style="width: 100%; height: 100%;">
+            <div class="project-detail">
+                <el-form label-position="right" label-width="120px">
+                    <el-form-item label="议题内容:">
+                        <div>{{dataForm.issueContent}}</div>
+                        <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+                          <el-popover placement="bottom" title="" trigger="click">
+                            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+                            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+                          </el-popover>
+                        </span>
+                    </el-form-item>
+                    <el-form-item label="所属网格:" prop="ownGrid">
+                        <div>{{dataForm.ownGrid}}</div>
+                    </el-form-item>
+                    <el-form-item label="上报时间:">
+                        <div>{{dataForm.distributeTime}}</div>
+                    </el-form-item>
+                    <el-form-item label="上报人:">
+                        <div>{{dataForm.nickName}}</div>
+                    </el-form-item>
+                    <el-form-item label="所属类别:" prop="categoryName">
+                        <div>{{dataForm.categoryName}}</div>
+                    </el-form-item>
+                    <el-form-item label="议题态度:">
+                        <span>表达态度 {{dataForm.approveNum + dataForm.opposeNum + dataForm.commentNum}}</span>&nbsp;&nbsp;
+                        <span>评论 {{dataForm.commentNum}}</span>&nbsp;&nbsp;
+                        <span>支持 {{dataForm.approveNum}}</span>&nbsp;&nbsp;
+                        <span>反对 {{dataForm.opposeNum}}</span>
+                    </el-form-item>
+                    <el-form-item label="议题评论:">
+                        <el-button type="primary" @click="innerVisible = true">查看评论</el-button>
+                    </el-form-item>
+                </el-form>
+                <div class="container">
+                    <div class="location">上报位置: {{dataForm.issueAddress}}</div>
+                    <div id="map"></div>
+                </div>
+            </div>
+            <div class="project-progress">
+                <el-form-item>
+                    <el-timeline>
+                        <el-timeline-item v-for="(jobFeedbackDTO, index) in dataForm.feedbackDTOList" :key="index" placement="top">
+                            <div v-if="jobFeedbackDTO.stateName === '【反馈】'">{{jobFeedbackDTO.createdTime}} {{'【回应】'}}</div>
+                            <div v-else>{{jobFeedbackDTO.createdTime}} {{jobFeedbackDTO.stateName}}</div>
+                            <div>处理部门： {{jobFeedbackDTO.handlerDept}}</div>
+                            <div>处理意见： {{jobFeedbackDTO.advice}}</div>
+                        </el-timeline-item>
+                    </el-timeline>
+                </el-form-item>
+            </div>
+        </el-form>
+        <el-dialog width="90%" title="评论" :visible.sync="innerVisible" append-to-body>
+            <el-table :data="commentsDTOs" border style="width: 100%;">
+                <el-table-column prop="user.userName" label="发言人" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="commentTime" label="发言时间" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="content" label="发言内容" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="replyComment.userName" label="被回复人" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="replyComment.content" label="被回复内容" header-align="center" align="center"></el-table-column>
+                <el-table-column :label="$t('handle')" header-align="center" align="center" width="150">
+                    <template slot-scope="scope">
+                        <el-button v-if="scope.row.shieldFlag === '0'" type="button" size="small" @click="deleteComment(scope.row.commentId)">屏蔽</el-button>
+                        <el-button v-if="scope.row.shieldFlag === '1'" type="text" size="small">已屏蔽</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                    :current-page="pageIndex"
+                    :page-sizes="[10, 20, 50, 100]"
+                    :page-size="limitVal"
+                    :total="total"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    @size-change="pageSizeChangeHandleNew"
+                    @current-change="pageCurrentChangeHandleNew">
+            </el-pagination>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import BMap from 'BMap'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+export default {
+  name: 'IssueCloseDetailView',
+  data () {
+    return {
+      map: '',
+      innerVisible: false,
+      dataForm: {
+        id: '',
+        nickName: '',
+        distributeTime: '',
+        issueContent: '',
+        feedbackDTOList: [],
+        images: []
+      },
+      order: '',
+      orderField: '',
+      pageIndex: 1,
+      limitVal: 10,
+      total: 0,
+      commentsDTOs: []
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  methods: {
+    backToItemDeal () {
+      this.$parent.selectComponent = 'ItemDeal'
+    },
+    initBmap (latitude, longitude) {
+      this.map = new BMap.Map('map')
+      const point = new BMap.Point(120.38821849395045, 36.120219258412966)
+      var marker = new BMap.Marker(point)
+      this.map.addOverlay(marker)
+      this.map.centerAndZoom(point, 13)
+      this.map.enableScrollWheelZoom(true)
+    },
+    init () {
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.getCommentList()
+        }
+      })
+    },
+    deleteComment (val) {
+      this.$http['post']('/events/issue/deleteComment', { commentIds: [val] }).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.getCommentList()
+          }
+        })
+      }).catch(() => {})
+    },
+    getInfo () {
+      this.$http.get(`/events/issue/issueContentDetail/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
+      }).catch(() => {})
+    },
+    pageSizeChangeHandleNew (val) {
+      this.pageIndex = 1
+      this.limitVal = val
+      this.getCommentList()
+    },
+    pageCurrentChangeHandleNew (val) {
+      this.pageIndex = val
+      this.getCommentList()
+    },
+    getCommentList () {
+      this.$http.get('/events/issue/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
+      }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.commentsDTOs = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.commentsDTOs = res.data.list
+        this.total = res.data.total
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .project-handle {
+        .el-timeline {
+            padding-left: 9px;
+            font-size: 13px;
+        }
+    }
+</style>
+
+<style lang="scss" scoped>
+    .project-handle {
+        width: 100%;
+        height: calc(100vh - 50px - 38px - 15px);
+        background: #ffffff;
+        box-sizing: border-box;
+        padding: 10px;
+        .project-detail {
+            width: 79%;
+            height: 70%;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            padding: 10px;
+            float:left;
+            margin-bottom: 1%;
+            .el-form {
+                width: 58%;
+                height: 100%;
+                float:left;
+                overflow-y:auto;
+                &::-webkit-scrollbar {
+                    width: 5px;
+                    height: 1px;
+                }
+                &::-webkit-scrollbar-thumb {
+                    border-radius: 5px;
+                    background: #fff;
+                }
+                &::-webkit-scrollbar-track {
+                    border-radius: 10px;
+                    background: #fff;
+                }
+            }
+            .container {
+                width: 40%;
+                height: 100%;
+                float: right;
+                .location {
+                    height: 30px;
+                    line-height: 30px;
+                }
+                #map {
+                    width: 100%;
+                    height: calc(100% - 30px);
+                }
+            }
+        }
+        .project-progress {
+            width: 20%;
+            height: 100%;
+            float: right;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            margin-left: 1%;
+            padding-top: 20px;
+            overflow-y:auto;
+            &::-webkit-scrollbar {
+                width: 5px;
+                height: 1px;
+            }
+            &::-webkit-scrollbar-thumb {
+                border-radius: 5px;
+                background: #aaa;
+            }
+            &::-webkit-scrollbar-track {
+                border-radius: 10px;
+                background: #ccc;
+            }
+        }
+        .handle-operation {
+            width: 79%;
+            height: 49%;
+            box-sizing: border-box;
+            border: 2px solid #ccc;
+            float:left;
+        }
+    }
+</style>
diff --git a/src/views/modules/events/issue-close-list.vue b/src/views/modules/events/issue-close-list.vue
new file mode 100644
index 00000000..49fbd8cc
--- /dev/null
+++ b/src/views/modules/events/issue-close-list.vue
@@ -0,0 +1,230 @@
+<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="街道">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+      <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 prop="participateNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         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:close:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</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>
+      <!-- 弹窗 -->
+      <detail v-if="detailVisible"
+              ref="detail"
+              @refreshDataList="getDataList"></detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import Detail from './issue-close-detail-view'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/issue/page',
+        getDataListIsPage: true
+      },
+      detailVisible: false,
+      dataForm: {
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        state: '2'
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      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: {
+    Detail
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    detailAction (id) {
+      this.$parent.selectComponent = 'IssueCloseDetailView'
+      this.$router.push({ path: '/events-issue-close', query: { id: id } })
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/issue-close.vue b/src/views/modules/events/issue-close.vue
index 5b305f94..55b5db08 100644
--- a/src/views/modules/events/issue-close.vue
+++ b/src/views/modules/events/issue-close.vue
@@ -1,233 +1,25 @@
 <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="街道">
-          <el-select v-model="dataForm.streetId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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>
-      <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 prop="participateNum"
-                         label="参与人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="approveNum"
-                         label="支持人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="opposeNum"
-                         label="反对人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="commentNum"
-                         label="评论数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="browseNum"
-                         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:close:look')"
-                       type="text"
-                       size="small"
-                       @click="detailAction(scope.row.id)">{{ $t('look') }}</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>
-      <!-- 弹窗 -->
-      <detail v-if="detailVisible"
-              ref="detail"
-              @refreshDataList="getDataList"></detail>
-    </div>
-  </el-card>
+    <keep-alive>
+        <component :is="selectComponent"></component>
+    </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import Detail from './issue-detail'
+import IssueClose from './issue-close-list'
+import IssueCloseDetailView from './issue-close-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/issue/page',
-        getDataListIsPage: true
-      },
-      detailVisible: false,
-      dataForm: {
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        state: '2'
-      },
-      streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      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()
-          }
-        }
-      }
+      selectComponent: IssueClose
     }
   },
   components: {
-    Detail
-  },
-  created: function () {
-    this.getStreetList()
-  },
-  methods: {
-    detailAction (id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.detail.dataForm.id = id
-        this.$refs.detail.init()
-      })
-    },
-    getStreetList () {
-      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.streetOptions = res.data
-      }).catch(() => { })
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => { })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => { })
-    }
+    IssueClose,
+    IssueCloseDetailView
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/events/issue-process-detail-view.vue b/src/views/modules/events/issue-process-detail-view.vue
new file mode 100644
index 00000000..c3f04db5
--- /dev/null
+++ b/src/views/modules/events/issue-process-detail-view.vue
@@ -0,0 +1,269 @@
+<template>
+    <div class="project-handle">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" style="width: 100%; height: 100%;">
+            <div class="project-detail">
+                <el-form label-position="right" label-width="120px">
+                    <el-form-item label="议题内容:" prop="eventContent">
+                        <div>{{dataForm.issueContent}}</div>
+                        <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+                          <el-popover placement="bottom" title="" trigger="click">
+                            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+                            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+                          </el-popover>
+                        </span>
+                    </el-form-item>
+                    <el-form-item label="所属网格:" prop="ownGrid">
+                        <div>{{dataForm.ownGrid}}</div>
+                    </el-form-item>
+                    <el-form-item label="上报时间:" prop="distributeTime">
+                        <div>
+                            {{dataForm.distributeTime}}
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="上报人:" prop="nickName">
+                        <div>{{dataForm.nickName}}</div>
+                    </el-form-item>
+                    <el-form-item label="所属类别:" prop="categoryName">
+                        <div>{{dataForm.categoryName}}</div>
+                    </el-form-item>
+                </el-form>
+                <div class="container">
+                    <div class="location">上报位置: {{dataForm.address}}</div>
+                    <div id="map"></div>
+                </div>
+            </div>
+            <div class="project-progress">
+                <el-form-item>
+                    <el-timeline>
+                        <el-timeline-item v-for="(jobFeedbackDTO, index) in dataForm.jobFeedbackDTOS" :key="index" placement="top">
+                            <div v-if="jobFeedbackDTO.stateName === '【反馈】'">{{jobFeedbackDTO.createdTime}} {{'【回应】'}}</div>
+                            <div v-else>{{jobFeedbackDTO.createdTime}} {{jobFeedbackDTO.stateName}}</div>
+                            <div>处理部门： {{jobFeedbackDTO.handlerDept}}</div>
+                            <div>处理意见： {{jobFeedbackDTO.advice}}</div>
+                        </el-timeline-item>
+                    </el-timeline>
+                </el-form-item>
+            </div>
+            <div class="handle-operation">
+                <el-form-item label="处理:" prop="state">
+                    <el-select v-model="dataForm.state" placeholder="请选择">
+                        <el-option
+                                v-for="item in verifyOptions"
+                                :key="item.verifyFlag"
+                                :label="item.verifyTitle"
+                                :value="item.verifyFlag">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="处理意见:" prop="advice">
+                    <el-input v-model="dataForm.advice" type="textarea" placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
+                </el-form-item>
+                <template>
+                    <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+                    <el-button @click="backToItemDeal">返回</el-button>
+                </template>
+            </div>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import BMap from 'BMap'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+import debounce from 'lodash/debounce'
+export default {
+  name: 'itemDealDetailView',
+  data () {
+    return {
+      map: '',
+      dataForm: {
+        id: '',
+        issueContent: '',
+        nickName: '',
+        distributeTime: '',
+        advice: '',
+        state: '',
+        jobFeedbackDTOS: [],
+        images: []
+      },
+      verifyOptions: [{
+        verifyFlag: '1',
+        verifyTitle: '回应'
+      }, {
+        verifyFlag: '2',
+        verifyTitle: '关闭议题'
+      }, {
+        verifyFlag: '4',
+        verifyTitle: '转为项目'
+      }]
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  computed: {
+    dataRule () {
+      return {
+        advice: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        eventState: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        state: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    backToItemDeal () {
+      this.$parent.selectComponent = 'IssueProcessList'
+    },
+    initBmap (latitude, longitude) {
+      this.map = new BMap.Map('map')
+      const point = new BMap.Point(120.38821849395045, 36.120219258412966)
+      var marker = new BMap.Marker(point)
+      this.map.addOverlay(marker)
+      this.map.centerAndZoom(point, 13)
+      this.map.enableScrollWheelZoom(true)
+    },
+    init () {
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/events/issue/waitHandleIssueDetail/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        console.log(JSON.stringify(this.dataForm))
+        this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        if (this.dataForm.advice.length > 500) {
+          return this.$message.error('处理意见不超过500字')
+        }
+        this.$http['post']('/events/issue/issueWaitHandleSubmit', 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>
+
+<style lang="scss">
+    .project-handle {
+        .el-timeline {
+            padding-left: 9px;
+            font-size: 13px;
+        }
+    }
+</style>
+
+<style lang="scss" scoped>
+    .project-handle {
+        width: 100%;
+        height: calc(100vh - 50px - 38px - 15px);
+        background: #ffffff;
+        box-sizing: border-box;
+        padding: 10px;
+        .project-detail {
+            width: 79%;
+            height: 49%;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            padding: 10px;
+            float:left;
+            margin-bottom: 1%;
+            .el-form {
+                width: 58%;
+                height: 100%;
+                float:left;
+                overflow-y:auto;
+                &::-webkit-scrollbar {
+                    width: 5px;
+                    height: 1px;
+                }
+                &::-webkit-scrollbar-thumb {
+                    border-radius: 5px;
+                    background: #fff;
+                }
+                &::-webkit-scrollbar-track {
+                    border-radius: 10px;
+                    background: #fff;
+                }
+            }
+            .container {
+                width: 40%;
+                height: 100%;
+                float: right;
+                .location {
+                    height: 30px;
+                    line-height: 30px;
+                }
+                #map {
+                    width: 100%;
+                    height: calc(100% - 30px);
+                }
+            }
+        }
+        .project-progress {
+            width: 20%;
+            height: 100%;
+            float: right;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            margin-left: 1%;
+            padding-top: 20px;
+            overflow-y:auto;
+            &::-webkit-scrollbar {
+                width: 5px;
+                height: 1px;
+            }
+            &::-webkit-scrollbar-thumb {
+                border-radius: 5px;
+                background: #aaa;
+            }
+            &::-webkit-scrollbar-track {
+                border-radius: 10px;
+                background: #ccc;
+            }
+        }
+        .handle-operation {
+            width: 79%;
+            height: 49%;
+            box-sizing: border-box;
+            border: 2px solid #ccc;
+            float:left;
+        }
+    }
+</style>
diff --git a/src/views/modules/events/issue-process-list.vue b/src/views/modules/events/issue-process-list.vue
new file mode 100644
index 00000000..7ecbb96e
--- /dev/null
+++ b/src/views/modules/events/issue-process-list.vue
@@ -0,0 +1,247 @@
+<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="街道">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+      <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 prop="participateNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         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:issue:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('events:issue:deal')"
+                       type="text"
+                       size="small"
+                       @click="dealAction(scope.row.id)">{{ $t('deal') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <process-deal v-if="processDealVisible"
+                    ref="processDeal"
+                    @refreshDataList="getDataList"></process-deal>
+      <detail v-if="detailVisible"
+              ref="detail"
+              @refreshDataList="getDataList"></detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import ProcessDeal from './issue-process-deal'
+import Detail from './issue-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/issue/page',
+        getDataListIsPage: true
+      },
+      detailVisible: false,
+      processDealVisible: false,
+      dataForm: {
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        state: '0'
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      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: {
+    ProcessDeal,
+    Detail
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    detailAction (id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.detail.dataForm.id = id
+        this.$refs.detail.init()
+      })
+    },
+    dealAction (id) {
+      this.$parent.selectComponent = 'IssueProcessDetailView'
+      this.$router.push({ path: '/events-issue-process', query: { id: id } })
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/issue-process.vue b/src/views/modules/events/issue-process.vue
index fbd45bf2..4abde559 100644
--- a/src/views/modules/events/issue-process.vue
+++ b/src/views/modules/events/issue-process.vue
@@ -1,250 +1,25 @@
 <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="街道">
-          <el-select v-model="dataForm.streetId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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>
-      <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 prop="participateNum"
-                         label="参与人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="approveNum"
-                         label="支持人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="opposeNum"
-                         label="反对人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="commentNum"
-                         label="评论数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="browseNum"
-                         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:issue:look')"
-                       type="text"
-                       size="small"
-                       @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
-            <el-button v-if="$hasPermission('events:issue:deal')"
-                       type="text"
-                       size="small"
-                       @click="dealAction(scope.row.id)">{{ $t('deal') }}</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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <process-deal v-if="processDealVisible"
-                    ref="processDeal"
-                    @refreshDataList="getDataList"></process-deal>
-      <detail v-if="detailVisible"
-              ref="detail"
-              @refreshDataList="getDataList"></detail>
-    </div>
-  </el-card>
+    <keep-alive>
+        <component :is="selectComponent"></component>
+    </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import ProcessDeal from './issue-process-deal'
-import Detail from './issue-detail'
+import IssueProcessList from './issue-process-list'
+import IssueProcessDetailView from './issue-process-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/issue/page',
-        getDataListIsPage: true
-      },
-      detailVisible: false,
-      processDealVisible: false,
-      dataForm: {
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        state: '0'
-      },
-      streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      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()
-          }
-        }
-      }
+      selectComponent: IssueProcessList
     }
   },
   components: {
-    ProcessDeal,
-    Detail
-  },
-  created: function () {
-    this.getStreetList()
-  },
-  methods: {
-    detailAction (id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.detail.dataForm.id = id
-        this.$refs.detail.init()
-      })
-    },
-    dealAction (id) {
-      this.processDealVisible = true
-      this.$nextTick(() => {
-        this.$refs.processDeal.dataForm.id = id
-        this.$refs.processDeal.init()
-      })
-    },
-    getStreetList () {
-      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.streetOptions = res.data
-      }).catch(() => { })
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => { })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => { })
-    }
+    IssueProcessList,
+    IssueProcessDetailView
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/events/issue-reject-detail-view.vue b/src/views/modules/events/issue-reject-detail-view.vue
new file mode 100644
index 00000000..cc30955f
--- /dev/null
+++ b/src/views/modules/events/issue-reject-detail-view.vue
@@ -0,0 +1,187 @@
+<template>
+    <div class="project-handle">
+        <el-form :model="dataForm" ref="dataForm" style="width: 100%; height: 100%;">
+            <div class="project-detail">
+                <el-form label-position="right" label-width="120px">
+                    <el-form-item label="议题内容:" prop="eventContent">
+                        <div>{{dataForm.eventContent}}</div>
+                        <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+                          <el-popover placement="bottom" title="" trigger="click">
+                            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+                            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+                          </el-popover>
+                        </span>
+                    </el-form-item>
+                    <el-form-item label="所属网格:" prop="ownGrid">
+                        <div>{{dataForm.ownGrid}}</div>
+                    </el-form-item>
+                    <el-form-item label="上报时间:" prop="createdTime">
+                        <div>{{dataForm.createdTime}}</div>
+                    </el-form-item>
+                    <el-form-item label="上报人:" prop="nickName">
+                        <div>{{dataForm.nickName}}</div>
+                    </el-form-item>
+                    <el-form-item label="状态:" prop="stateName">
+                        <div>{{dataForm.stateName}}</div>
+                    </el-form-item>
+                    <el-form-item label="处理意见:" prop="advice">
+                        <div>{{dataForm.advice}}</div>
+                    </el-form-item>
+                </el-form>
+                <div class="container">
+                    <div class="location">上报位置: {{dataForm.address}}</div>
+                    <div id="map"></div>
+                </div>
+            </div>
+        </el-form>
+    </div>
+</template>
+<script>
+import BMap from 'BMap'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+export default {
+  data () {
+    return {
+      map: '',
+      dataForm: {
+        id: '',
+        eventContent: '',
+        nickName: '',
+        stateName: '',
+        advice: '',
+        eventState: '',
+        createdTime: '',
+        images: []
+      }
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  methods: {
+    backToItemDeal () {
+      this.$parent.selectComponent = 'ItemDeal'
+    },
+    initBmap (latitude, longitude) {
+      this.map = new BMap.Map('map')
+      const point = new BMap.Point(120.38821849395045, 36.120219258412966)
+      var marker = new BMap.Marker(point)
+      this.map.addOverlay(marker)
+      this.map.centerAndZoom(point, 13)
+      this.map.enableScrollWheelZoom(true)
+    },
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/events/epdcevents/rejectEventDetail/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        console.log(JSON.stringify(this.dataForm))
+        this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .project-handle {
+        .el-timeline {
+            padding-left: 9px;
+            font-size: 13px;
+        }
+    }
+</style>
+
+<style lang="scss" scoped>
+    .project-handle {
+        width: 100%;
+        height: calc(100vh - 50px - 38px - 15px);
+        background: #ffffff;
+        box-sizing: border-box;
+        padding: 10px;
+        .project-detail {
+            width: 100%;
+            height: 70%;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            padding: 10px;
+            float:left;
+            margin-bottom: 1%;
+            .el-form {
+                width: 58%;
+                height: 100%;
+                float:left;
+                overflow-y:auto;
+                &::-webkit-scrollbar {
+                    width: 5px;
+                    height: 1px;
+                }
+                &::-webkit-scrollbar-thumb {
+                    border-radius: 5px;
+                    background: #fff;
+                }
+                &::-webkit-scrollbar-track {
+                    border-radius: 10px;
+                    background: #fff;
+                }
+            }
+            .container {
+                width: 40%;
+                height: 100%;
+                float: right;
+                .location {
+                    height: 30px;
+                    line-height: 30px;
+                }
+                #map {
+                    width: 100%;
+                    height: calc(100% - 30px);
+                }
+            }
+        }
+        .project-progress {
+            width: 20%;
+            height: 100%;
+            float: right;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            margin-left: 1%;
+            padding-top: 20px;
+            overflow-y:auto;
+            &::-webkit-scrollbar {
+                width: 5px;
+                height: 1px;
+            }
+            &::-webkit-scrollbar-thumb {
+                border-radius: 5px;
+                background: #aaa;
+            }
+            &::-webkit-scrollbar-track {
+                border-radius: 10px;
+                background: #ccc;
+            }
+        }
+        .handle-operation {
+            width: 79%;
+            height: 49%;
+            box-sizing: border-box;
+            border: 2px solid #ccc;
+            float:left;
+        }
+    }
+</style>
diff --git a/src/views/modules/events/issue-reject-list.vue b/src/views/modules/events/issue-reject-list.vue
new file mode 100644
index 00000000..32f1cd16
--- /dev/null
+++ b/src/views/modules/events/issue-reject-list.vue
@@ -0,0 +1,211 @@
+<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="街道">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+      <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="eventContent"
+                         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:reject:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <reject-detail v-if="rejectDetailVisible"
+                     ref="rejectDetail"
+                     @refreshDataList="getDataList"></reject-detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import RejectDetail from './issue-reject-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/epdcevents/rejectEvents',
+        getDataListIsPage: true,
+        deleteURL: '/events/epdcevents',
+        deleteIsBatch: true
+      },
+      rejectDetailVisible: false,
+      dataForm: {
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      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: {
+    RejectDetail
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    detailAction (id) {
+      this.$parent.selectComponent = 'IssueRejectDetailView'
+      this.$router.push({ path: '/events-issue-reject', query: { id: id } })
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/issue-reject.vue b/src/views/modules/events/issue-reject.vue
index 27e126fe..6ac59c6f 100644
--- a/src/views/modules/events/issue-reject.vue
+++ b/src/views/modules/events/issue-reject.vue
@@ -1,214 +1,25 @@
 <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="街道">
-          <el-select v-model="dataForm.streetId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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>
-      <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="eventContent"
-                         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:reject:look')"
-                       type="text"
-                       size="small"
-                       @click="detailAction(scope.row.id)">{{ $t('look') }}</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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <reject-detail v-if="rejectDetailVisible"
-                     ref="rejectDetail"
-                     @refreshDataList="getDataList"></reject-detail>
-    </div>
-  </el-card>
+    <keep-alive>
+        <component :is="selectComponent"></component>
+    </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import RejectDetail from './issue-reject-detail'
+import IssueRejectList from './issue-reject-list'
+import IssueRejectDetailView from './issue-reject-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/epdcevents/rejectEvents',
-        getDataListIsPage: true,
-        deleteURL: '/events/epdcevents',
-        deleteIsBatch: true
-      },
-      rejectDetailVisible: false,
-      dataForm: {
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: ''
-      },
-      streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      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()
-          }
-        }
-      }
+      selectComponent: IssueRejectList
     }
   },
   components: {
-    RejectDetail
-  },
-  created: function () {
-    this.getStreetList()
-  },
-  methods: {
-    detailAction (id) {
-      this.rejectDetailVisible = true
-      this.$nextTick(() => {
-        this.$refs.rejectDetail.dataForm.id = id
-        this.$refs.rejectDetail.init()
-      })
-    },
-    getStreetList () {
-      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.streetOptions = res.data
-      }).catch(() => { })
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => { })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => { })
-    }
+    IssueRejectList,
+    IssueRejectDetailView
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/events/issue-review-detail-view.vue b/src/views/modules/events/issue-review-detail-view.vue
new file mode 100644
index 00000000..f716ce8d
--- /dev/null
+++ b/src/views/modules/events/issue-review-detail-view.vue
@@ -0,0 +1,286 @@
+<template>
+    <div class="project-handle">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" style="width: 100%; height: 100%;">
+            <div class="project-detail">
+                <el-form label-position="right" label-width="120px">
+                    <el-form-item label="议题内容:" prop="eventContent">
+                        <div>{{dataForm.eventContent}}</div>
+                        <span v-for="(imgUrl, index) in urls" :key="index" style="margin: 5px">
+                          <el-popover placement="bottom" title="" trigger="click">
+                            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+                            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+                          </el-popover>
+                        </span>
+                    </el-form-item>
+                    <el-form-item label="所属网格:" prop="ownGrid">
+                        <div>{{dataForm.ownGrid}}</div>
+                    </el-form-item>
+                    <el-form-item label="上报时间:" prop="nickName">
+                        <div>{{dataForm.createdTime}}</div>
+                    </el-form-item>
+                    <el-form-item label="上报人:" prop="nickName">
+                        <div>{{dataForm.nickName}}</div>
+                    </el-form-item>
+                </el-form>
+                <div class="container">
+                    <div class="location">上报位置: {{dataForm.address}}</div>
+                    <div id="map"></div>
+                </div>
+            </div>
+            <div class="handle-operation">
+                <el-form-item label="审核:" prop="eventState">
+                    <el-select v-model="dataForm.eventState" placeholder="请选择">
+                        <el-option
+                                v-for="item in verifyOptions"
+                                :key="item.verifyFlag"
+                                :label="item.verifyTitle"
+                                :value="item.verifyFlag">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="议题所属类别:" prop="categoryId" v-if="categoryVisible">
+                    <el-select v-model="dataForm.categoryId" placeholder="请选择">
+                        <el-option
+                                v-for="item in categoryOptions"
+                                :key="item.id"
+                                :label="item.categoryName"
+                                :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="处理意见:" prop="advice">
+                    <el-input v-model="dataForm.advice" type="textarea" placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
+                </el-form-item>
+                <template>
+                    <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+                    <el-button @click="backToItemDeal">{{ '返回' }}</el-button>
+                </template>
+            </div>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import BMap from 'BMap'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+export default {
+  name: 'IssueReviewDetailView',
+  data () {
+    return {
+      map: '',
+      dataForm: {
+        id: '',
+        eventContent: '',
+        nickName: '',
+        categoryId: '',
+        advice: '',
+        eventState: ''
+      },
+      categoryVisible: true,
+      urls: [],
+      categoryOptions: [],
+      verifyOptions: [{
+        verifyFlag: '2',
+        verifyTitle: '驳回'
+      }, {
+        verifyFlag: '4',
+        verifyTitle: '审核通过'
+      }]
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  computed: {
+    dataRule () {
+      return {
+        categoryId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        eventState: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        advice: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    'dataForm.eventState': function (val) {
+      if (val === '2') {
+        this.categoryVisible = false
+      } else {
+        this.categoryVisible = true
+      }
+    }
+  },
+  methods: {
+    backToItemDeal () {
+      this.$parent.selectComponent = 'IssueReviewList'
+    },
+    init () {
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.getCategoryList()
+        }
+      })
+    },
+    initBmap (latitude, longitude) {
+      this.map = new BMap.Map('map')
+      const point = new BMap.Point(120.38821849395045, 36.120219258412966)
+      var marker = new BMap.Marker(point)
+      this.map.addOverlay(marker)
+      this.map.centerAndZoom(point, 13)
+      this.map.enableScrollWheelZoom(true)
+    },
+    getCategoryList () {
+      this.$http.get('/events/eventcategory/list',
+        {
+          params: {
+            categoryCode: '0'
+          }
+        }
+      ).then(({ data: res }) => {
+        this.dataListLoading = false
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.categoryOptions = res.data
+      }).catch(() => {})
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/events/epdcevents/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        console.log(JSON.stringify(this.dataForm))
+        this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
+        this.urls = res.data.imageArray
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        if (this.dataForm.advice.length > 500) {
+          return this.$message.error('处理意见不超过500字')
+        }
+        this.$http['post']('/events/epdcevents/review', 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>
+
+<style lang="scss">
+    .project-handle {
+        .el-timeline {
+            padding-left: 9px;
+            font-size: 13px;
+        }
+    }
+</style>
+
+<style lang="scss" scoped>
+    .project-handle {
+        width: 100%;
+        height: calc(100vh - 50px - 38px - 15px);
+        background: #ffffff;
+        box-sizing: border-box;
+        padding: 10px;
+        .project-detail {
+            width: 100%;
+            height: 49%;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            padding: 10px;
+            float:left;
+            margin-bottom: 1%;
+            .el-form {
+                width: 58%;
+                height: 100%;
+                float:left;
+                overflow-y:auto;
+                &::-webkit-scrollbar {
+                    width: 5px;
+                    height: 1px;
+                }
+                &::-webkit-scrollbar-thumb {
+                    border-radius: 5px;
+                    background: #fff;
+                }
+                &::-webkit-scrollbar-track {
+                    border-radius: 10px;
+                    background: #fff;
+                }
+            }
+            .container {
+                width: 40%;
+                height: 100%;
+                float: right;
+                .location {
+                    height: 30px;
+                    line-height: 30px;
+                }
+                #map {
+                    width: 100%;
+                    height: calc(100% - 30px);
+                }
+            }
+        }
+        .project-progress {
+            width: 20%;
+            height: 100%;
+            float: right;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            margin-left: 1%;
+            padding-top: 20px;
+            overflow-y:auto;
+            &::-webkit-scrollbar {
+                width: 5px;
+                height: 1px;
+            }
+            &::-webkit-scrollbar-thumb {
+                border-radius: 5px;
+                background: #aaa;
+            }
+            &::-webkit-scrollbar-track {
+                border-radius: 10px;
+                background: #ccc;
+            }
+        }
+        .handle-operation {
+            width: 100%;
+            height: 49%;
+            box-sizing: border-box;
+            border: 2px solid #ccc;
+            float:left;
+        }
+    }
+</style>
diff --git a/src/views/modules/events/issue-review-list.vue b/src/views/modules/events/issue-review-list.vue
new file mode 100644
index 00000000..fe784716
--- /dev/null
+++ b/src/views/modules/events/issue-review-list.vue
@@ -0,0 +1,211 @@
+<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="街道">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId"
+          clearable placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+      <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="eventContent"
+                         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:verify')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('verify') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <review-detail v-if="reviewDetailVisible"
+                     ref="reviewDetail"
+                     @refreshDataList="getDataList"></review-detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import ReviewDetail from './issue-review-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/epdcevents/page',
+        getDataListIsPage: true,
+        deleteURL: '/events/epdcevents',
+        deleteIsBatch: true
+      },
+      reviewDetailVisible: false,
+      dataForm: {
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      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: {
+    ReviewDetail
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    detailAction (id) {
+      this.$parent.selectComponent = 'IssueReviewDetailView'
+      this.$router.push({ path: '/events-issue-review', query: { id: id } })
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/issue-review.vue b/src/views/modules/events/issue-review.vue
index 2a5308f4..2dc09a3c 100644
--- a/src/views/modules/events/issue-review.vue
+++ b/src/views/modules/events/issue-review.vue
@@ -1,214 +1,25 @@
 <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="街道">
-          <el-select v-model="dataForm.streetId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId"
-          clearable placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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>
-      <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="eventContent"
-                         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:verify')"
-                       type="text"
-                       size="small"
-                       @click="detailAction(scope.row.id)">{{ $t('verify') }}</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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <review-detail v-if="reviewDetailVisible"
-                     ref="reviewDetail"
-                     @refreshDataList="getDataList"></review-detail>
-    </div>
-  </el-card>
+    <keep-alive>
+        <component :is="selectComponent"></component>
+    </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import ReviewDetail from './issue-review-detail'
+import IssueReviewList from './issue-review-list'
+import IssueReviewDetailView from './issue-review-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/epdcevents/page',
-        getDataListIsPage: true,
-        deleteURL: '/events/epdcevents',
-        deleteIsBatch: true
-      },
-      reviewDetailVisible: false,
-      dataForm: {
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: ''
-      },
-      streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      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()
-          }
-        }
-      }
+      selectComponent: IssueReviewList
     }
   },
   components: {
-    ReviewDetail
-  },
-  created: function () {
-    this.getStreetList()
-  },
-  methods: {
-    detailAction (id) {
-      this.reviewDetailVisible = true
-      this.$nextTick(() => {
-        this.$refs.reviewDetail.dataForm.id = id
-        this.$refs.reviewDetail.init()
-      })
-    },
-    getStreetList () {
-      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.streetOptions = res.data
-      }).catch(() => { })
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => { })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => { })
-    }
+    IssueReviewList,
+    IssueReviewDetailView
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/events/item-close-detail-view.vue b/src/views/modules/events/item-close-detail-view.vue
new file mode 100644
index 00000000..5ebfec00
--- /dev/null
+++ b/src/views/modules/events/item-close-detail-view.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="project-handle">
+    <el-form :model="dataForm" ref="dataForm" style="width: 100%; height: 100%;">
+      <div class="project-detail">
+          <el-form label-position="right" label-width="120px">
+            <el-form-item label="议题内容:">
+              <div>{{dataForm.itemContent}}</div>
+              <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+                <el-popover placement="bottom" title="" trigger="click">
+                  <img :src="imgUrl" style='width: 300px;height: 300px;'>
+                  <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+                </el-popover>
+              </span>
+            </el-form-item>
+            <el-form-item label="上报时间:">
+              <div>{{dataForm.distributeTime}}</div>
+            </el-form-item>
+            <el-form-item label="上报人:">
+              <div>{{dataForm.nickName}}</div>
+            </el-form-item>
+            <el-form-item label="所属类别:" prop="categoryName">
+              <div>{{dataForm.categoryName}}</div>
+            </el-form-item>
+            <el-form-item label="项目态度:">
+              <span>表达态度 {{dataForm.approveNum + dataForm.opposeNum + dataForm.commentNum}}</span>&nbsp;&nbsp;
+              <span>评论 {{dataForm.commentNum}}</span>&nbsp;&nbsp;
+              <span>支持 {{dataForm.approveNum}}</span>&nbsp;&nbsp;
+              <span>反对 {{dataForm.opposeNum}}</span>
+            </el-form-item>
+              <el-form-item label="项目评论:">
+                  <el-button type="primary" @click="innerVisible = true">查看评论</el-button>
+              </el-form-item>
+              <el-form-item label="用户满意度评价:" v-if="dataForm.itemState === 10">
+                  <div>{{dataForm.evaluationScore}}</div>
+              </el-form-item>
+              <el-form-item label="部门满意度评价:" v-if="dataForm.itemState === 10">
+                  <div v-for="(deptEvaluateResultDTO, index) in dataForm.deptEvaluateResultDTOS" :key="index" style="margin: 5px">
+                      <span>{{deptEvaluateResultDTO.deptName}}</span> &nbsp;&nbsp;
+                      <span>{{deptEvaluateResultDTO.evaluationLevel}}</span>
+                  </div>
+              </el-form-item>
+          </el-form>
+          <div class="container">
+              <div class="location">上报位置: {{dataForm.issueAddress}}</div>
+              <div id="map"></div>
+          </div>
+      </div>
+        <div class="project-progress">
+            <el-timeline>
+                <el-timeline-item
+                        v-for="(activity, index) in this.dataForm.handleProgressResultDTOS"
+                        :key="index"
+                        :icon="activity.icon"
+                        :type="activity.type"
+                        :color="activity.color"
+                        :size="activity.size">
+                    <div v-if="activity.itemDeptDTOS.length > 0">{{activity.createdTime}} {{ '【吹哨】' }}</div>
+                    <div v-else-if="activity.itemDeptDTOS.length <= 0 && activity.progressName !== '【审核通过】' && activity.progressName !== '【已关闭】' && activity.progressName !== '【已结案】'">{{activity.createdTime}} {{ '【回应】' }}</div>
+                    <div v-else>{{activity.createdTime}} {{activity.progressName}}</div>
+                    <div>处理部门： {{activity.handlerDept}}</div>
+                    <div v-if="activity.itemDeptDTOS.length > 0">
+                        吹哨部门：<span v-for="(csDept, index1) in activity.itemDeptDTOS" :key="index1" :size="csDept.size">
+                      {{ csDept.deptName }}
+            </span>
+                    </div>
+                    <div>处理意见： {{activity.advice}}</div>
+                </el-timeline-item>
+            </el-timeline>
+        </div>
+    </el-form>
+      <el-dialog width="90%" title="评论" :visible.sync="innerVisible" append-to-body>
+          <el-table :data="commentsDTOs" border style="width: 100%;">
+              <el-table-column prop="user.userName" label="发言人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="commentTime" label="发言时间" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="content" label="发言内容" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="replyComment.userName" label="被回复人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="replyComment.content" label="被回复内容" header-align="center" align="center"></el-table-column>
+              <el-table-column :label="$t('handle')" header-align="center" align="center" width="150">
+                  <template slot-scope="scope">
+                      <el-button v-if="scope.row.shieldFlag === '0'" type="button" size="small" @click="deleteComment(scope.row.commentId)">屏蔽</el-button>
+                      <el-button v-if="scope.row.shieldFlag === '1'" type="text" size="small">已屏蔽</el-button>
+                  </template>
+              </el-table-column>
+          </el-table>
+          <el-pagination
+                  :current-page="pageIndex"
+                  :page-sizes="[10, 20, 50, 100]"
+                  :page-size="limitVal"
+                  :total="total"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  @size-change="pageSizeChangeHandleNew"
+                  @current-change="pageCurrentChangeHandleNew">
+          </el-pagination>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import BMap from 'BMap'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+export default {
+  name: 'itemCloseDetailView',
+  data () {
+    return {
+      map: '',
+      innerVisible: false,
+      dataForm: {
+        id: '',
+        nickName: '',
+        distributeTime: '',
+        itemContent: '',
+        handleProgressResultDTOS: [],
+        images: []
+      },
+      order: '',
+      orderField: '',
+      pageIndex: 1,
+      limitVal: 10,
+      total: 0,
+      commentsDTOs: []
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  methods: {
+    backToItemDeal () {
+      this.$parent.selectComponent = 'ItemClose'
+    },
+    initBmap (latitude, longitude) {
+      this.map = new BMap.Map('map')
+      const point = new BMap.Point(120.38821849395045, 36.120219258412966)
+      var marker = new BMap.Marker(point)
+      this.map.addOverlay(marker)
+      this.map.centerAndZoom(point, 13)
+      this.map.enableScrollWheelZoom(true)
+    },
+    init () {
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.getCommentList()
+        }
+      })
+    },
+    deleteComment (val) {
+      this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).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.getCommentList()
+          }
+        })
+      }).catch(() => {})
+    },
+    getInfo () {
+      this.$http.get(`/events/item/contentDetail/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        console.log(JSON.stringify(this.dataForm))
+        this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
+      }).catch(() => {})
+    },
+    pageSizeChangeHandleNew (val) {
+      this.pageIndex = 1
+      this.limitVal = val
+      this.getCommentList()
+    },
+    pageCurrentChangeHandleNew (val) {
+      this.pageIndex = val
+      this.getCommentList()
+    },
+    getCommentList () {
+      this.$http.get('/events/item/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
+      }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.commentsDTOs = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.commentsDTOs = res.data.list
+        this.total = res.data.total
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .project-handle {
+        .el-timeline {
+            padding-left: 9px;
+            font-size: 13px;
+        }
+    }
+</style>
+
+<style lang="scss" scoped>
+    .project-handle {
+        width: 100%;
+        height: calc(100vh - 50px - 38px - 15px);
+        background: #ffffff;
+        box-sizing: border-box;
+        padding: 10px;
+        .project-detail {
+            width: 79%;
+            height: 60%;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            padding: 10px;
+            float:left;
+            margin-bottom: 1%;
+            .el-form {
+                width: 58%;
+                height: 100%;
+                float:left;
+                overflow-y:auto;
+                &::-webkit-scrollbar {
+                    width: 5px;
+                    height: 1px;
+                }
+                &::-webkit-scrollbar-thumb {
+                    border-radius: 5px;
+                    background: #fff;
+                }
+                &::-webkit-scrollbar-track {
+                    border-radius: 10px;
+                    background: #fff;
+                }
+            }
+            .container {
+                width: 40%;
+                height: 100%;
+                float: right;
+                .location {
+                    height: 30px;
+                    line-height: 30px;
+                }
+                #map {
+                    width: 100%;
+                    height: calc(100% - 30px);
+                }
+            }
+        }
+        .project-progress {
+            width: 20%;
+            height: 100%;
+            float: right;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            margin-left: 1%;
+            padding-top: 20px;
+            overflow-y:auto;
+            &::-webkit-scrollbar {
+                width: 5px;
+                height: 1px;
+            }
+            &::-webkit-scrollbar-thumb {
+                border-radius: 5px;
+                background: #aaa;
+            }
+            &::-webkit-scrollbar-track {
+                border-radius: 10px;
+                background: #ccc;
+            }
+        }
+        .handle-operation {
+            width: 79%;
+            height: 49%;
+            box-sizing: border-box;
+            border: 2px solid #ccc;
+            float:left;
+        }
+    }
+</style>
diff --git a/src/views/modules/events/item-close-list.vue b/src/views/modules/events/item-close-list.vue
new file mode 100644
index 00000000..37e85196
--- /dev/null
+++ b/src/views/modules/events/item-close-list.vue
@@ -0,0 +1,230 @@
+<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 label="街道">
+                    <el-select v-model="dataForm.streetId"
+                               placeholder="请选择"
+                               clearable
+                               @change="getCommunityList">
+                        <el-option v-for="item in streetOptions"
+                                   :key="item.id"
+                                   :label="item.name"
+                                   :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="社区">
+                    <el-select v-model="dataForm.communityId"
+                               placeholder="请选择"
+                               clearable
+                               @change="getGridList">
+                        <el-option v-for="item in communityOptions"
+                                   :key="item.id"
+                                   :label="item.name"
+                                   :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="网格">
+                    <el-select v-model="dataForm.gridId" clearable
+                               placeholder="请选择">
+                        <el-option v-for="item in gridOptions"
+                                   :key="item.id"
+                                   :label="item.name"
+                                   :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <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>
+            <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="itemContent"
+                                 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 prop="participantsNum"
+                                 label="参与人数"
+                                 header-align="center"
+                                 align="center"></el-table-column>
+                <el-table-column prop="approveNum"
+                                 label="支持"
+                                 header-align="center"
+                                 align="center"></el-table-column>
+                <el-table-column prop="opposeNum"
+                                 label="反对"
+                                 header-align="center"
+                                 align="center"></el-table-column>
+                <el-table-column prop="commentNum"
+                                 label="评论数"
+                                 header-align="center"
+                                 align="center"></el-table-column>
+                <el-table-column prop="browseNum"
+                                 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:item:look')"
+                                   type="text"
+                                   size="small"
+                                   @click="detailAction(scope.row.id)">{{ $t('look') }}</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>
+            <detail v-if="detailVisible"
+                    ref="detailRef"
+                    @refreshDataList="getDataList"></detail>
+        </div>
+    </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import Detail from './item-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        id: '',
+        itemState: '5',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
+      },
+      detailVisible: false,
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      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: {
+    Detail
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    detailAction (id) {
+      this.$parent.selectComponent = 'ItemCloseDetailView'
+      this.$router.push({ path: '/events-item-close', query: { id: id } })
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/item-close.vue b/src/views/modules/events/item-close.vue
index 7f9f6e90..55b3e34f 100755
--- a/src/views/modules/events/item-close.vue
+++ b/src/views/modules/events/item-close.vue
@@ -1,233 +1,25 @@
 <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 label="街道">
-          <el-select v-model="dataForm.streetId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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>
-      <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="itemContent"
-                         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 prop="participantsNum"
-                         label="参与人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="approveNum"
-                         label="支持"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="opposeNum"
-                         label="反对"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="commentNum"
-                         label="评论数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="browseNum"
-                         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:item:look')"
-                       type="text"
-                       size="small"
-                       @click="detailAction(scope.row.id)">{{ $t('look') }}</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>
-      <detail v-if="detailVisible"
-              ref="detailRef"
-              @refreshDataList="getDataList"></detail>
-    </div>
-  </el-card>
+  <keep-alive>
+    <component :is="selectComponent"></component>
+  </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import Detail from './item-detail'
+import ItemClose from './item-close-list'
+import ItemCloseDetailView from './item-close-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/page',
-        getDataListIsPage: true
-      },
-      dataForm: {
-        id: '',
-        itemState: '5',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: ''
-      },
-      detailVisible: false,
-      streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      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()
-          }
-        }
-      }
+      selectComponent: ItemClose
     }
   },
   components: {
-    Detail
-  },
-  created: function () {
-    this.getStreetList()
-  },
-  methods: {
-    detailAction (id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.detailRef.dataForm.id = id
-        this.$refs.detailRef.init()
-      })
-    },
-    getStreetList () {
-      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.streetOptions = res.data
-      }).catch(() => { })
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => { })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => { })
-    }
+    ItemClose,
+    ItemCloseDetailView
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/events/item-deal.vue b/src/views/modules/events/item-deal.vue
index e5fe7c7b..f16d0065 100755
--- a/src/views/modules/events/item-deal.vue
+++ b/src/views/modules/events/item-deal.vue
@@ -1,238 +1,25 @@
 <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 label="街道">
-          <el-select v-model="dataForm.streetId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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>
-      <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 label="序号"
-                         type="index"
-                         show-overflow-tooltip
-                         width="50"></el-table-column>
-        <el-table-column prop="itemContent"
-                         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 prop="participantsNum"
-                         label="参与人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="approveNum"
-                         label="支持"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="opposeNum"
-                         label="反对"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="commentNum"
-                         label="评论数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="browseNum"
-                         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:item:deal')"
-                       type="text"
-                       size="small"
-                       @click="dealAction(scope.row.id)">{{ $t('deal') }}</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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <detail v-if="detailVisible"
-              ref="detail"
-              @refreshDataList="getDataList"></detail>
-    </div>
-  </el-card>
+    <keep-alive>
+        <component :is="selectComponent"></component>
+    </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import Detail from './item-deal-detail'
+import ItemDeal from './item-deal-list'
+import ItemDealDetailView from './item-deal-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/page',
-        getDataListIsPage: true
-      },
-      detailVisible: false,
-      dataForm: {
-        id: '',
-        itemState: '0',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: ''
-      },
-      streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      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()
-          }
-        }
-      }
+      selectComponent: ItemDeal
     }
   },
   components: {
-    Detail
-  },
-  created: function () {
-    this.getStreetList()
-  },
-  methods: {
-    dealAction (id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.detail.dataForm.id = id
-        this.$refs.detail.init()
-      })
-    },
-    getStreetList () {
-      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.streetOptions = res.data
-      }).catch(() => { })
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => { })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => { })
-    }
+    ItemDeal,
+    ItemDealDetailView
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>

From 44244e2aa81bd6b48de53bcf6f4c8597c3428936 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 29 Oct 2019 09:16:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/item-deal-detail-view.vue  | 371 ++++++++++++++++++
 src/views/modules/events/item-deal-list.vue   | 235 +++++++++++
 2 files changed, 606 insertions(+)
 create mode 100644 src/views/modules/events/item-deal-detail-view.vue
 create mode 100644 src/views/modules/events/item-deal-list.vue

diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue
new file mode 100644
index 00000000..16fa24bc
--- /dev/null
+++ b/src/views/modules/events/item-deal-detail-view.vue
@@ -0,0 +1,371 @@
+<template>
+  <div class="project-handle">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" style="width: 100%; height: 100%;">
+      <div class="project-detail">
+        <el-form label-position="right" label-width="120px">
+          <el-form-item label="议题内容:" prop="eventContent">
+            <div>{{dataForm.itemContent}}</div>
+            <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+              <el-popover placement="bottom" title="" trigger="click">
+                <img :src="imgUrl" style='width: 300px;height: 300px;'>
+                <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+              </el-popover>
+            </span>
+          </el-form-item>
+          <el-form-item label="上报时间:" prop="distributeTime">
+            <div>{{dataForm.distributeTime}}</div>
+          </el-form-item>
+          <el-form-item label="上报人:" prop="nickName">
+            <div>{{dataForm.nickName}}</div>
+          </el-form-item>
+          <el-form-item label="所属类别:" prop="categoryName">
+            <div>{{dataForm.categoryName}}</div>
+          </el-form-item>
+        </el-form>
+        <div class="container">
+          <div class="location">上报位置: {{dataForm.issueAddress}}</div>
+          <div id="map"></div>
+        </div>
+      </div>
+      <div class="project-progress">
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in this.dataForm.handleProgressResultDTOS"
+            :key="index"
+            :icon="activity.icon"
+            :type="activity.type"
+            :color="activity.color"
+            :size="activity.size">
+            <div v-if="activity.itemDeptDTOS.length > 0">{{activity.createdTime}} {{ '【吹哨】' }}</div>
+            <div v-else-if="activity.itemDeptDTOS.length <= 0 && activity.progressName !== '【审核通过】'">{{activity.createdTime}} {{ '【回应】' }}</div>
+            <div v-else>{{activity.createdTime}} {{activity.progressName}}</div>
+            <div>处理部门： {{activity.handlerDept}}</div>
+            <div v-if="activity.itemDeptDTOS.length > 0">
+              吹哨部门：<span v-for="(csDept, index1) in activity.itemDeptDTOS" :key="index1" :size="csDept.size">
+                      {{ csDept.deptName }}
+            </span>
+            </div>
+            <div>处理意见： {{activity.advice}}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+      <div class="handle-operation">
+        <el-form label-position="right" label-width="120px">
+          <el-form-item label="处理:" prop="handleCategory">
+            <el-select v-model="postDataForm.handleCategory" placeholder="请选择">
+              <el-option
+                      v-for="handleResultDTO in dataForm.handleResultDTOS"
+                      :key="handleResultDTO.processResult"
+                      :label="handleResultDTO.processName"
+                      :value="handleResultDTO.processResult">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="吹哨部门:" prop="deptResultDTOS" v-if="deptResultDTOSVisible">
+            <el-checkbox-group v-model="postDataForm.deptResultDTOS">
+              <el-checkbox v-for="deptResultDTO in dataForm.deptResultDTOS" :label="deptResultDTO" :key="deptResultDTO.deptName">{{deptResultDTO.deptName}}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label="回复居民意见:" prop="handleAdvice">
+            <el-input v-model="postDataForm.handleAdvice" type="textarea" placeholder="请您选择居民诉求的处理情况及答复意见，向居民公开展示"></el-input>
+          </el-form-item>
+          <el-form-item label="项目处理意见:" prop="outHandleAdvice">
+            <el-input v-model="postDataForm.outHandleAdvice" type="textarea" placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调)，便于相关部门了解项目的实际情况"></el-input>
+          </el-form-item>
+          <el-form-item label="满意度评价:" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible">
+            <div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">
+              <label>{{evaluateDeptDTO.deptName}}</label>&nbsp;
+              <el-radio-group v-model="evaluateDeptDTO.evaluationLevel">
+                <el-radio :label="2">非常满意</el-radio>
+                <el-radio :label="1">基本满意</el-radio>
+                <el-radio :label="0">不满意</el-radio>
+              </el-radio-group>
+            </div>
+          </el-form-item>
+        </el-form>
+        <template>
+          <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+          <el-button @click="backToItemDeal">返回</el-button>
+        </template>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import BMap from 'BMap'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+import debounce from 'lodash/debounce'
+export default {
+  name: 'itemDealDetailView',
+  data () {
+    return {
+      map: '',
+      dataForm: {
+        id: '',
+        nickName: '',
+        distributeTime: '',
+        itemContent: '',
+        images: [],
+        issueAddress: '',
+        handleProgressResultDTOS: [],
+        handleResultDTOS: [],
+        deptResultDTOS: [],
+        evaluateDeptDTOS: [],
+        handleAdvice: '',
+        outHandleAdvice: '',
+        handleCategory: '',
+        issueLatitude: '',
+        issueLongitude: ''
+      },
+      postDataForm: {
+        id: '',
+        handleAdvice: '',
+        outHandleAdvice: '',
+        handleCategory: '',
+        deptResultDTOS: [],
+        evaluateDeptDTOS: []
+      },
+      deptResultDTOSVisible: false,
+      evaluateDeptDTOSVisible: false
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  computed: {
+    dataRule () {
+      return {
+        handleAdvice: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        outHandleAdvice: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        handleCategory: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptResultDTOS: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        evaluateDeptDTOS: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    'postDataForm.handleAdvice': function (val) {
+      this.dataForm.handleAdvice = val
+    },
+    'postDataForm.outHandleAdvice': function (val) {
+      this.dataForm.outHandleAdvice = val
+    },
+    'postDataForm.handleCategory': function (val) {
+      if (val === 1) {
+        this.deptResultDTOSVisible = true
+        this.evaluateDeptDTOSVisible = false
+        for (let index = 0; index < this.dataForm.deptResultDTOS.length; index++) {
+          const deptResultDTO = this.dataForm.deptResultDTOS[index]
+          if (deptResultDTO.selected === true) {
+            this.postDataForm.deptResultDTOS.push(deptResultDTO)
+          }
+        }
+      } else if (val === 10) {
+        if (this.dataForm.evaluateDeptDTOS.length === 0) {
+          return
+        }
+        this.evaluateDeptDTOSVisible = true
+        this.deptResultDTOSVisible = false
+      } else {
+        this.evaluateDeptDTOSVisible = false
+        this.deptResultDTOSVisible = false
+      }
+    }
+  },
+  methods: {
+    backToItemDeal () {
+      this.$parent.selectComponent = 'ItemDeal'
+    },
+    initBmap (latitude, longitude) {
+      this.map = new BMap.Map('map')
+      const point = new BMap.Point(120.38821849395045, 36.120219258412966)
+      var marker = new BMap.Marker(point)
+      this.map.addOverlay(marker)
+      this.map.centerAndZoom(point, 13)
+      this.map.enableScrollWheelZoom(true)
+    },
+    init () {
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.postDataForm.handleAdvice = ''
+          this.postDataForm.outHandleAdvice = ''
+          this.postDataForm.handleCategory = ''
+          this.postDataForm.deptResultDTOS = []
+          this.postDataForm.evaluateDeptDTOS = []
+          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
+        }
+        this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
+        for (let index = 0; index < res.data.handleResultDTOS.length; index++) {
+          const handleResultDTO = res.data.handleResultDTOS[index]
+          if (handleResultDTO.select === true) {
+            this.dataForm.handleCategory = handleResultDTO.processResult
+          }
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.postDataForm.id = this.dataForm.id
+      if (this.postDataForm.handleCategory === '') {
+        return this.$message.error('请选择处理选项')
+      }
+      if (this.deptResultDTOSVisible) {
+        if (this.postDataForm.deptResultDTOS === undefined || this.postDataForm.deptResultDTOS.length <= 0) {
+          return this.$message.error('请选择流转对象')
+        }
+      } else {
+        this.postDataForm.deptResultDTOS = []
+      }
+      if (this.postDataForm.handleAdvice === '') {
+        return this.$message.error('回复居民意见不能为空')
+      }
+      if (this.postDataForm.handleAdvice.length > 500) {
+        return this.$message.error('回复居民意见不能超过500字')
+      }
+      if (this.postDataForm.outHandleAdvice === '') {
+        return this.$message.error('项目处理意见不能为空')
+      }
+      if (this.postDataForm.outHandleAdvice > 500) {
+        return this.$message.error('项目处理意见不能超过500字')
+      }
+      if (this.evaluateDeptDTOSVisible) {
+        this.postDataForm.evaluateDeptDTOS = this.dataForm.evaluateDeptDTOS
+        if (this.postDataForm.evaluateDeptDTOS.length !== this.dataForm.evaluateDeptDTOS.length) {
+          return this.$message.error('请完善满意度调查')
+        }
+      } else {
+        this.postDataForm.evaluateDeptDTOS = []
+      }
+      this.$http['post'](
+        '/events/item/itemHandleSubmit', this.postDataForm).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>
+
+<style lang="scss">
+  .project-handle {
+    .el-timeline {
+      padding-left: 9px;
+      font-size: 13px;
+    }
+  }
+</style>
+
+<style lang="scss" scoped>
+.project-handle {
+  width: 100%;
+  height: calc(100vh - 50px - 38px - 15px);
+  background: #ffffff;
+  box-sizing: border-box;
+  padding: 10px;
+  .project-detail {
+    width: 79%;
+    height: 49%;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    padding: 10px;
+    float:left;
+    margin-bottom: 1%;
+    .el-form {
+      width: 58%;
+      height: 100%;
+      float:left;
+      overflow-y:auto;
+      &::-webkit-scrollbar {
+        width: 5px;
+        height: 1px;
+      }
+      &::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        background: #fff;
+      }
+      &::-webkit-scrollbar-track {
+        border-radius: 10px;
+        background: #fff;
+      }
+    }
+    .container {
+      width: 40%;
+      height: 100%;
+      float: right;
+      .location {
+        height: 30px;
+        line-height: 30px;
+      }
+      #map {
+        width: 100%;
+        height: calc(100% - 30px);
+      }
+    }
+  }
+  .project-progress {
+    width: 20%;
+    height: 100%;
+    float: right;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    margin-left: 1%;
+    padding-top: 20px;
+    overflow-y:auto;
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 5px;
+      background: #aaa;
+    }
+    &::-webkit-scrollbar-track {
+      border-radius: 10px;
+      background: #ccc;
+    }
+  }
+  .handle-operation {
+    width: 79%;
+    height: 49%;
+    box-sizing: border-box;
+    border: 2px solid #ccc;
+    float:left;
+  }
+}
+</style>
diff --git a/src/views/modules/events/item-deal-list.vue b/src/views/modules/events/item-deal-list.vue
new file mode 100644
index 00000000..6b8572c7
--- /dev/null
+++ b/src/views/modules/events/item-deal-list.vue
@@ -0,0 +1,235 @@
+<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 label="街道">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+      <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 label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         width="50"></el-table-column>
+        <el-table-column prop="itemContent"
+                         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 prop="participantsNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         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:item:deal')"
+                       type="text"
+                       size="small"
+                       @click="dealAction(scope.row.id)">{{ $t('deal') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <detail v-if="detailVisible"
+              ref="detail"
+              @refreshDataList="getDataList"></detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import Detail from './item-deal-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true
+      },
+      detailVisible: false,
+      dataForm: {
+        id: '',
+        itemState: '0',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      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: {
+    Detail
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    dealAction (id) {
+      this.$parent.selectComponent = 'ItemDealDetailView'
+      this.$router.push({ path: '/events-item-deal', query: { id: id } })
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>

From 02ce71420a54b8fb02be0e354cd97ac841e7194d Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Tue, 29 Oct 2019 09:50:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintignore                                 |   4 +
 public/index.html                             |   2 +-
 src/router/index.js                           |   6 +-
 .../events/issue-process-detail-view.vue      |  28 ++-
 .../events/issue-review-detail-view.vue       |  23 +-
 .../modules/events/item-deal-detail-view.vue  |  19 +-
 .../modules/news/notice-add-or-update.vue     |  12 +-
 src/views/pages/projectHandle.vue             | 220 ------------------
 8 files changed, 64 insertions(+), 250 deletions(-)
 delete mode 100644 src/views/pages/projectHandle.vue

diff --git a/.eslintignore b/.eslintignore
index 7b931680..05c4d650 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,5 @@
 /src/icons/iconfont.js
+rules: {
+    // allow debugger during development
+    'no-debugger': 'error',
+  }
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 65c8b7bb..d8bf072d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -33,7 +33,7 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
   <script>
-    window.SITE_CONFIG['apiURL'] = 'https://epdc-api.elinkchina.com.cn'
+    window.SITE_CONFIG['apiURL'] = 'http://10.10.10.118:9094/epdc-api'
   </script>
   <% } %>
   <!-- 集成测试环境 -->
diff --git a/src/router/index.js b/src/router/index.js
index 11d657a8..e5011253 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,11 +24,7 @@ export const pageRoutes = [
   { path: '/login',
     component: () => import('@/views/pages/login'),
     name: 'login',
-    meta: { title: '登录' } },
-  { path: '/project-handle',
-    name: 'projectHandle',
-    component: () => import('@/views/pages/projectHandle')
-  }
+    meta: { title: '登录' } }
 ]
 
 // 模块路由(基于主入口布局页面)
diff --git a/src/views/modules/events/issue-process-detail-view.vue b/src/views/modules/events/issue-process-detail-view.vue
index c3f04db5..5d87a891 100644
--- a/src/views/modules/events/issue-process-detail-view.vue
+++ b/src/views/modules/events/issue-process-detail-view.vue
@@ -45,6 +45,7 @@
                 </el-form-item>
             </div>
             <div class="handle-operation">
+              <el-form label-width="120px" label-position="right" style="width: 720px;" :rules="dataRule">
                 <el-form-item label="处理:" prop="state">
                     <el-select v-model="dataForm.state" placeholder="请选择">
                         <el-option
@@ -58,10 +59,11 @@
                 <el-form-item label="处理意见:" prop="advice">
                     <el-input v-model="dataForm.advice" type="textarea" placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
                 </el-form-item>
-                <template>
-                    <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-                    <el-button @click="backToItemDeal">返回</el-button>
-                </template>
+                <el-form-item style="float: right;">
+                    <el-button size="small" type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+                    <el-button size="small" @click="backToItemDeal">返回</el-button>
+                </el-form-item>
+              </el-form>
             </div>
         </el-form>
     </div>
@@ -186,6 +188,12 @@ export default {
             padding-left: 9px;
             font-size: 13px;
         }
+        .el-textarea {
+          width: 600px !important;
+        }
+        .el-input {
+          width: 600px !important;
+        }
     }
 </style>
 
@@ -259,11 +267,13 @@ export default {
             }
         }
         .handle-operation {
-            width: 79%;
-            height: 49%;
-            box-sizing: border-box;
-            border: 2px solid #ccc;
-            float:left;
+          padding-top: 20px;
+          box-sizing: border-box;
+          width: 79%;
+          height: 49%;
+          box-sizing: border-box;
+          border: 2px solid #ccc;
+          float:left;
         }
     }
 </style>
diff --git a/src/views/modules/events/issue-review-detail-view.vue b/src/views/modules/events/issue-review-detail-view.vue
index f716ce8d..27b5d1a9 100644
--- a/src/views/modules/events/issue-review-detail-view.vue
+++ b/src/views/modules/events/issue-review-detail-view.vue
@@ -28,6 +28,7 @@
                 </div>
             </div>
             <div class="handle-operation">
+              <el-form label-width="120px" label-position="right" style="width: 720px;" :rules="dataRule">
                 <el-form-item label="审核:" prop="eventState">
                     <el-select v-model="dataForm.eventState" placeholder="请选择">
                         <el-option
@@ -49,12 +50,14 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="处理意见:" prop="advice">
-                    <el-input v-model="dataForm.advice" type="textarea" placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
+                    <el-input :rows="4" v-model="dataForm.advice" type="textarea" placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
                 </el-form-item>
-                <template>
-                    <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-                    <el-button @click="backToItemDeal">{{ '返回' }}</el-button>
-                </template>
+                <el-form-item style="float: right;">
+                    <el-button size="small" type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+                    <el-button size="small" @click="backToItemDeal">{{ '返回' }}</el-button>
+                </el-form-item>
+              </el-form>
+
             </div>
         </el-form>
     </div>
@@ -203,6 +206,12 @@ export default {
             padding-left: 9px;
             font-size: 13px;
         }
+        .el-textarea {
+          width: 600px !important;
+        }
+        .el-input {
+          width: 600px !important;
+        }
     }
 </style>
 
@@ -232,7 +241,7 @@ export default {
                 }
                 &::-webkit-scrollbar-thumb {
                     border-radius: 5px;
-                    background: #fff;
+                    background: #ccc;
                 }
                 &::-webkit-scrollbar-track {
                     border-radius: 10px;
@@ -276,6 +285,8 @@ export default {
             }
         }
         .handle-operation {
+          padding-top: 20px;
+          box-sizing: border-box;
             width: 100%;
             height: 49%;
             box-sizing: border-box;
diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue
index 16fa24bc..4eb885c5 100644
--- a/src/views/modules/events/item-deal-detail-view.vue
+++ b/src/views/modules/events/item-deal-detail-view.vue
@@ -50,7 +50,7 @@
         </el-timeline>
       </div>
       <div class="handle-operation">
-        <el-form label-position="right" label-width="120px">
+         <el-form label-width="120px" label-position="right" style="width: 720px;" :rules="dataRule">
           <el-form-item label="处理:" prop="handleCategory">
             <el-select v-model="postDataForm.handleCategory" placeholder="请选择">
               <el-option
@@ -82,11 +82,12 @@
               </el-radio-group>
             </div>
           </el-form-item>
+          <el-form-item style="float: right;">
+            <el-button size="small" type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+            <el-button size="small" @click="backToItemDeal">返回</el-button>
+        </el-form-item>
         </el-form>
-        <template>
-          <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-          <el-button @click="backToItemDeal">返回</el-button>
-        </template>
+
       </div>
     </el-form>
   </div>
@@ -288,6 +289,12 @@ export default {
       padding-left: 9px;
       font-size: 13px;
     }
+    .el-textarea {
+          width: 600px !important;
+        }
+        .el-input {
+          width: 600px !important;
+        }
   }
 </style>
 
@@ -361,6 +368,8 @@ export default {
     }
   }
   .handle-operation {
+    padding-top: 20px;
+    box-sizing: border-box;
     width: 79%;
     height: 49%;
     box-sizing: border-box;
diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
index 023d0529..4253a569 100644
--- a/src/views/modules/news/notice-add-or-update.vue
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -33,7 +33,7 @@
       </el-form-item>
       <el-form-item label="所属网格"
                     prop="gridId">
-        <el-select v-model="dataForm.gridId"
+        <el-select v-model="value"
                    @change="changeGrid"
                    placeholder="所属网格">
           <el-option v-for="item in gridList"
@@ -97,6 +97,7 @@ export default {
         noticeTitle: '',
         noticeContent: ''
       },
+      value: '',
       // 富文本
       quillEditor: null,
       quillEditorToolbarOptions: [
@@ -278,10 +279,13 @@ export default {
       // 获取社区下属网格
       this.getDeptInfoList('grid', this.dataForm.communityId)
     },
-    changeGrid () {
+    changeGrid (item) {
+      console.log(item)
       // 给网格变量赋值
-      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.gridId)[0]
-      this.dataForm.grid = choosenItem.name
+      // let choosenItem = this.gridList.filter(item => item.id === this.dataForm.gridId)[0]
+      // this.dataForm.grid = choosenItem.name
+      // this.dataForm = Object.assign(this.dataForm, { gridId: item })
+      console.log(this.dataForm)
     }
 
   }
diff --git a/src/views/pages/projectHandle.vue b/src/views/pages/projectHandle.vue
deleted file mode 100644
index 16cc4418..00000000
--- a/src/views/pages/projectHandle.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-  <div class="project-handle">
-
-    <div class="project-detail">
-      <el-form label-position="right" label-width="120px">
-        <el-form-item label="议题内容：">
-
-        </el-form-item>
-        <el-form-item label="议题图片：">
-
-        </el-form-item>
-        <el-form-item label="上报时间：">
-
-        </el-form-item>
-        <el-form-item label="上报人：">
-
-        </el-form-item>
-        <el-form-item label="电话：">
-
-        </el-form-item>
-        <el-form-item label="所属类别：">
-
-        </el-form-item>
-        <el-form-item label="项目态度:">
-
-        </el-form-item>
-        <el-form-item label="项目评论：">
-          <el-button type="text">查看评论</el-button>
-        </el-form-item>
-      </el-form>
-      <div class="container">
-        <div class="location">上报位置: 山东省青岛市市北区南宁路138号</div>
-        <div id="map"></div>
-      </div>
-    </div>
-
-    <div class="project-progress">
-      <el-timeline>
-        <el-timeline-item
-          v-for="(activity, index) in activities"
-          :key="index"
-          :icon="activity.icon"
-          :type="activity.type"
-          :color="activity.color"
-          :size="activity.size">
-          <div v-html="activity.content"></div>
-        </el-timeline-item>
-      </el-timeline>
-    </div>
-
-    <div class="handle-operation">
-      <el-form label-position="right" label-width="120px">
-        <el-form-item label="处理:">
-
-        </el-form-item>
-        <el-form-item label="吹哨部门:">
-
-        </el-form-item>
-        <el-form-item label="回复居民意见">
-
-        </el-form-item>
-        <el-form-item label="项目处理意见">
-
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-import BMap from 'BMap'
-import 'element-ui/lib/theme-chalk/timeline.css'
-import 'element-ui/lib/theme-chalk/timeline-item.css'
-export default {
-  name: 'projectHandle',
-  data () {
-    return {
-      map: '',
-      activities: [{
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#0980ff'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>',
-        color: '#FF4C52'
-      },
-      {
-        content: '<div>2019-09-25 12:32:32 【回应】</div><div>处理部门： 街道处理部门</div><div>处理意见： 氛围分隔符方式风格人物</div>'
-      }]
-    }
-  },
-  mounted () {
-    this.initBmap()
-  },
-  methods: {
-    initBmap () {
-      this.map = new BMap.Map('map')
-      const point = new BMap.Point(120.38821849395045, 36.120219258412966)
-      var marker = new BMap.Marker(point)
-      this.map.addOverlay(marker)
-      this.map.centerAndZoom(point, 13)
-      this.map.enableScrollWheelZoom(true)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.project-handle {
-  width: 100%;
-  height: 100vh;
-  box-sizing: border-box;
-  padding: 10px;
-  .project-detail {
-    width: 79%;
-    height: 49%;
-    border: 2px solid #ccc;
-    box-sizing: border-box;
-    padding: 10px;
-    float:left;
-    margin-bottom: 1%;
-    .el-form {
-      width: 58%;
-      height: 100%;
-      float:left;
-      overflow-y:auto;
-      &::-webkit-scrollbar {
-        width: 5px;
-        height: 1px;
-      }
-      &::-webkit-scrollbar-thumb {
-        border-radius: 5px;
-        background: #fff;
-      }
-      &::-webkit-scrollbar-track {
-        border-radius: 10px;
-        background: #fff;
-      }
-    }
-    .container {
-      width: 40%;
-      height: 100%;
-      float: right;
-      .location {
-        height: 30px;
-        line-height: 30px;
-      }
-      #map {
-        width: 100%;
-        height: calc(100% - 30px);
-      }
-    }
-  }
-  .project-progress {
-    width: 20%;
-    height: 100%;
-    float: right;
-    border: 2px solid #ccc;
-    box-sizing: border-box;
-    margin-left: 1%;
-    padding-top: 20px;
-    overflow-y:auto;
-    &::-webkit-scrollbar {
-      width: 5px;
-      height: 1px;
-    }
-    &::-webkit-scrollbar-thumb {
-      border-radius: 5px;
-      background: #aaa;
-    }
-    &::-webkit-scrollbar-track {
-      border-radius: 10px;
-      background: #ccc;
-    }
-  }
-  .handle-operation {
-    width: 79%;
-    height: 49%;
-    box-sizing: border-box;
-    border: 2px solid #ccc;
-    float:left;
-  }
-}
-</style>

From 09ddc7add13b2f7fe473c70d1d0b6cae5815c77b Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 29 Oct 2019 14:58:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/issue-change-list.vue      | 234 +++++++++++++++++
 src/views/modules/events/issue-change.vue     | 231 +----------------
 .../events/issue-close-detail-view.vue        |   3 +
 src/views/modules/events/issue-close-list.vue |   5 +
 src/views/modules/events/issue-close.vue      |   2 +-
 .../events/issue-process-detail-view.vue      |   6 +-
 .../modules/events/issue-process-list.vue     |  14 +-
 src/views/modules/events/issue-process.vue    |   6 +-
 .../events/issue-reject-detail-view.vue       |   3 +
 .../modules/events/issue-reject-list.vue      |   3 +
 src/views/modules/events/issue-reject.vue     |   2 +-
 .../events/issue-review-detail-view.vue       |  32 +--
 .../modules/events/issue-review-list.vue      |   3 +
 src/views/modules/events/issue-review.vue     |   2 +-
 .../modules/events/item-close-detail-view.vue |   3 +
 src/views/modules/events/item-close-list.vue  |   9 +-
 src/views/modules/events/item-close.vue       |   2 +-
 .../modules/events/item-deal-detail-view.vue  |  97 ++++++-
 src/views/modules/events/item-deal-list.vue   |   9 +-
 src/views/modules/events/item-deal.vue        |   2 +-
 src/views/modules/events/item-end-list.vue    | 236 ++++++++++++++++++
 src/views/modules/events/item-end.vue         | 233 +----------------
 22 files changed, 651 insertions(+), 486 deletions(-)
 create mode 100644 src/views/modules/events/issue-change-list.vue
 create mode 100644 src/views/modules/events/item-end-list.vue
 mode change 100755 => 100644 src/views/modules/events/item-end.vue

diff --git a/src/views/modules/events/issue-change-list.vue b/src/views/modules/events/issue-change-list.vue
new file mode 100644
index 00000000..48703b2e
--- /dev/null
+++ b/src/views/modules/events/issue-change-list.vue
@@ -0,0 +1,234 @@
+<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="街道">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="issueContent"
+                         label="议题内容"
+                         header-align="center"
+                         width="330"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="提交时间"
+                         header-align="center"
+                         width="160"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         width="120"
+                         align="center"></el-table-column>
+        <el-table-column prop="participateNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         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:change:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</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>
+      <detail v-if="detailVisible"
+              ref="detail"
+              @refreshDataList="getDataList"></detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import Detail from './issue-detail'
+export default {
+  mixins: [mixinViewModule],
+  name: 'issueChangelist',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/issue/page',
+        getDataListIsPage: true
+      },
+      detailVisible: false,
+      dataForm: {
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        state: '4'
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      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: {
+    Detail
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    detailAction (id) {
+      this.$parent.selectComponent = 'IssueCloseDetailView'
+      this.$router.push({ path: '/events-issue-change', query: { id: id } })
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/issue-change.vue b/src/views/modules/events/issue-change.vue
index 26ec5bb4..a920c5fa 100644
--- a/src/views/modules/events/issue-change.vue
+++ b/src/views/modules/events/issue-change.vue
@@ -1,232 +1,25 @@
 <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="街道">
-          <el-select v-model="dataForm.streetId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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>
-      <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 prop="participateNum"
-                         label="参与人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="approveNum"
-                         label="支持人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="opposeNum"
-                         label="反对人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="commentNum"
-                         label="评论数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="browseNum"
-                         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:change:look')"
-                       type="text"
-                       size="small"
-                       @click="detailAction(scope.row.id)">{{ $t('look') }}</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>
-      <detail v-if="detailVisible"
-              ref="detail"
-              @refreshDataList="getDataList"></detail>
-    </div>
-  </el-card>
+    <keep-alive include="issueChangelist">
+        <component :is="selectComponent"></component>
+    </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import Detail from './issue-detail'
+import IssueChangeList from './issue-change-list'
+import IssueCloseDetailView from './issue-close-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/issue/page',
-        getDataListIsPage: true
-      },
-      detailVisible: false,
-      dataForm: {
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        state: '4'
-      },
-      streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      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()
-          }
-        }
-      }
+      selectComponent: IssueChangeList
     }
   },
   components: {
-    Detail
-  },
-  created: function () {
-    this.getStreetList()
-  },
-  methods: {
-    detailAction (id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.detail.dataForm.id = id
-        this.$refs.detail.init()
-      })
-    },
-    getStreetList () {
-      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.streetOptions = res.data
-      }).catch(() => { })
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => { })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => { })
-    }
+    IssueChangeList,
+    IssueCloseDetailView
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/events/issue-close-detail-view.vue b/src/views/modules/events/issue-close-detail-view.vue
index 7a533a43..14254c26 100644
--- a/src/views/modules/events/issue-close-detail-view.vue
+++ b/src/views/modules/events/issue-close-detail-view.vue
@@ -21,6 +21,9 @@
                     <el-form-item label="上报人:">
                         <div>{{dataForm.nickName}}</div>
                     </el-form-item>
+                    <el-form-item label="电话:" prop="mobile">
+                        <div>{{dataForm.mobile}}</div>
+                    </el-form-item>
                     <el-form-item label="所属类别:" prop="categoryName">
                         <div>{{dataForm.categoryName}}</div>
                     </el-form-item>
diff --git a/src/views/modules/events/issue-close-list.vue b/src/views/modules/events/issue-close-list.vue
index 49fbd8cc..09815dfa 100644
--- a/src/views/modules/events/issue-close-list.vue
+++ b/src/views/modules/events/issue-close-list.vue
@@ -72,18 +72,22 @@
         <el-table-column label="序号"
                          type="index"
                          show-overflow-tooltip
+                         align="center"
                          width="50"></el-table-column>
         <el-table-column prop="issueContent"
                          label="议题内容"
                          header-align="center"
+                         width="330"
                          align="center"></el-table-column>
         <el-table-column prop="createdTime"
                          label="提交时间"
                          header-align="center"
+                         width="160"
                          align="center"></el-table-column>
         <el-table-column prop="nickName"
                          label="提交人"
                          header-align="center"
+                         width="120"
                          align="center"></el-table-column>
         <el-table-column prop="participateNum"
                          label="参与人数"
@@ -139,6 +143,7 @@ import mixinViewModule from '@/mixins/view-module'
 import Detail from './issue-close-detail-view'
 export default {
   mixins: [mixinViewModule],
+  name: 'IssueCloseList',
   data () {
     return {
       mixinViewModuleOptions: {
diff --git a/src/views/modules/events/issue-close.vue b/src/views/modules/events/issue-close.vue
index 55b5db08..0b216420 100644
--- a/src/views/modules/events/issue-close.vue
+++ b/src/views/modules/events/issue-close.vue
@@ -1,5 +1,5 @@
 <template>
-    <keep-alive>
+    <keep-alive include="IssueCloseList">
         <component :is="selectComponent"></component>
     </keep-alive>
 </template>
diff --git a/src/views/modules/events/issue-process-detail-view.vue b/src/views/modules/events/issue-process-detail-view.vue
index 5d87a891..fb4d0edd 100644
--- a/src/views/modules/events/issue-process-detail-view.vue
+++ b/src/views/modules/events/issue-process-detail-view.vue
@@ -23,6 +23,9 @@
                     <el-form-item label="上报人:" prop="nickName">
                         <div>{{dataForm.nickName}}</div>
                     </el-form-item>
+                    <el-form-item label="电话:" prop="mobile">
+                        <div>{{dataForm.mobile}}</div>
+                    </el-form-item>
                     <el-form-item label="所属类别:" prop="categoryName">
                         <div>{{dataForm.categoryName}}</div>
                     </el-form-item>
@@ -45,7 +48,7 @@
                 </el-form-item>
             </div>
             <div class="handle-operation">
-              <el-form label-width="120px" label-position="right" style="width: 720px;" :rules="dataRule">
+              <el-form label-width="120px" label-position="right" style="width: 720px;" >
                 <el-form-item label="处理:" prop="state">
                     <el-select v-model="dataForm.state" placeholder="请选择">
                         <el-option
@@ -175,6 +178,7 @@ export default {
               this.$emit('refreshDataList')
             }
           })
+          this.$parent.selectComponent = 'IssueProcessList'
         }).catch(() => {})
       })
     }, 1000, { 'leading': true, 'trailing': false })
diff --git a/src/views/modules/events/issue-process-list.vue b/src/views/modules/events/issue-process-list.vue
index 7ecbb96e..c3ef8ac4 100644
--- a/src/views/modules/events/issue-process-list.vue
+++ b/src/views/modules/events/issue-process-list.vue
@@ -72,18 +72,22 @@
         <el-table-column label="序号"
                          type="index"
                          show-overflow-tooltip
+                         align="center"
                          width="50"></el-table-column>
         <el-table-column prop="issueContent"
                          label="议题内容"
                          header-align="center"
+                         width="330"
                          align="center"></el-table-column>
         <el-table-column prop="createdTime"
                          label="提交时间"
                          header-align="center"
+                         width="160"
                          align="center"></el-table-column>
         <el-table-column prop="nickName"
                          label="提交人"
                          header-align="center"
+                         width="120"
                          align="center"></el-table-column>
         <el-table-column prop="participateNum"
                          label="参与人数"
@@ -144,9 +148,10 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import ProcessDeal from './issue-process-deal'
-import Detail from './issue-detail'
+import Detail from './issue-close-detail-view'
 export default {
   mixins: [mixinViewModule],
+  name: 'processlist',
   data () {
     return {
       mixinViewModuleOptions: {
@@ -193,11 +198,8 @@ export default {
   },
   methods: {
     detailAction (id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.detail.dataForm.id = id
-        this.$refs.detail.init()
-      })
+      this.$parent.selectComponent = 'IssueCloseDetailView'
+      this.$router.push({ path: '/events-issue-process', query: { id: id } })
     },
     dealAction (id) {
       this.$parent.selectComponent = 'IssueProcessDetailView'
diff --git a/src/views/modules/events/issue-process.vue b/src/views/modules/events/issue-process.vue
index 4abde559..f2980bc6 100644
--- a/src/views/modules/events/issue-process.vue
+++ b/src/views/modules/events/issue-process.vue
@@ -1,5 +1,5 @@
 <template>
-    <keep-alive>
+    <keep-alive include="processlist">
         <component :is="selectComponent"></component>
     </keep-alive>
 </template>
@@ -7,6 +7,7 @@
 <script>
 import IssueProcessList from './issue-process-list'
 import IssueProcessDetailView from './issue-process-detail-view'
+import IssueCloseDetailView from './issue-close-detail-view'
 export default {
   data () {
     return {
@@ -15,7 +16,8 @@ export default {
   },
   components: {
     IssueProcessList,
-    IssueProcessDetailView
+    IssueProcessDetailView,
+    IssueCloseDetailView
   }
 }
 </script>
diff --git a/src/views/modules/events/issue-reject-detail-view.vue b/src/views/modules/events/issue-reject-detail-view.vue
index cc30955f..77a4d62c 100644
--- a/src/views/modules/events/issue-reject-detail-view.vue
+++ b/src/views/modules/events/issue-reject-detail-view.vue
@@ -21,6 +21,9 @@
                     <el-form-item label="上报人:" prop="nickName">
                         <div>{{dataForm.nickName}}</div>
                     </el-form-item>
+                    <el-form-item label="电话:" prop="mobile">
+                        <div>{{dataForm.mobile}}</div>
+                    </el-form-item>
                     <el-form-item label="状态:" prop="stateName">
                         <div>{{dataForm.stateName}}</div>
                     </el-form-item>
diff --git a/src/views/modules/events/issue-reject-list.vue b/src/views/modules/events/issue-reject-list.vue
index 32f1cd16..dedbc845 100644
--- a/src/views/modules/events/issue-reject-list.vue
+++ b/src/views/modules/events/issue-reject-list.vue
@@ -71,11 +71,13 @@
                 style="width: 100%;">
         <el-table-column label="序号"
                          type="index"
+                         align="center"
                          show-overflow-tooltip
                          width="50"></el-table-column>
         <el-table-column prop="eventContent"
                          label="议题内容"
                          header-align="center"
+                         width="520"
                          align="center"></el-table-column>
         <el-table-column prop="createdTime"
                          label="提交时间"
@@ -119,6 +121,7 @@ import mixinViewModule from '@/mixins/view-module'
 import RejectDetail from './issue-reject-detail'
 export default {
   mixins: [mixinViewModule],
+  name: 'IssueRejectList',
   data () {
     return {
       mixinViewModuleOptions: {
diff --git a/src/views/modules/events/issue-reject.vue b/src/views/modules/events/issue-reject.vue
index 6ac59c6f..104c78e3 100644
--- a/src/views/modules/events/issue-reject.vue
+++ b/src/views/modules/events/issue-reject.vue
@@ -1,5 +1,5 @@
 <template>
-    <keep-alive>
+    <keep-alive include="IssueRejectList">
         <component :is="selectComponent"></component>
     </keep-alive>
 </template>
diff --git a/src/views/modules/events/issue-review-detail-view.vue b/src/views/modules/events/issue-review-detail-view.vue
index 27b5d1a9..e642c08e 100644
--- a/src/views/modules/events/issue-review-detail-view.vue
+++ b/src/views/modules/events/issue-review-detail-view.vue
@@ -7,7 +7,7 @@
                         <div>{{dataForm.eventContent}}</div>
                         <span v-for="(imgUrl, index) in urls" :key="index" style="margin: 5px">
                           <el-popover placement="bottom" title="" trigger="click">
-                            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+                            <img :src="imgUrl" style='width: 800px;height: 600px;'>
                             <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
                           </el-popover>
                         </span>
@@ -15,12 +15,15 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.ownGrid}}</div>
                     </el-form-item>
-                    <el-form-item label="上报时间:" prop="nickName">
+                    <el-form-item label="上报时间:" prop="createdTime">
                         <div>{{dataForm.createdTime}}</div>
                     </el-form-item>
                     <el-form-item label="上报人:" prop="nickName">
                         <div>{{dataForm.nickName}}</div>
                     </el-form-item>
+                    <el-form-item label="电话:" prop="mobile">
+                        <div>{{dataForm.mobile}}</div>
+                    </el-form-item>
                 </el-form>
                 <div class="container">
                     <div class="location">上报位置: {{dataForm.address}}</div>
@@ -28,16 +31,10 @@
                 </div>
             </div>
             <div class="handle-operation">
-              <el-form label-width="120px" label-position="right" style="width: 720px;" :rules="dataRule">
+              <el-form label-width="120px" label-position="right" style="width: 720px;">
                 <el-form-item label="审核:" prop="eventState">
-                    <el-select v-model="dataForm.eventState" placeholder="请选择">
-                        <el-option
-                                v-for="item in verifyOptions"
-                                :key="item.verifyFlag"
-                                :label="item.verifyTitle"
-                                :value="item.verifyFlag">
-                        </el-option>
-                    </el-select>
+                    <el-radio v-model="dataForm.eventState" label="4">审核通过</el-radio>
+                    <el-radio v-model="dataForm.eventState" label="2">驳回</el-radio>
                 </el-form-item>
                 <el-form-item label="议题所属类别:" prop="categoryId" v-if="categoryVisible">
                     <el-select v-model="dataForm.categoryId" placeholder="请选择">
@@ -79,18 +76,11 @@ export default {
         nickName: '',
         categoryId: '',
         advice: '',
-        eventState: ''
+        eventState: '4'
       },
       categoryVisible: true,
       urls: [],
-      categoryOptions: [],
-      verifyOptions: [{
-        verifyFlag: '2',
-        verifyTitle: '驳回'
-      }, {
-        verifyFlag: '4',
-        verifyTitle: '审核通过'
-      }]
+      categoryOptions: []
     }
   },
   mounted () {
@@ -166,7 +156,6 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-        console.log(JSON.stringify(this.dataForm))
         this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
         this.urls = res.data.imageArray
       }).catch(() => {})
@@ -190,6 +179,7 @@ export default {
             duration: 500,
             onClose: () => {
               this.visible = false
+              this.$parent.selectComponent = 'IssueReviewList'
               this.$emit('refreshDataList')
             }
           })
diff --git a/src/views/modules/events/issue-review-list.vue b/src/views/modules/events/issue-review-list.vue
index fe784716..c07bb0a2 100644
--- a/src/views/modules/events/issue-review-list.vue
+++ b/src/views/modules/events/issue-review-list.vue
@@ -72,10 +72,12 @@
         <el-table-column label="序号"
                          type="index"
                          show-overflow-tooltip
+                         align="center"
                          width="50"></el-table-column>
         <el-table-column prop="eventContent"
                          label="议题内容"
                          header-align="center"
+                         width="520"
                          align="center"></el-table-column>
         <el-table-column prop="createdTime"
                          label="提交时间"
@@ -119,6 +121,7 @@ import mixinViewModule from '@/mixins/view-module'
 import ReviewDetail from './issue-review-detail'
 export default {
   mixins: [mixinViewModule],
+  name: 'issueReviewList',
   data () {
     return {
       mixinViewModuleOptions: {
diff --git a/src/views/modules/events/issue-review.vue b/src/views/modules/events/issue-review.vue
index 2dc09a3c..120783f6 100644
--- a/src/views/modules/events/issue-review.vue
+++ b/src/views/modules/events/issue-review.vue
@@ -1,5 +1,5 @@
 <template>
-    <keep-alive>
+    <keep-alive include="issueReviewList">
         <component :is="selectComponent"></component>
     </keep-alive>
 </template>
diff --git a/src/views/modules/events/item-close-detail-view.vue b/src/views/modules/events/item-close-detail-view.vue
index 5ebfec00..ee7cccf5 100644
--- a/src/views/modules/events/item-close-detail-view.vue
+++ b/src/views/modules/events/item-close-detail-view.vue
@@ -18,6 +18,9 @@
             <el-form-item label="上报人:">
               <div>{{dataForm.nickName}}</div>
             </el-form-item>
+              <el-form-item label="电话:" prop="mobile">
+                  <div>{{dataForm.mobile}}</div>
+              </el-form-item>
             <el-form-item label="所属类别:" prop="categoryName">
               <div>{{dataForm.categoryName}}</div>
             </el-form-item>
diff --git a/src/views/modules/events/item-close-list.vue b/src/views/modules/events/item-close-list.vue
index 37e85196..b3fa8dfc 100644
--- a/src/views/modules/events/item-close-list.vue
+++ b/src/views/modules/events/item-close-list.vue
@@ -69,21 +69,25 @@
                       border
                       @selection-change="dataListSelectionChangeHandle"
                       style="width: 100%;">
-                <el-table-column type="selection"
-                                 header-align="center"
+                <el-table-column label="序号"
+                                 type="index"
+                                 show-overflow-tooltip
                                  align="center"
                                  width="50"></el-table-column>
                 <el-table-column prop="itemContent"
                                  label="项目内容"
                                  header-align="center"
+                                 width="330"
                                  align="center"></el-table-column>
                 <el-table-column prop="createdTime"
                                  label="转成项目时间"
                                  header-align="center"
+                                 width="160"
                                  align="center"></el-table-column>
                 <el-table-column prop="nickName"
                                  label="提交人"
                                  header-align="center"
+                                 width="120"
                                  align="center"></el-table-column>
                 <el-table-column prop="participantsNum"
                                  label="参与人数"
@@ -138,6 +142,7 @@ import mixinViewModule from '@/mixins/view-module'
 import Detail from './item-detail'
 export default {
   mixins: [mixinViewModule],
+  name: 'ItemCloseList',
   data () {
     return {
       mixinViewModuleOptions: {
diff --git a/src/views/modules/events/item-close.vue b/src/views/modules/events/item-close.vue
index 55b3e34f..7413c3f2 100755
--- a/src/views/modules/events/item-close.vue
+++ b/src/views/modules/events/item-close.vue
@@ -1,5 +1,5 @@
 <template>
-  <keep-alive>
+  <keep-alive include="ItemCloseList">
     <component :is="selectComponent"></component>
   </keep-alive>
 </template>
diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue
index 4eb885c5..04b6e40c 100644
--- a/src/views/modules/events/item-deal-detail-view.vue
+++ b/src/views/modules/events/item-deal-detail-view.vue
@@ -18,9 +18,21 @@
           <el-form-item label="上报人:" prop="nickName">
             <div>{{dataForm.nickName}}</div>
           </el-form-item>
+          <el-form-item label="电话:" prop="mobile">
+            <div>{{dataForm.mobile}}</div>
+          </el-form-item>
           <el-form-item label="所属类别:" prop="categoryName">
             <div>{{dataForm.categoryName}}</div>
           </el-form-item>
+          <el-form-item label="项目态度:">
+            <span>表达态度 {{dataForm.approveNum + dataForm.opposeNum + dataForm.commentNum}}</span>&nbsp;&nbsp;
+            <span>评论 {{dataForm.commentNum}}</span>&nbsp;&nbsp;
+            <span>支持 {{dataForm.approveNum}}</span>&nbsp;&nbsp;
+            <span>反对 {{dataForm.opposeNum}}</span>
+          </el-form-item>
+          <el-form-item label="项目评论:">
+            <el-button type="primary" @click="innerVisible = true">查看评论</el-button>
+          </el-form-item>
         </el-form>
         <div class="container">
           <div class="location">上报位置: {{dataForm.issueAddress}}</div>
@@ -61,11 +73,16 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="吹哨部门:" prop="deptResultDTOS" v-if="deptResultDTOSVisible">
-            <el-checkbox-group v-model="postDataForm.deptResultDTOS">
-              <el-checkbox v-for="deptResultDTO in dataForm.deptResultDTOS" :label="deptResultDTO" :key="deptResultDTO.deptName">{{deptResultDTO.deptName}}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
+           <el-form-item label="吹哨部门:" prop="deptResultDTOS" v-if="deptResultDTOSVisible">
+             <el-select v-model="deptResult" multiple placeholder="请选择">
+               <el-option
+                       v-for="item in dataForm.deptResultDTOS"
+                       :key="item.deptId"
+                       :label="item.deptName"
+                       :value="item.deptId">
+               </el-option>
+             </el-select>
+           </el-form-item>
           <el-form-item label="回复居民意见:" prop="handleAdvice">
             <el-input v-model="postDataForm.handleAdvice" type="textarea" placeholder="请您选择居民诉求的处理情况及答复意见，向居民公开展示"></el-input>
           </el-form-item>
@@ -90,6 +107,30 @@
 
       </div>
     </el-form>
+    <el-dialog width="90%" title="评论" :visible.sync="innerVisible" append-to-body>
+      <el-table :data="commentsDTOs" border style="width: 100%;">
+        <el-table-column prop="user.userName" label="发言人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="commentTime" label="发言时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="content" label="发言内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="replyComment.userName" label="被回复人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="replyComment.content" label="被回复内容" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.shieldFlag === '0'" type="button" size="small" @click="deleteComment(scope.row.commentId)">屏蔽</el-button>
+            <el-button v-if="scope.row.shieldFlag === '1'" type="text" size="small">已屏蔽</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+              :current-page="pageIndex"
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="limitVal"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="pageSizeChangeHandleNew"
+              @current-change="pageCurrentChangeHandleNew">
+      </el-pagination>
+    </el-dialog>
   </div>
 </template>
 
@@ -103,6 +144,7 @@ export default {
   data () {
     return {
       map: '',
+      innerVisible: false,
       dataForm: {
         id: '',
         nickName: '',
@@ -120,6 +162,7 @@ export default {
         issueLatitude: '',
         issueLongitude: ''
       },
+      deptResult: [],
       postDataForm: {
         id: '',
         handleAdvice: '',
@@ -229,8 +272,52 @@ export default {
         }
       }).catch(() => {})
     },
+    deleteComment (val) {
+      this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).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.getCommentList()
+          }
+        })
+      }).catch(() => {})
+    },
+    pageSizeChangeHandleNew (val) {
+      this.pageIndex = 1
+      this.limitVal = val
+      this.getCommentList()
+    },
+    pageCurrentChangeHandleNew (val) {
+      this.pageIndex = val
+      this.getCommentList()
+    },
+    getCommentList () {
+      this.$http.get('/events/item/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
+      }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.commentsDTOs = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.commentsDTOs = res.data.list
+        this.total = res.data.total
+      }).catch(() => {})
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
+      for (let i = 0; i < this.deptResult.length; i++) {
+        for (let j = 0; j < this.dataForm.deptResultDTOS.length; j++) {
+          if (this.deptResult[i] === this.dataForm.deptResultDTOS[j].deptId) {
+            this.postDataForm.deptResultDTOS.push(this.dataForm.deptResultDTOS[j])
+            break
+          }
+        }
+      }
       this.postDataForm.id = this.dataForm.id
       if (this.postDataForm.handleCategory === '') {
         return this.$message.error('请选择处理选项')
diff --git a/src/views/modules/events/item-deal-list.vue b/src/views/modules/events/item-deal-list.vue
index 6b8572c7..229d98b7 100644
--- a/src/views/modules/events/item-deal-list.vue
+++ b/src/views/modules/events/item-deal-list.vue
@@ -69,25 +69,25 @@
                 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 label="序号"
                          type="index"
                          show-overflow-tooltip
+                         align="center"
                          width="50"></el-table-column>
         <el-table-column prop="itemContent"
                          label="项目内容"
                          header-align="center"
+                         width="330"
                          align="center"></el-table-column>
         <el-table-column prop="createdTime"
                          label="转成项目时间"
                          header-align="center"
+                         width="160"
                          align="center"></el-table-column>
         <el-table-column prop="nickName"
                          label="提交人"
                          header-align="center"
+                         width="120"
                          align="center"></el-table-column>
         <el-table-column prop="participantsNum"
                          label="参与人数"
@@ -143,6 +143,7 @@ import mixinViewModule from '@/mixins/view-module'
 import Detail from './item-deal-detail'
 export default {
   mixins: [mixinViewModule],
+  name: 'ItemDealList',
   data () {
     return {
       mixinViewModuleOptions: {
diff --git a/src/views/modules/events/item-deal.vue b/src/views/modules/events/item-deal.vue
index f16d0065..d8efcbe5 100755
--- a/src/views/modules/events/item-deal.vue
+++ b/src/views/modules/events/item-deal.vue
@@ -1,5 +1,5 @@
 <template>
-    <keep-alive>
+    <keep-alive include="ItemDealList">
         <component :is="selectComponent"></component>
     </keep-alive>
 </template>
diff --git a/src/views/modules/events/item-end-list.vue b/src/views/modules/events/item-end-list.vue
new file mode 100644
index 00000000..57bc987b
--- /dev/null
+++ b/src/views/modules/events/item-end-list.vue
@@ -0,0 +1,236 @@
+<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 label="街道">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="itemContent"
+                         label="项目内容"
+                         header-align="center"
+                         width="257"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="转成项目时间"
+                         header-align="center"
+                         width="160"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         width="120"
+                         align="center"></el-table-column>
+        <el-table-column prop="participantsNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         label="浏览数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="evaluationScore"
+                         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:item:look')" type="text" size="small" @click="detailAction1(scope.row.id)">{{ $t('look') }}</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>
+      <detail v-if="detailVisible"
+              ref="detailRef"
+              @refreshDataList="getDataList"></detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import Detail from './item-detail'
+export default {
+  mixins: [mixinViewModule],
+  name: 'ItemEndList',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        id: '',
+        itemState: '10',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
+      },
+      detailVisible: false,
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      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: {
+    Detail
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    detailAction1 (id) {
+      this.$parent.selectComponent = 'ItemCloseDetailView'
+      this.$router.push({ path: '/events-item-end', query: { id: id } })
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/item-end.vue b/src/views/modules/events/item-end.vue
old mode 100755
new mode 100644
index 2fd6e2fe..833d88f3
--- a/src/views/modules/events/item-end.vue
+++ b/src/views/modules/events/item-end.vue
@@ -1,234 +1,25 @@
 <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 label="街道">
-          <el-select v-model="dataForm.streetId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     placeholder="请选择"
-                     clearable
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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>
-      <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="itemContent"
-                         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 prop="participantsNum"
-                         label="参与人数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="approveNum"
-                         label="支持"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="opposeNum"
-                         label="反对"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="commentNum"
-                         label="评论数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="browseNum"
-                         label="浏览数"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="evaluationScore"
-                         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:item:look')" type="text" size="small" @click="detailAction1(scope.row.id)">{{ $t('look') }}</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>
-      <detail v-if="detailVisible"
-              ref="detailRef"
-              @refreshDataList="getDataList"></detail>
-    </div>
-  </el-card>
+    <keep-alive include="ItemEndList">
+        <component :is="selectComponent"></component>
+    </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import Detail from './item-detail'
+import ItemEndList from './item-end-list'
+import ItemCloseDetailView from './item-close-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/page',
-        getDataListIsPage: true
-      },
-      dataForm: {
-        id: '',
-        itemState: '10',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: ''
-      },
-      detailVisible: false,
-      streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      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()
-          }
-        }
-      }
+      selectComponent: ItemEndList
     }
   },
   components: {
-    Detail
-  },
-  created: function () {
-    this.getStreetList()
-  },
-  methods: {
-    detailAction1 (id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.detailRef.dataForm.id = id
-        this.$refs.detailRef.init()
-      })
-    },
-    getStreetList () {
-      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.streetOptions = res.data
-      }).catch(() => { })
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => { })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => { })
-    }
+    ItemEndList,
+    ItemCloseDetailView
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>