Merge branch 'hotfix/yujt_opt_events'

src/views/modules/analysis/issue/issue-classified-statistic.vue

@@ -48,7 +48,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="beforeGetDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -56,7 +56,9 @@
         <el-table-column prop="categoryName" label="分类名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="categoryNum" label="议题项目总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="issueNum" label="议题数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentIssueNum" v-if="firstVisible" label="一级类目议题数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="itemNum" label="项目数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentItemNum" v-if="firstVisible" 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="querySecondList(scope.row.categoryName)" v-if="scope.row.categoryLevel==1">查看二级目录</el-button>
@@ -91,6 +93,7 @@ export default {
         getDataListIsPage: true
       },
       secondVisible: false,
+      firstVisible: true,
       dataForm: {
         id: '',
         streetId: '',
@@ -127,7 +130,7 @@ export default {
         label: '二级类目'
       }, {
         value: '3',
-        label: '三季类目'
+        label: '三级类目'
       }],
       sortOptions: [{
         value: 'desc',
@@ -169,6 +172,10 @@ export default {
     }
   },
   methods: {
+    beforeGetDataList(){
+      this.firstVisible = this.dataForm.categoryLevel === '1';
+      this.getDataList()
+    },
     getOptions () {
       this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
         if (res.code !== 0) {