From 73c748516eadd2b1d4b872d6c0d731915411db79 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 10 Nov 2023 09:39:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/labelConfig/addForm.vue  | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index 4d7580514..c4e7beb0f 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -7,7 +7,7 @@
       class="div_form"
       :rules="rules"
     >
-    <!--  v-if="formType == 'info'&& addFormLabel" -->
+    <!--  v-if="!formState&& addFormLabel" -->
       <el-form-item
         label="标签名称"
         label-width="100px"
@@ -22,6 +22,7 @@
           @select="handleSelect"
         ></el-autocomplete>
       </el-form-item>
+      <span style="position: relative;top: 10px;">（您可以按关键词查找使用已有标签，也可以新建标签）</span>
       <!-- <el-form-item label="标签名称（新增）" label-width="100px" prop="tagName" v-else>
         <el-input
           v-model="formData.tagName"
@@ -31,14 +32,14 @@
         ></el-input>
       </el-form-item> -->
     </el-form>
-    <p style="margin-left: 15px"><b style="color: #f56c6c">*</b> 匹配数据</p>
+    <p style="margin-left: 15px"><b style="color: #f56c6c">*</b> 设置标签查询条件</p>
     <el-table border :data="tableData" style="width: 100%" height="200">
       <el-table-column label="选择数据源" align="center" width="120">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.dataSource"
             placeholder="请选择"
-            :disabled="formType == 'info'"
+            :disabled="!formState"
             @change="handleChangeSource(scope.row, scope.$index)"
             clearable
           >
@@ -58,7 +59,7 @@
           <el-select
             v-model="scope.row.itemGroupId"
             placeholder="请选择"
-            :disabled="formType == 'info'"
+            :disabled="!formState"
             clearable
             @change="handleChangeFieldsType(scope.row, scope.$index)"
           >
@@ -76,7 +77,7 @@
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.itemId"
-            :disabled="formType == 'info'"
+            :disabled="!formState"
             placeholder="请选择"
             @change="handleChangeFieldsName(scope.row, scope.$index)"
             @clear="handleClearItemId(scope.row, scope.$index)"
@@ -99,7 +100,7 @@
           <el-select
             v-model="scope.row.queryType"
             placeholder="请选择"
-            :disabled="formType == 'info'"
+            :disabled="!formState"
             clearable
           >
             <el-option
@@ -122,7 +123,7 @@
                 item.itemType == 'checkbox'
               "
               v-model="scope.row.colVal"
-              :disabled="formType == 'info'"
+              :disabled="!formState"
               placeholder="请选择"
               clearable
             >
@@ -139,7 +140,7 @@
                 item.itemType === 'input' || item.itemType === 'textarea'
               "
               v-model="scope.row.colVal"
-              :disabled="formType == 'info'"
+              :disabled="!formState"
               placeholder="请输入"
               clearable
             >
@@ -148,7 +149,7 @@
               v-else-if="item.itemType === 'inputNum'"
               class="item_width_2"
               v-model="scope.row.colVal"
-              :disabled="formType == 'info'"
+              :disabled="!formState"
               :min="0"
               size="mini"
               label="请输入"
@@ -159,7 +160,7 @@
               "
               v-model="scope.row.colVal"
               class="item_width_2"
-              :disabled="formType == 'info'"
+              :disabled="!formState"
               type="datetime"
               value-format="yyyy-MM-dd HH:mm:ss"
               value="yyyy-MM-dd HH:mm:ss"
@@ -170,7 +171,7 @@
               v-else
               class="item_width_2"
               size="mini"
-              :disabled="formType == 'info'"
+              :disabled="!formState"
               placeholder="请输入"
               v-model="personItem.colVal"
             >
@@ -186,7 +187,7 @@
           <el-select
             v-model="scope.row.nextLogicalRel"
             placeholder="请选择"
-            :disabled="formType == 'info'"
+            :disabled="!formState"
             clearable
           >
             <el-option
@@ -204,7 +205,7 @@
         label="操作"
         align="center"
         width="120"
-        v-if="formType != 'info'"
+        v-if="formState"
       >
         <template slot-scope="scope">
           <el-button
@@ -283,7 +284,7 @@ export default {
         { label: "并且", value: "and" },
         { label: "或者", value: "or" },
       ],
-      addFormLabel:true
+      formState:true
     };
   },
   created() {},
@@ -314,9 +315,7 @@ export default {
         ? searchList.filter(this.createStateFilter(val))
         : searchList;
       if (results.length == 0) {
-        this.tableData = []
-        this.handleClickAddRow();
-        this.addFormLabel = false
+        // this.handleClickAddRow();
         this.formType = "add";
       } else {
         this.formType = "info";
@@ -329,8 +328,6 @@ export default {
     handelChangeTagName(val){
       if(this.formData.tagName.length == 0 ){
         this.formType = 'info'
-        this.tableData = []
-        this.addFormLabel = true
       }
     },
     createStateFilter(val) {
@@ -340,6 +337,7 @@ export default {
     },
     async handleSelect(item) {
       console.log(item);
+      this.formState = item.editable
       await this.initForm(item.editable?'edit':'info', item);
     },
     async getLabelList() {
@@ -364,7 +362,6 @@ export default {
         let { data, code, msg } = await requestPost(url, params);
         if (code == 0) {
           this.$set(this.tableData[index], "itemGroupIdOpction", data);
-          console.log(this.tableData[index].itemGroupIdOpction);
         } else {
           this.$message.error(msg);
         }
@@ -455,7 +452,6 @@ export default {
     },
     // 字段名称修改
     async handleChangeFieldsName(row, index, type) {
-      console.log(row, "字段名称row");
       var arr = [];
       // 人的信息中colKey的字段是columnName要做一下判断
       if (row.dataSource == "house" || row.dataSource == "stat") {
@@ -504,7 +500,6 @@ export default {
         this.$set(this.tableData[index], "correspondingOpction", arr);
       }
 
-      console.log(this.tableData);
     },
     async getCompareList() {
       const url = "/sys/dict/data/dictlist";

From 5f0749ba535aeb78e3dacadccad1f8484096fe8f Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Fri, 10 Nov 2023 16:14:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?12345=E6=8A=A5=E5=91=8A=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/goverhotline/followDetail.vue     | 142 ++++++++++++++
 src/views/modules/goverhotline/formList.vue   | 143 ++++++++++++++
 src/views/modules/goverhotline/index.vue      | 185 ++++++++++++++----
 3 files changed, 435 insertions(+), 35 deletions(-)
 create mode 100644 src/views/modules/goverhotline/followDetail.vue
 create mode 100644 src/views/modules/goverhotline/formList.vue

diff --git a/src/views/modules/goverhotline/followDetail.vue b/src/views/modules/goverhotline/followDetail.vue
new file mode 100644
index 000000000..4b3b9f052
--- /dev/null
+++ b/src/views/modules/goverhotline/followDetail.vue
@@ -0,0 +1,142 @@
+
+<template>
+    <div class='g-main dialog-h-content'>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">街道：</span>
+                <div class="f-flex1">{{detailObj.streetName || '--'}}</div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">社区：</span>
+                <div class="f-flex1">{{detailObj.communityName || '--'}}</div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">姓名：</span>
+                <div class="f-flex1">{{detailObj.name || '--'}}</div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">回访电话：</span>
+                <div class="f-flex1">{{detailObj.mobile || '--'}}</div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">领域：</span>
+                <div class="f-flex1">{{detailObj.scopeName || '--'}}</div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">问题：</span>
+                <div class="f-flex1">{{detailObj.problemDesc || '--'}}</div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">是否完成：</span>
+                <div class="f-flex1">
+                   <el-radio v-model="formData.completeFlag" :label="0" :disabled="disabled" >正在推进</el-radio>
+                   <el-radio v-model="formData.completeFlag" :label="1" :disabled="disabled" >已完成</el-radio>
+                   <el-radio v-model="formData.completeFlag" :label="2" :disabled="disabled" >已完成并取消风险标记</el-radio>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">组织类型：</span>
+                <div class="f-flex1">
+                   <el-radio v-model="formData.orgCategoryCode" label="province" :disabled="disabled">省</el-radio>
+                   <el-radio v-model="formData.orgCategoryCode" label="city" :disabled="disabled">市</el-radio>
+                   <el-radio v-model="formData.orgCategoryCode" label="district" :disabled="disabled">区</el-radio>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">完成时限：</span>
+                <div class="f-flex1">
+                    <el-date-picker v-model="formData.completeTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
+                            style="width: 202px" clearable :disabled="disabled">
+                        </el-date-picker>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">备注：</span>
+                <div class="f-flex1" >
+                    <el-input
+                      type="textarea"
+                      :rows="3"
+                      style="width: 300px;"
+                      placeholder="请输入内容"
+                      v-model="formData.remark"
+                      :disabled="disabled"
+                      >
+                    </el-input> 
+                </div>
+            </el-col>
+        </el-row>
+        <div class="div_btn f-flex" style="justify-content: end;">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button
+                size="small"
+                type="primary"
+                @click="handleComfirm"
+                >提 交</el-button
+            >
+    </div>
+    </div>
+</template>
+   
+<script>
+export default {
+    data() {
+        return {
+            evaCulturalFacility: 'bad',
+            formData:{
+                completeTime:'',
+                remark:'',
+                orgCategoryCode:'',
+                completeFlag:""
+            },
+            disabled:false
+        };
+    },
+    props: {
+        detailObj: {
+            type: Object,
+            default: () => {}
+        },
+        formType:{
+            type:String,
+            default:''
+        }
+    },
+    created() { 
+        this.formData = {...this.detailObj}
+        this.disabled = this.formType == 'detail' ? true : false
+    },
+    methods: {
+        handleCancle(){
+            this.$emit('handleCancle')
+        },
+        handleComfirm(){
+            this.$emit('handleComfirm',this.formData)
+        }
+    },
+    components: {},
+    computed: {},
+    watch: {},
+}
+</script>
+   
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/management/form-main.scss";
+h3 {
+    text-align: center;
+}
+
+.label {
+    width: 100px;
+    margin-right: 10px;
+    text-align: right;
+}</style>
+   
\ No newline at end of file
diff --git a/src/views/modules/goverhotline/formList.vue b/src/views/modules/goverhotline/formList.vue
new file mode 100644
index 000000000..c0b918339
--- /dev/null
+++ b/src/views/modules/goverhotline/formList.vue
@@ -0,0 +1,143 @@
+<template>
+    <div style="margin-top:10px">
+        <el-table class="m-table-item" :data="tableData" style="width: 100%" border>
+            <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+            <el-table-column label="所属网格" prop="gridName" header-align="center" align="center" show-overflow-tooltip
+                width="150"></el-table-column>
+            <el-table-column label="接收时间" prop="happenTime" header-align="center" align="center" show-overflow-tooltip
+                width="150"></el-table-column>
+            <el-table-column label="问题描述" prop="eventContent" header-align="center" align="center" :show-overflow-tooltip="true"  width="200"></el-table-column>
+            <el-table-column prop="voiceList" align="center" width="80" label="语音">
+                        <template slot-scope="scope">
+                            <img @click="handleShowVoice(scope.row.voiceList[0].url)" class="img-voice"
+                                v-if="scope.row.voiceList && scope.row.voiceList.length > 0"
+                                src="@/assets/img/icon-voice.png" />
+                            <span v-else></span>
+                        </template>
+                    </el-table-column>
+            <el-table-column label="办结时限" prop="timeLimit" header-align="center" align="center" width="150"
+                show-overflow-tooltip></el-table-column>
+            <el-table-column label="联系人" prop="name" header-align="center" align="center" show-overflow-tooltip
+                width="100"></el-table-column>
+            <el-table-column label="联系电话" prop="mobile" header-align="center" align="center" show-overflow-tooltip
+            width="100"></el-table-column>
+            <el-table-column prop="status" align="center" label="状态" width="80" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.status === 'processing'">处理中</span>
+                            <span v-else-if="scope.row.status === 'closed_case'">已完成</span>
+                            <span v-else>--</span>
+                        </template>
+                    </el-table-column>
+            <el-table-column label="操作" align="center" width="100">
+                <template slot-scope="scope">
+                    <el-button @click="handelClickDetail(scope.row)" type="text" size="small">查看</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div>
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+                :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total"
+                :total="total"></el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import { completeList } from "@/js/columns/constants";
+export default {
+    //数据
+    data() {
+        return {
+            formData: {
+                gridId: "",
+                sourceType: "",
+                eventContent: "",
+                name: "",
+                mobile: "",
+                startTime: "",
+                endTime: "",
+                limitStartTime: "",
+                limitEndTime: "",
+                status: "",
+                firstIdList: [],
+                secondIdList: [],
+                workOrderNum: "",
+                departId:""
+            },
+            pageNo: 0,
+            pageSize: 20,
+            total: 0,
+            tableData: [],
+        };
+    },
+    //创建前
+    created() { },
+    async mounted() {
+        await this.getTableData()
+    },
+    //方法
+    methods: {
+
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`);
+            this.pageSize = val;
+            this.getTableData();
+        },
+        handelClickDetail(row) {
+            this.$emit('handelClickDetail', row);
+        },
+        handlClickEdit(row){
+            this.$emit('handelClickEdit', row);
+        },
+        handleCurrentChange(val) {
+            console.log(`当前页: ${val}`);
+            this.pageNo = val;
+            this.getTableData();
+        },
+        async getTableData() {
+            try {
+                const url = "/governance/dwdEvent/list";
+                if(this.recId){
+                    this.formData.secondIdList = [this.recId];
+                }
+
+                if(this.departId){
+                    this.formData.departId = this.departId;
+                }
+
+                const { pageSize, pageNo, formData } = this;
+                const { data, code, msg } = await requestPost(url, {
+                    pageSize,
+                    pageNo,
+                    ...formData,
+                });
+                if (code == 0) {
+                    this.tableData = data.list;
+                    this.total = data.total;
+                } else {
+                    console.log(err);
+                }
+            } catch (err) {
+                console.log(err);
+            }
+        },
+    },
+    //子组件注册
+    components: {},
+    //计算
+    computed: {},
+    props: {
+        recId:{
+            type:String,
+            default:''
+        },
+        departId:{
+            type:String,
+            default:''
+        }
+    },
+    //监听
+    watch: {},
+}
+</script>
+<style lang="scss"></style>
diff --git a/src/views/modules/goverhotline/index.vue b/src/views/modules/goverhotline/index.vue
index 8ce81730a..fbc7f33ab 100644
--- a/src/views/modules/goverhotline/index.vue
+++ b/src/views/modules/goverhotline/index.vue
@@ -71,7 +71,7 @@
                 </p>
                 <h1 style="text-align: center;font-size: 20px;">科室热线分布情况</h1>
                 <div class="m-table-item" :style="{ height: maxTableHeight + 'px', width: '100%' }">
-                  <div id="communityChart"></div>
+                  <div id="departChart"></div>
                 </div>
               </div>
               <div v-else class="no-data">
@@ -102,7 +102,7 @@
               <h2 style="font-size: 20px; font-weight: bold;"> (一）同地点同类型事件重复投诉 </h2>
             </div>
 
-            <el-table :data="addressData" border class="m-table-item" style="width: 100%">
+            <el-table :data="addressData" border class="m-table-item" style="width: 100%" @row-click="clickAddressData">
               <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
               <el-table-column prop="address" align="center" label="地点" :show-overflow-tooltip="true"></el-table-column>
               <el-table-column prop="amount" align="center" label="投诉次数" :show-overflow-tooltip="true"></el-table-column>
@@ -137,6 +137,38 @@
          
       </div>
     
+      <el-dialog
+        v-if="showFormList"
+        :visible.sync="showFormList"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        title="12345问题列表"
+        :modal-append-to-body="false"
+        width="60%"
+        top="5vh"
+        class="dialog-h"
+        @closed="showFormList = false"
+      >
+        <form-list
+          ref="ref_form_list"
+          @handleClose="handleClose"
+          :recId="recId"
+          :departId="departId"
+          @handelClickDetail="handelClickDetail"
+        ></form-list>
+        <el-dialog
+          width="60%"
+          class="dialog-h"
+          title="12345事件详情"
+          :close-on-click-modal="false"
+          v-if="showFormDetail"
+          :visible.sync="showFormDetail"
+          append-to-body
+        >
+        <event-info ref="eleEditForm" :pageType="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
+              @handleClose="handleClose" @handleOk="handleOk" @dialogOk="handleEditSuccess" />
+      </el-dialog>
+    </el-dialog>
      
   </div>
 </template>
@@ -147,8 +179,13 @@ import { mapGetters } from "vuex";
 import axios from "axios";
 import * as echarts from "echarts";
 
+import formList from "./formList";
+import util from "@js/util.js";
+import followDetail from "./followDetail";
+import eventInfo from "../shequzhili/event/cpts/event-info";
+
 export default {
-  components: {},
+  components: {formList, followDetail,eventInfo},
 
   data() {
       return {
@@ -182,7 +219,17 @@ export default {
           communityCountShow:false,
           departCountShow:false,
           subCategoryCountShow:false,
-         
+
+          showFormList: false,
+          showFormDetail: false,
+
+          recId: "",
+          departId:"",
+
+          eventId: "",
+          eventDetailData: {},
+          pageType: "info", 
+
 
 
           categoryChartOption: {
@@ -205,7 +252,6 @@ export default {
                 },
                 toolbox: {},
 
-
                 xAxis: {
                     type: 'category',
                     boundaryGap: true,
@@ -522,37 +568,40 @@ export default {
             this.categoryChart.setOption(this.categoryChartOption);
             let than = this;
             this.categoryChart.on("click", function (params) {
-                than.handelClickChart(params.name);
+              than.handelClickChart(params);
             });
 
             this.categoryPie= echarts.init(document.getElementById("categoryPie"));
             this.categoryPie.setOption(this.categoryPieOption);
             this.categoryPie.on("click", function (params) {
-                than.handelClickChart(params.name);
+              than.handelClickChart(params);
             });
           }
 
           if(this.communityCountShow){
             this.communityChart= echarts.init(document.getElementById("communityChart"));
             this.communityChart.setOption(this.communityOption);
+            let than = this;
             this.communityChart.on("click", function (params) {
-                than.handelClickChart(params.name);
+              than.handelClickChart(params);
             });
           }
           
           if(this.departCountShow){
             this.departChart= echarts.init(document.getElementById("departChart"));
             this.departChart.setOption(this.departOption);
+            let than = this;
             this.departChart.on("click", function (params) {
-                than.handelClickChart(params.name);
+              than.handelClickDepartChart(params);
           });
           }
 
           if(this.subCategoryCountShow){
             this.hotlineChart= echarts.init(document.getElementById("hotlineChart"));
             this.hotlineChart.setOption(this.hotlineChartOption);
+            let than = this;
             this.hotlineChart.on("click", function (params) {
-                than.handelClickChart(params.name);
+                than.handelClickChart(params);
             });
           }
 
@@ -568,15 +617,54 @@ export default {
               this.categoryPie.resize();
           }
       },
-      handelClickChart(name) {
+      handelClickChart(params) {
+          this.showFormList = true;
+          this.departId ='';
+          this.recId = params.data.id;
+      },
+      handelClickDepartChart(params) {
           this.showFormList = true;
-          this.satisfactionCategoryStr = this.dicts.satisfaction_category.filter(
-              (item) => item.label == name
-          )[0].value;
+          this.recId ='';
+          this.departId = params.data.id;
       },
       handleClose() {
           this.showFormList = false;
       },
+
+      async handelClickDetail(row) {
+          this.eventId = row.icEventId;
+            const url = "/governance/icEvent/detail";
+            const { data, code, msg } = await requestPost(url, {
+                icEventId: this.eventId,
+            });
+            if (code != 0) {
+                this.$message.error(msg);
+            } else {
+                this.eventDetailData = { ...data };
+                this.pageType = "info";
+                this.showFormDetail = true;
+            }
+      },
+
+      handleClose() {
+            this.showFormDetail = false;
+            this.pageType = "list";
+            this.eventId = "";
+            this.getTableData();
+        },
+        handleOk() {
+          this.showFormDetail = false;
+            this.pageType = "list";
+            this.eventId = "";
+            this.pageNo = 1;
+            this.getTableData();
+        },
+
+        handleEditSuccess() {
+            this.handleClose();
+            this.getTableData();
+        },
+        
       // 搜索事件
       async handleSearch(val) {
           console.log(this.formData);
@@ -632,20 +720,28 @@ export default {
             }
 
             this.report = data;
-            console.log(this.report)
 
             this.tableLoading = true;
 
             //获取分类
             Object.keys(this.report.categoryCount).forEach((key) => {
-              const value = this.report.categoryCount[key];
+              const category = this.report.categoryCount[key];
+
+              // this.categoryChartOption.series[0].data.push(category.count);
+              this.categoryChartOption.xAxis.data.push(category.name);
+
+              const recObject = {
+                  id: category.id,
+                  value: category.count
+              };
+              this.categoryChartOption.series[0].data.push(recObject);
+
 
-              this.categoryChartOption.series[0].data.push(value);
-              this.categoryChartOption.xAxis.data.push(key);
 
               const jsonObject = {
-                  name: key,
-                  value: value
+                  id: category.id,
+                  name: category.name,
+                  value: category.count
               };
               this.categoryPieOption.series[0].data.push(jsonObject);
 
@@ -653,31 +749,46 @@ export default {
 
             // 获取社区
             Object.keys(this.report.communityCount).forEach((key) => {
-              const value = this.report.communityCount[key];
+              const community = this.report.communityCount[key];
 
-              this.communityOption.xAxis[0].data.push(key);
-              this.communityOption.series[0].data.push(value/this.report.totalEvent*100);
-              this.communityOption.series[1].data.push(value);
+              this.communityOption.xAxis[0].data.push(community.name);
+              const recObject = {
+                  id: community.id,
+                  value: community.count/this.report.totalEvent*100
+              };
+              this.communityOption.series[0].data.push(recObject);
+
+            
+              this.communityOption.series[1].data.push(community.count);
 
             });
 
             // 获取科室
             Object.keys(this.report.departCount).forEach((key) => {
-              const value = this.report.departCount[key];
+              const depart = this.report.departCount[key];
 
-              this.departOption.xAxis[0].data.push(key);
-              this.departOption.series[0].data.push(value/this.report.totalEvent*100);
-              this.departOption.series[1].data.push(value);
+              this.departOption.xAxis[0].data.push(depart.name);
+              const recObject = {
+                  id: depart.id,
+                  value: depart.count/this.report.totalEvent*100
+              };
+              this.departOption.series[0].data.push(recObject);
 
-            });
+              
+              this.departOption.series[1].data.push(depart.count);
 
+            });
 
             // 获取热点诉求及区域分析
             Object.keys(this.report.subCategoryCount).forEach((key) => {
-              const value = this.report.subCategoryCount[key];
+              const subcategory = this.report.subCategoryCount[key];
+              this.hotlineChartOption.xAxis.data.push(subcategory.name);
 
-              this.hotlineChartOption.xAxis.data.push(key);
-              this.hotlineChartOption.series[0].data.push(value);
+              const recObject = {
+                  id: subcategory.id,
+                  value: subcategory.count
+              };
+              this.hotlineChartOption.series[0].data.push(recObject);
             });
 
             this.addressData = this.report.addressEvent
@@ -698,12 +809,11 @@ export default {
                 })
               : [];
 
-
-              if (this.report && this.report. categoryCount && Object.keys(this.report. categoryCount).length > 0) {
+              if (this.report && this.report.categoryCount && Object.keys(this.report.categoryCount).length > 0) {
                 this.categoryCountShow = true;
               }
 
-              if (this.report && this.report. communityCount && Object.keys(this.report. communityCount).length > 0) {
+              if (this.report && this.report.communityCount && Object.keys(this.report.communityCount).length > 0) {
                 this.communityCountShow = true;
               }
               
@@ -715,6 +825,11 @@ export default {
                 this.subCategoryCountShow = true;
               }
         },
+
+        clickAddressData(row, column){
+         console.log("============clickAddressData============"); 
+         console.log(row);
+        }
   },
 
   props: {},

From ef32c125582d3580d2f89bda38437ce390af040a Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 10 Nov 2023 16:25:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1null=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/renfang/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index d1704d40a..401d85498 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -737,7 +737,7 @@ export default {
               count: item.categoryCount,
               ratio: ((100 * item.categoryCount) / data.resiCount).toFixed(0),
               growth: 0,
-              growthAbs: Math.abs(item.growth),
+              growthAbs: Math.abs(item.growth) || '--',
             };
           });
         }