From 482ca2d2d4e574743a0d543f07f4887770183dbe Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Mon, 17 Feb 2020 18:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E8=AE=AE=E9=A2=98=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/issue/latest-issue-list.vue      | 159 ++++++++++++++++++
 .../modules/analysis/issue/latest-issue.vue   | 149 ++--------------
 2 files changed, 173 insertions(+), 135 deletions(-)
 create mode 100644 src/views/modules/analysis/issue/latest-issue-list.vue

diff --git a/src/views/modules/analysis/issue/latest-issue-list.vue b/src/views/modules/analysis/issue/latest-issue-list.vue
new file mode 100644
index 00000000..0f5348b0
--- /dev/null
+++ b/src/views/modules/analysis/issue/latest-issue-list.vue
@@ -0,0 +1,159 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__topic}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="议题摘要" prop="topicContent">
+          <el-input v-model="dataForm.issueContent" placeholder="请输入关键字模糊搜索" clearable ></el-input>
+        </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" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" 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="createdTime" 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="expressAttitudeNum" 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 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-view'
+export default {
+  mixins: [mixinViewModule],
+  name: 'latestIssueList',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/analysis/issue/pageLatestIssue',
+        getDataListIsPage: true
+      },
+      closeVisible: false,
+      dataForm: {
+        id: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        startTime: '',
+        endTime: '',
+        topicContent: ''
+      },
+      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()
+          }
+        }
+      },
+      ids: [],
+      options: []
+    }
+  },
+  components: {
+    Detail
+  },
+  created: function () {
+    this.getOptions()
+  },
+  watch: {
+    'ids': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = this.ids[2]
+      }
+    }
+  },
+  methods: {
+    getOptions () {
+      this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      }).catch(() => {})
+    },
+    detailAction (id) {
+      this.$parent.selectComponent = 'IssueDetailView'
+      this.$router.push({ path: '/analysis-issue-latest-issue', query: { id: id } })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/analysis/issue/latest-issue.vue b/src/views/modules/analysis/issue/latest-issue.vue
index d5e57fc4..bd3b68bf 100644
--- a/src/views/modules/analysis/issue/latest-issue.vue
+++ b/src/views/modules/analysis/issue/latest-issue.vue
@@ -1,151 +1,30 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__topic}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="所属机构">
-          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="议题摘要" prop="topicContent">
-          <el-input v-model="dataForm.issueContent" placeholder="请输入关键字模糊搜索" clearable ></el-input>
-        </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" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" 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="createdTime" 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="expressAttitudeNum" label="表达态度总数" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150" v-if="false">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="look(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>
-    </div>
-  </el-card>
+    <keep-alive include="latestIssueList">
+        <component :is="selectComponent"></component>
+    </keep-alive>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
+import LatestIssueList from './latest-issue-list'
+import IssueDetailView from './issue-detail-view'
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/analysis/issue/pageLatestIssue',
-        getDataListIsPage: true
-      },
-      closeVisible: false,
-      dataForm: {
-        id: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        startTime: '',
-        endTime: '',
-        topicContent: ''
-      },
-      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()
-          }
-        }
-      },
-      ids: [],
-      options: []
+      selectComponent: LatestIssueList
     }
   },
   components: {
-  },
-  created: function () {
-    this.getOptions()
-  },
-  watch: {
-    'ids': function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
+    LatestIssueList,
+    IssueDetailView
   },
   methods: {
-    getOptions () {
-      this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.options = res.data.options
-      }).catch(() => {})
-    },
-    look (id) {
-      // this.$parent.selectComponent = 'TopicDetail'
-      // this.$router.push({ path: '/group-topic', query: { id: id } })
+    init () {
+      this.selectComponent = LatestIssueList
     }
   }
 }
 </script>
+
+<style lang="scss" scoped>
+
+</style>