From f8d3f925b9b4c8ec81b924f882dd69631fa9ce08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Tue, 26 Sep 2023 10:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A512345=E6=94=BF=E5=8A=A1?=
 =?UTF-8?q?=E7=83=AD=E7=BA=BF=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/overview/index.vue        |   1 +
 .../components/EventList/index.vue            | 164 ++++++++++++++++++
 .../satisfactionEval/dissatisfied/index.vue   |   2 +-
 .../dissatisfiedPersonnel/index.vue           |   1 -
 .../dataBoard/satisfactionEval/index.vue      |   6 +-
 .../modules/EventSituation/index.vue          |  35 ++--
 .../modules/PersonnelPortrait/index.vue       |   2 +-
 src/views/dataBoardMain/main-navbar.vue       |   2 +-
 8 files changed, 194 insertions(+), 19 deletions(-)
 create mode 100644 src/views/dataBoard/satisfactionEval/components/EventList/index.vue

diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue
index 65727ce40..2dee2ee0c 100644
--- a/src/views/dataBoard/overview/index.vue
+++ b/src/views/dataBoard/overview/index.vue
@@ -325,6 +325,7 @@ export default {
     },
 
     clickAgencyItem(item) {
+      cnsole.log(item)
       this.toBread({
         orgId: item.id,
         orgLevel: item.level,
diff --git a/src/views/dataBoard/satisfactionEval/components/EventList/index.vue b/src/views/dataBoard/satisfactionEval/components/EventList/index.vue
new file mode 100644
index 000000000..f414082eb
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/components/EventList/index.vue
@@ -0,0 +1,164 @@
+<template>
+  <div>
+
+    <el-dialog
+        class="dissatisfied-detail"
+        title=""
+        :visible.sync="dialogVisible"
+        width="1200px"
+        :modal="false"
+        :before-close="handleClose"
+    >
+      <div class="main-title">
+        <Title :text="month+'份12345政务热线事件列表'"/>
+      </div>
+      <div class="content">
+        <div class="table">
+          <el-table :data="list">
+            <el-table-column
+                label="序号"
+                type="index"
+                width="80"/>
+
+            <el-table-column
+                prop="monthTime"
+                label="月度"/>
+
+            <el-table-column
+                prop="agencyName"
+                label="所属社区">
+            </el-table-column>
+
+            <el-table-column
+                prop="categoryName"
+                label="事项类型"/>
+
+            <el-table-column
+                prop="eventContent"
+                width="200"
+                show-overflow-tooltip
+                label="事项描述"/>
+            <el-table-column
+                prop="receiveTime"
+                width="200"
+                label="接收时间"/>
+
+            <el-table-column
+                prop="statusName"
+                label="状态"/>
+
+            <el-table-column label="详情" width="90" align="center">
+              <template slot-scope="data">
+                <el-button type="text" @click="handleView(data.row)">查看</el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </div>
+
+        <Pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNo"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
+      </div>
+    </el-dialog>
+
+    <EventDetails :showDialog="showDialog" :id="this.rowId" @close="close"/>
+
+  </div>
+</template>
+
+<script>
+import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb'
+import Pagination from '@/views/dataBoard/satisfactionEval/components/Pagination'
+import Title from "@/views/dataBoard/satisfactionEval/components/Title"
+import EventDetails from "@/views/dataBoard/cpts/event-details.vue"
+
+
+export default {
+  name: "EventList",
+  components: {Breadcrumb, Pagination, Title, EventDetails},
+  data() {
+    return {
+      queryParams: {
+        pageNo: 1,
+        pageSize: 4,
+      },
+      total: 0,
+      list: [],
+      month: '',
+      dialogVisible: false,
+      showDialog: false,
+      rowId: ''
+    }
+  },
+  activated() {
+
+  },
+  methods: {
+
+    handleClose(done) {
+      this.dialogVisible = false
+    },
+    open(searchParams) {
+      this.dialogVisible = true
+      this.month = this.$moment(searchParams.monthTime).format('YYYY年M月')
+      this.queryParams = {
+        ...this.queryParams,
+        ...searchParams
+      }
+      this.getList()
+    },
+    getList() {
+      this.$http.get('/governance/satisfactionOverview/event12345List?' + this.$paramsFormat(this.queryParams)).then(({data: {data}}) => {
+        this.list = data.list
+        this.total = data.total
+      })
+    },
+    handleView({id}) {
+      this.showDialog = true
+      this.rowId = id
+    },
+    close() {
+      this.showDialog = false
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/assets/scss/dataBoard/table.scss";
+
+.dissatisfied-detail {
+  /deep/ .el-dialog {
+    background: url("@/assets/images/manyidu/dialog_bg.png") no-repeat left top;
+    background-size: 100%;
+    width: 1200px;
+    height: 550px;
+    color: #fff;
+
+    .el-dialog__header {
+      border-bottom: none !important;
+    }
+
+    .el-dialog__headerbtn {
+      top: 30px;
+      right: 30px;
+
+      .el-dialog__close {
+        color: #fff;
+      }
+    }
+  }
+
+  .content {
+  }
+
+  .main-title {
+    margin-bottom: 20px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
index 3ecbdd4ce..079208b21 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
@@ -97,7 +97,7 @@
             label="事项描述"/>
 
         <el-table-column
-            prop="createTime"
+            prop="createdTime"
             width="197"
             label="提交时间"/>
 
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
index 41b196f83..f43144910 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
@@ -19,7 +19,6 @@
         <el-table-column
             prop="restName"
             label="姓名">
-          <template slot-scope="data"></template>
         </el-table-column>
 
         <el-table-column
diff --git a/src/views/dataBoard/satisfactionEval/index.vue b/src/views/dataBoard/satisfactionEval/index.vue
index bc818f4a9..8b39b68f4 100644
--- a/src/views/dataBoard/satisfactionEval/index.vue
+++ b/src/views/dataBoard/satisfactionEval/index.vue
@@ -34,11 +34,7 @@
         </div>
 
         <div class="bg2">
-          <Title text="潜在不满意人数">
-            <div class="more" @click="goToPage('/dataBoard/satisfactionEval/potentialPeople')">
-            查看详细 <i class="el-icon-arrow-right"></i>
-            </div>
-          </Title>
+          <Title text="潜在不满意人数"/>
           <PotentialPeople/>
         </div>
       </el-col>
diff --git a/src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue b/src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue
index 060c19ec1..11ec1f653 100644
--- a/src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue
@@ -2,43 +2,49 @@
   <div>
     <div class="title">12345政务热线事件办理情况</div>
 
-    <div class="current">
+    <div @click="showList(curMonth.monthTime)" class="current">
       <div class="cur-month">
         <span>{{ $moment(curMonth.monthTime).format('M') }}</span> 月
       </div>
       <div class="cur-month-list">
         <div class="cur-month-item">
           <div class="txt">事件总数</div>
-          <div class="num blue">{{curMonth.sumNum}}</div>
+          <div class="num blue">{{ curMonth.sumNum }}</div>
         </div>
         <div class="cur-month-item">
           <div class="txt">处理中</div>
-          <div class="num orange">{{curMonth.processNum}}</div>
+          <div class="num orange">{{ curMonth.processNum }}</div>
         </div>
         <div class="cur-month-item">
           <div class="txt">已办结</div>
-          <div class="num green">{{curMonth.closedNum}}</div>
+          <div class="num green">{{ curMonth.closedNum }}</div>
         </div>
       </div>
     </div>
 
     <div class="his-month">
-      <div class="his-month-item" v-for="(item,index) in eventList" :key="index">
+      <div class="his-month-item" v-for="(item,index) in eventList" @click="showList(item.monthTime)" :key="index">
         <div class="month">{{ $moment(item.monthTime).format('M') }}月</div>
-        <div class="num">{{ item.sumNum?item.sumNum:'--' }}</div>
-        <div class="event">{{ item.type?item.type+'事件数':'--' }}</div>
+        <div class="num">{{ item.sumNum ? item.sumNum : '--' }}</div>
+        <div class="event">{{ item.type ? item.type + '事件数' : '--' }}</div>
       </div>
     </div>
+    <EventList ref="eventList" :monthTime="monthTime"/>
   </div>
 </template>
 
 <script>
+import EventList from '@/views/dataBoard/satisfactionEval/components/EventList'
 export default {
   name: "EventSituation",
+  components: {
+    EventList
+  },
   data() {
     return {
       eventList: [],
-      curMonth: ''
+      curMonth: '',
+      monthTime: ""
     }
   },
   watch: {
@@ -54,14 +60,22 @@ export default {
     }
   },
   methods: {
+    showList(monthTime) {
+      let params = {
+        level: this.$store.state.chooseArea.chooseName.level,
+        orgId: this.$store.state.chooseArea.chooseName.orgId,
+        monthTime
+      }
+      this.$refs.eventList.open(params)
+    },
     getData() {
       let params = {
         level: this.$store.state.chooseArea.chooseName.level,
         orgId: this.$store.state.chooseArea.chooseName.orgId
       }
-      this.$http.get('/governance/satisfactionOverview/do12345MonthGroup?'+this.$paramsFormat(params)).then(({data: {data}}) => {
+      this.$http.get('/governance/satisfactionOverview/do12345MonthGroup?' + this.$paramsFormat(params)).then(({data: {data}}) => {
         this.curMonth = data.filter(item => item.monthTime === this.$moment().format('YYYY-MM'))[0]
-        this.eventList = data.filter(item => item.monthTime !== this.$moment().format('YYYY-MM'))
+        this.eventList = data.filter(item => item.monthTime !== this.$moment().format('YYYY-MM')).reverse()
       })
     }
   }
@@ -113,6 +127,7 @@ export default {
 
   .cur-month-item {
     margin-left: 71px;
+
     .txt {
       font-size: 16px;
       font-weight: 400;
diff --git a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
index 07f184d0e..df1d6f384 100644
--- a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
@@ -54,7 +54,7 @@ export default {
     return {
       resultType: 'provinceAndSelf',
       resultTypeList: [{
-        label: ' 按省调查/社区自查结果',
+        label: '按省调查/社区自查结果',
         value: 'provinceAndSelf'
 
       }, {
diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue
index f84acf763..143a0d9c1 100644
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@@ -35,7 +35,7 @@
       <div class="nav-item" :class="{ 'z-on': $route.path.indexOf('/dataBoard/renfang') != -1 }" @click="toPage('/dataBoard/renfang/index')">
         <span>人房数据</span>
       </div>
-      <div class="nav-item" :class="{ 'z-on': $route.path == '/dataBoard/satisfactionEval/index' }" @click="toPage('/dataBoard/satisfactionEval/index')">
+      <div class="nav-item" :class="{ 'z-on': $route.path.includes('/satisfactionEval') }" @click="toPage('/dataBoard/satisfactionEval/index')">
         <span>满意度评价</span>
       </div>
     </div>