From e5b1a966b1385ab7c4d07a40a1880cb5e5317a8c Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Mon, 10 Feb 2020 20:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/issue/hottest-issue.vue  |   4 +-
 .../modules/analysis/issue/latest-issue.vue   |   4 +-
 .../modules/analysis/item/hottest-item.vue    |   2 +-
 .../modules/analysis/item/unsolved-item.vue   | 152 ++++++++++++++++++
 .../modules/analysis/topic/hottest-topic.vue  |   2 +-
 .../modules/analysis/topic/latest-topic.vue   |   2 +-
 6 files changed, 159 insertions(+), 7 deletions(-)
 create mode 100644 src/views/modules/analysis/item/unsolved-item.vue

diff --git a/src/views/modules/analysis/issue/hottest-issue.vue b/src/views/modules/analysis/issue/hottest-issue.vue
index 01c49701..df5e5096 100644
--- a/src/views/modules/analysis/issue/hottest-issue.vue
+++ b/src/views/modules/analysis/issue/hottest-issue.vue
@@ -42,13 +42,13 @@
         <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="releaseTime" 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">
+        <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>
diff --git a/src/views/modules/analysis/issue/latest-issue.vue b/src/views/modules/analysis/issue/latest-issue.vue
index 603fa322..23164d9f 100644
--- a/src/views/modules/analysis/issue/latest-issue.vue
+++ b/src/views/modules/analysis/issue/latest-issue.vue
@@ -42,13 +42,13 @@
         <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="releaseTime" 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">
+        <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>
diff --git a/src/views/modules/analysis/item/hottest-item.vue b/src/views/modules/analysis/item/hottest-item.vue
index 495468e6..d653b79a 100644
--- a/src/views/modules/analysis/item/hottest-item.vue
+++ b/src/views/modules/analysis/item/hottest-item.vue
@@ -48,7 +48,7 @@
         <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">
+        <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>
diff --git a/src/views/modules/analysis/item/unsolved-item.vue b/src/views/modules/analysis/item/unsolved-item.vue
new file mode 100644
index 00000000..cac46cfa
--- /dev/null
+++ b/src/views/modules/analysis/item/unsolved-item.vue
@@ -0,0 +1,152 @@
+<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>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="项目摘要" prop="topicContent">
+          <el-input v-model="dataForm.searchContent" 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-item>
+          <el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</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" align="center" sortable></el-table-column>
+        <el-table-column prop="releaseTime" label="转项目时间" header-align="center" align="center" sortable></el-table-column>
+        <el-table-column prop="allDeptNames" label="来源网格" header-align="center" align="center" sortable></el-table-column>
+        <el-table-column prop="nickName" label="发言人" header-align="center" align="center" sortable></el-table-column>
+        <el-table-column prop="solveNum" label="处理次数" header-align="center" align="center" sortable></el-table-column>
+        <el-table-column prop="latestHandleTime" label="最新进展处理时间" header-align="center" align="center" sortable></el-table-column>
+        <el-table-column prop="latestHandleDeptName" label="最新进展处理部门" header-align="center" align="center" sortable></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>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/analysis/item/pageUnsolvedItem',
+        getDataListIsPage: true
+      },
+      closeVisible: false,
+      dataForm: {
+        id: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        startTime: '',
+        endTime: '',
+        searchContent: ''
+      },
+      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: {
+  },
+  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(() => {})
+    },
+    look (id) {
+      // this.$parent.selectComponent = 'TopicDetail'
+      // this.$router.push({ path: '/group-topic', query: { id: id } })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/analysis/topic/hottest-topic.vue b/src/views/modules/analysis/topic/hottest-topic.vue
index 7c88f9dc..cc9929f5 100644
--- a/src/views/modules/analysis/topic/hottest-topic.vue
+++ b/src/views/modules/analysis/topic/hottest-topic.vue
@@ -47,7 +47,7 @@
         <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">
+        <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>
diff --git a/src/views/modules/analysis/topic/latest-topic.vue b/src/views/modules/analysis/topic/latest-topic.vue
index b8ad0514..52e0f350 100644
--- a/src/views/modules/analysis/topic/latest-topic.vue
+++ b/src/views/modules/analysis/topic/latest-topic.vue
@@ -47,7 +47,7 @@
         <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">
+        <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>