From 4fd4cfa49c868dd44db5d1f1f2e2b1b42a3cf208 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Tue, 11 Feb 2020 17:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E8=B0=83=E5=BA=A6-=E5=B7=B2?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/issue/hottest-issue.vue  |   5 +-
 .../issue/issue-classified-statistic.vue      |   5 +-
 .../modules/analysis/issue/latest-issue.vue   |   5 +-
 .../modules/analysis/item/difficult-Item.vue  |  21 +-
 .../modules/analysis/item/hottest-item.vue    |   5 +-
 .../analysis/item/report-solved-item.vue      | 215 ++++++++++++++++++
 .../analysis/item/report-unsolved-item.vue    | 172 ++++++++++++++
 .../modules/analysis/item/unsolved-item.vue   |   5 +-
 .../modules/analysis/topic/hottest-topic.vue  |   5 +-
 .../modules/analysis/topic/latest-topic.vue   |   5 +-
 10 files changed, 403 insertions(+), 40 deletions(-)
 create mode 100644 src/views/modules/analysis/item/report-solved-item.vue
 create mode 100644 src/views/modules/analysis/item/report-unsolved-item.vue

diff --git a/src/views/modules/analysis/issue/hottest-issue.vue b/src/views/modules/analysis/issue/hottest-issue.vue
index df5e5096..c8910cfa 100644
--- a/src/views/modules/analysis/issue/hottest-issue.vue
+++ b/src/views/modules/analysis/issue/hottest-issue.vue
@@ -3,7 +3,7 @@
     <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 v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="议题摘要" prop="topicContent">
@@ -33,9 +33,6 @@
         <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>
diff --git a/src/views/modules/analysis/issue/issue-classified-statistic.vue b/src/views/modules/analysis/issue/issue-classified-statistic.vue
index c178f481..830bf8ee 100644
--- a/src/views/modules/analysis/issue/issue-classified-statistic.vue
+++ b/src/views/modules/analysis/issue/issue-classified-statistic.vue
@@ -3,7 +3,7 @@
     <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 v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="类目筛选">
@@ -50,9 +50,6 @@
         <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>
diff --git a/src/views/modules/analysis/issue/latest-issue.vue b/src/views/modules/analysis/issue/latest-issue.vue
index 23164d9f..f4c64e0a 100644
--- a/src/views/modules/analysis/issue/latest-issue.vue
+++ b/src/views/modules/analysis/issue/latest-issue.vue
@@ -3,7 +3,7 @@
     <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 v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="议题摘要" prop="topicContent">
@@ -33,9 +33,6 @@
         <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>
diff --git a/src/views/modules/analysis/item/difficult-Item.vue b/src/views/modules/analysis/item/difficult-Item.vue
index 487dce97..cce8cfb0 100644
--- a/src/views/modules/analysis/item/difficult-Item.vue
+++ b/src/views/modules/analysis/item/difficult-Item.vue
@@ -3,7 +3,7 @@
     <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 v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
        <el-form-item label="排序规则">
@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="转项目时间"
-                      prop="startTime">
+                      prop="changeItemStartTime">
           <el-date-picker v-model="dataForm.changeItemStartTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -28,7 +28,7 @@
         </el-form-item>
         <el-form-item label="至"
                       label-width="25px"
-                      prop="endTime">
+                      prop="changeItemEndTime">
           <el-date-picker v-model="dataForm.changeItemEndTime"
                           type="date"
                           :picker-options="pickerBeginDateAfter"
@@ -48,7 +48,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="处理完毕时间"
-                      prop="startTime">
+                      prop="processedStartTime">
           <el-date-picker v-model="dataForm.processedStartTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore1"
@@ -59,7 +59,7 @@
         </el-form-item>
         <el-form-item label="至"
                       label-width="25px"
-                      prop="endTime">
+                      prop="processedEndTime">
           <el-date-picker v-model="dataForm.processedEndTime"
                           type="date"
                           :picker-options="pickerBeginDateAfter1"
@@ -91,20 +91,17 @@
         <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"></el-table-column>
         <el-table-column prop="createdTime" label="转项目时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="operatNum" label="处理次数" header-align="center" align="center" Y ></el-table-column>
+        <el-table-column prop="operatNum" label="处理次数" header-align="center" align="center" sortable ></el-table-column>
         <el-table-column prop="reportFlag" label="是否流转网格化平台" header-align="center" align="center" :formatter="showReportFlagFormatter"></el-table-column>
-        <el-table-column prop="deptNum" label="涉及部门数量" header-align="center" align="center" ></el-table-column>
+        <el-table-column prop="deptNum" label="涉及部门数量" header-align="center" align="center" sortable></el-table-column>
         <el-table-column prop="itemState" label="项目状态" header-align="center" align="center" :formatter="showItemStateNameFormatter"></el-table-column>
         <el-table-column prop="processedTime" label="处理完毕时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="takeTime" label="处理时长(h)" header-align="center" align="center" ></el-table-column>
+        <el-table-column prop="takeTime" label="处理时长(h)" header-align="center" align="center" sortable></el-table-column>
         <el-table-column prop="allDeptNames" label="项目来源网格" header-align="center" align="center"></el-table-column>
         <el-table-column prop="evaluationScore" label="居民满意度评价" header-align="center" align="center" :formatter="showEvaluationScoreNameFormatter"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150" v-if="false">
@@ -183,7 +180,7 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
-        orderType: '0',
+        orderType: '',
         changeItemStartTime: '',
         changeItemEndTime: '',
         itemState: '',
diff --git a/src/views/modules/analysis/item/hottest-item.vue b/src/views/modules/analysis/item/hottest-item.vue
index d653b79a..4cc689eb 100644
--- a/src/views/modules/analysis/item/hottest-item.vue
+++ b/src/views/modules/analysis/item/hottest-item.vue
@@ -3,7 +3,7 @@
     <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 v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="项目摘要" prop="topicContent">
@@ -33,9 +33,6 @@
         <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>
diff --git a/src/views/modules/analysis/item/report-solved-item.vue b/src/views/modules/analysis/item/report-solved-item.vue
new file mode 100644
index 00000000..a6fb4ba6
--- /dev/null
+++ b/src/views/modules/analysis/item/report-solved-item.vue
@@ -0,0 +1,215 @@
+<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="streetIds" :options="streetOptions" :props="{ checkStrictly: true }" clearable filterable></el-cascader>
+        </el-form-item>
+        <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.searchContent" placeholder="" clearable ></el-input>
+        </el-form-item>
+        <div class="block">
+        <el-form-item label="上报网格化平台时间"
+                      prop="reportStartTime">
+          <el-date-picker v-model="dataForm.reportStartTime"
+                          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="reportEndTime">
+          <el-date-picker v-model="dataForm.reportEndTime"
+                          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>
+        </div>
+      </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"></el-table-column>
+        <el-table-column prop="createdTime" label="转项目时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="grid" label="网格名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reportDept" label="上报部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reportTime" label="吹哨时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lastHandlerTime" label="最新进展处理部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lasthandlerDept" label="最新进展处理时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="itemState" label="项目状态" header-align="center" align="center" :formatter="showItemStateNameFormatter"></el-table-column>
+        <el-table-column prop="evaluationScore" label="居民评价" header-align="center" align="center" :formatter="showEvaluationScoreNameFormatter"></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/pageReportSolvedItem',
+        getDataListIsPage: true
+      },
+      // 项目状态 0-处理中，5-已关闭，10-已结案
+      itemStateOptions: [{
+        value: '0',
+        label: '处理中'
+      },
+      {
+        value: '5',
+        label: '已关闭'
+      }, {
+        value: '10',
+        label: '已结案'
+      }],
+      evaluationScoreOptions: [{
+        value: '0',
+        label: '不满意'
+      },
+      {
+        value: '1',
+        label: '基本满意'
+      }, {
+        value: '2',
+        label: '非常满意'
+      }],
+      closeVisible: false,
+      dataForm: {
+        id: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        reportDept: '',
+        reportStartTime: '',
+        reportEndTime: '',
+        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: [],
+      streetIds: [],
+      streetOptions: []
+    }
+  },
+  components: {
+  },
+  created: function () {
+    this.getOptions()
+    this.getStreetOptions()
+  },
+  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]
+      }
+    },
+    'streetIds': function (val) {
+      if (val.length === 0) {
+        this.dataForm.reportDept = ''
+      } else if (val.length === 1) {
+        this.dataForm.reportDept = this.streetOptions[0].value
+      }
+    }
+  },
+  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(() => {})
+    },
+    getStreetOptions () {
+      this.$http.get(`/sys/user/deptOptions/getStreetByLoginUser`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data.options
+      }).catch(() => {})
+    },
+    showItemStateNameFormatter: function (row, column) {
+      if (row.itemState) {
+        let dict = this.itemStateOptions.filter(item => item.value === row.itemState)[0]
+        if (dict) {
+          return dict.label
+        }
+      }
+      return ''
+    },
+    showEvaluationScoreNameFormatter: function (row, column) {
+      if (row.evaluationScore) {
+        let dict = this.evaluationScoreOptions.filter(item => item.value === row.evaluationScore)[0]
+        if (dict) {
+          return dict.label
+        }
+      }
+      return ''
+    },
+    look (id) {
+      // this.$parent.selectComponent = 'TopicDetail'
+      // this.$router.push({ path: '/group-topic', query: { id: id } })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/analysis/item/report-unsolved-item.vue b/src/views/modules/analysis/item/report-unsolved-item.vue
new file mode 100644
index 00000000..dd493ef7
--- /dev/null
+++ b/src/views/modules/analysis/item/report-unsolved-item.vue
@@ -0,0 +1,172 @@
+<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="streetIds" :options="streetOptions" :props="{ checkStrictly: true }" clearable filterable></el-cascader>
+        </el-form-item>
+        <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.searchContent" placeholder="" clearable ></el-input>
+        </el-form-item>
+        <div class="block">
+        <el-form-item label="上报网格化平台时间"
+                      prop="reportStartTime">
+          <el-date-picker v-model="dataForm.reportStartTime"
+                          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="reportEndTime">
+          <el-date-picker v-model="dataForm.reportEndTime"
+                          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>
+        </div>
+      </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"></el-table-column>
+        <el-table-column prop="createdTime" label="转项目时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="grid" label="网格名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reportDept" label="上报部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reportTime" label="吹哨时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lastHandlerTime" label="最新进展处理部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lasthandlerDept" 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>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/analysis/item/pageReportUnsolvedItem',
+        getDataListIsPage: true
+      },
+      closeVisible: false,
+      dataForm: {
+        id: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        reportDept: '',
+        reportStartTime: '',
+        reportEndTime: '',
+        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: [],
+      streetIds: [],
+      streetOptions: []
+    }
+  },
+  components: {
+  },
+  created: function () {
+    this.getOptions()
+    this.getStreetOptions()
+  },
+  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]
+      }
+    },
+    'streetIds': function (val) {
+      if (val.length === 0) {
+        this.dataForm.reportDept = ''
+      } else if (val.length === 1) {
+        this.dataForm.reportDept = this.streetOptions[0].value
+      }
+    }
+  },
+  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(() => {})
+    },
+    getStreetOptions () {
+      this.$http.get(`/sys/user/deptOptions/getStreetByLoginUser`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = 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/item/unsolved-item.vue b/src/views/modules/analysis/item/unsolved-item.vue
index cac46cfa..b3aa9f90 100644
--- a/src/views/modules/analysis/item/unsolved-item.vue
+++ b/src/views/modules/analysis/item/unsolved-item.vue
@@ -3,7 +3,7 @@
     <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 v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="项目摘要" prop="topicContent">
@@ -33,9 +33,6 @@
         <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>
diff --git a/src/views/modules/analysis/topic/hottest-topic.vue b/src/views/modules/analysis/topic/hottest-topic.vue
index cc9929f5..0ed355e1 100644
--- a/src/views/modules/analysis/topic/hottest-topic.vue
+++ b/src/views/modules/analysis/topic/hottest-topic.vue
@@ -3,7 +3,7 @@
     <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 v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="话题摘要" prop="topicContent">
@@ -33,9 +33,6 @@
         <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>
diff --git a/src/views/modules/analysis/topic/latest-topic.vue b/src/views/modules/analysis/topic/latest-topic.vue
index 52e0f350..36ecbfd9 100644
--- a/src/views/modules/analysis/topic/latest-topic.vue
+++ b/src/views/modules/analysis/topic/latest-topic.vue
@@ -3,7 +3,7 @@
     <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 v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="话题摘要" prop="topicContent">
@@ -33,9 +33,6 @@
         <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>