diff --git a/src/views/modules/shequzhili/Delivery/index.vue b/src/views/modules/shequzhili/Delivery/index.vue
index 46166ef8b..ccc5c510c 100644
--- a/src/views/modules/shequzhili/Delivery/index.vue
+++ b/src/views/modules/shequzhili/Delivery/index.vue
@@ -5,8 +5,8 @@
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                     <div>
-                        <el-form-item label="事件类别" prop="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model.trim="eventTypeCheck" :options="cateOptions" collapse-tags
+                        <el-form-item label="事件类别" prop="categoryAllName">
+                            <el-cascader ref="cascaderEvent" v-model.trim="formData.categoryAllName" :options="cateOptions" collapse-tags
                                 :show-all-levels="false" :props="{
                                     multiple: true,
                                     checkStrictly: false,
@@ -42,29 +42,29 @@
                 </template>
               </el-cascader> -->
                         </el-form-item>
-                        <el-form-item label="办理状态" prop="handleStatus">
+                        <el-form-item label="办理状态" prop="operationTypeName">
                             <el-cascader class="u-item-width-normal"
                                 size="small"
                                 ref="myCascader"
-                                v-model.trim="formData.handleStatus"
+                                v-model.trim="formData.operationTypeName"
                                :options="handleList"
                                 :show-all-levels="false"
                                 @change="handleChangeAgency"
                                 clearable></el-cascader>
                         </el-form-item>
-                        <el-form-item label="指派部门" prop="agencyId">
+                        <el-form-item label="指派部门" prop="deptName">
                             <el-cascader class="u-item-width-normal"
                                 size="small"
                                 ref="myCascader"
-                                v-model.trim="formData.agencyId"
+                                v-model.trim="formData.deptName"
                                 :options="orgOptions"
                                 :props="orgOptionProps"
                                 :show-all-levels="false"
                                 @change="handleChangeAgency"
                                 clearable></el-cascader>
                         </el-form-item>
-                        <el-form-item label="办结时限" prop="limitStartTime">
-                            <el-date-picker v-model.trim="formData.limitStartTime" class="u-item-width-daterange" size="small"
+                        <el-form-item label="办结时限" prop="timeLimit">
+                            <el-date-picker v-model.trim="formData.timeLimit" class="u-item-width-daterange" size="small"
                                 type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间">
                             </el-date-picker>
                             <span class="u-data-tag">至</span>
@@ -104,9 +104,9 @@
                     <el-table-column label="" fixed="left" type="selection" align="center" width="50" />
                     <!-- <el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> -->
 
-                    <el-table-column prop="workOrder" align="center" label="工单编号" :show-overflow-tooltip="true">
+                    <el-table-column prop="workOrderNum" align="center" label="工单编号" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="eventType"  label="事件类别" min-width="140" align="center"
+                    <el-table-column prop="categoryAllName"  label="事件类别" min-width="140" align="center"
                         :show-overflow-tooltip="true" />
                     <!-- <template slot-scope="scope">
                      {{ scope.row.firstName + '-' + scope.row.secondName }}
@@ -114,10 +114,10 @@
                          </el-table-column> -->
                     <el-table-column prop="eventContent" label="事件描述" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="eventName" label="报件人" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="name" label="报件人" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="phone" align="center" width="110" label="联系电话" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                    <el-table-column prop="mobile" align="center" width="110" label="联系电话" >
+                        <!-- <template slot-scope="scope">
                             <el-button
                                 v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''"
                                 @click="handleLook(scope.row)"
@@ -129,26 +129,26 @@
                             <span v-else>
                                 {{ scope.row.phone }}
                             </span>
-                        </template>
+                        </template> -->
                     </el-table-column>
-                    <el-table-column prop="deliverystatus" align="center" width="110" label="指派状态" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                    <el-table-column prop="statusName" align="center" width="110" label="指派状态" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
                             <span v-if="scope.row.deliverystatus === 0">未指派</span>
                             <span v-else-if="scope.row.deliverystatus ===1">已指派</span>
                             <span v-else>--</span>
-                        </template>
+                        </template> -->
                     </el-table-column>
-                    <el-table-column prop="handlestatus" align="center" width="110" label="办理状态" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                    <el-table-column prop="operationTypeName" align="center" width="110" label="办理状态" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
                             <span v-if="scope.row.handlestatus === 0">未联系当事人</span>
                             <span v-else-if="scope.row.handlestatus ===1">已联系当事人</span>
                               <span v-else-if="scope.row.handlestatus ===1">已联系当事人</span>
                             <span v-else>--</span>
-                        </template>
+                        </template> -->
                     </el-table-column>
-                    <el-table-column prop="department" align="center" width="110" label="指定部门" :show-overflow-tooltip="true">
+                    <el-table-column prop="resolveStatus" align="center" width="110" label="指定部门" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="date" align="center" width="110" label="办结时间" :show-overflow-tooltip="true">
+                    <el-table-column prop="timeLimit" align="center" width="110" label="办结时限" :show-overflow-tooltip="true">
                     </el-table-column>
                     <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
                         <template slot-scope="scope">
diff --git a/src/views/modules/shequzhili/analysis/index.vue b/src/views/modules/shequzhili/analysis/index.vue
index 3f341dfc2..7b062b8a7 100644
--- a/src/views/modules/shequzhili/analysis/index.vue
+++ b/src/views/modules/shequzhili/analysis/index.vue
@@ -4,11 +4,11 @@
       <div class="m-search">
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
           <el-form-item label="统计时间">
-            <el-date-picker v-model.trim="formData.queryDateStart" type="date" value-format="yyyy-MM-dd"
+            <el-date-picker v-model.trim="formData.queryDateStart" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="开始时间" style="width: 202px" clearable>
             </el-date-picker>
             至
-            <el-date-picker v-model.trim="formData.queryDateEnd" type="date" value-format="yyyy-MM-dd"
+            <el-date-picker v-model.trim="formData.queryDateEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="结束时间" style="width: 202px" clearable>
             </el-date-picker>
           </el-form-item>
@@ -44,7 +44,6 @@
                 </div>
                 <p class="card-text">已办结事件数</p>
               </div>
-              <div class="br"></div>
               <div  style="padding-left: 20px; display: flex;flex-direction: column;justify-content: center;">
                 <div style="display: flex;flex-direction: row;">
                   <p class="card-title">110</p>
@@ -269,24 +268,13 @@ import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import axios from "axios";
 import * as echarts from "echarts";
-
-// import formList from "./formList";
-// import areaSameList from "./areaSameList";
-// import areaNoSameList from "./areaNoSameList";
-// import addComplainList from "./addComplainList";
-// import mobileList from "./mobileList";
 import util from "@js/util.js";
-// import followDetail from "./followDetail";
-// import eventInfo from "../shequzhili/event/cpts/event-info";
-// import awoList from  "@/views/modules/shequzhili/event/cpts/awoList.vue"
 
 export default {
   components: {},
-
   data() {
       return {
           searchH: 20,
-
           formData: {
             queryDateStart: "",
             queryDateEnd: "",
@@ -298,6 +286,7 @@ export default {
             id: "",
             level: "agency",
           },
+          analysisList:{},
 
           // 内容字段
           report:{
@@ -622,6 +611,7 @@ export default {
       await this.initEcharts();
   },
   methods: {
+    
       initEcharts() {
 
           if(this.categoryCountShow){
@@ -709,6 +699,7 @@ export default {
                 this.showFormDetail = true;
             }
       },
+      
 
       // 查看
       async handleLook(row) {
@@ -768,8 +759,27 @@ export default {
           this.cleanReportData();
           await this.getTableData();
           await this.initEcharts();
+          await this.EventCategoryAnalysis()
       },
+      // 对总数做出统计
+      async  EventCategoryAnalysis(){
+        const url = "/governance/icEvent/EventCategoryAnalysis";
+        let params = {
+          startDate:this.formData.queryDateStart,
+          endDate:this.formData.queryDateEnd,
+          usableFlag:false
+        };
 
+        const { data, code, msg } = await requestPost(url, params);
+        
+        if (code === 0) {
+          console.log(data);
+          this.analysisList = data;
+          console.log(this.analysisList);
+        } else {
+          this.$message.error(msg);
+        }
+      },
       cleanReportData(){
           console.log("刷新数据");
           this.report={}
@@ -801,7 +811,6 @@ export default {
 
       //   获取分类
       async getTableData() {
-
             const url = '/governance/dwdEvent/report';
             const {formData } = this;
             const { data, code, internalMsg } = await requestPost(url, {
diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue
index 34c9f08b9..b5611dffa 100644
--- a/src/views/modules/shequzhili/eventHandling/index.vue
+++ b/src/views/modules/shequzhili/eventHandling/index.vue
@@ -4,8 +4,8 @@
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                     <div>
-                        <el-form-item label="事件类别" prop="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model.trim="eventTypeCheck" :options="cateOptions"
+                        <el-form-item label="事件类别" prop="categoryAllName">
+                            <el-cascader ref="cascaderEvent" v-model.trim="formData.categoryAllName" :options="cateOptions"
                                 collapse-tags :show-all-levels="false" :props="{
                                     multiple: true,
                                     checkStrictly: false,
@@ -41,9 +41,9 @@
                 </template>
               </el-cascader> -->
                         </el-form-item>
-                        <el-form-item label="办理状态" prop="agencyId">
+                        <el-form-item label="办理状态" prop="statusName">
                             <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
-                                v-model.trim="formData.agencyId" :options="ProcessingList" :show-all-levels="false"
+                                v-model.trim="formData.statusName" :options="ProcessingList" :show-all-levels="false"
                                 clearable></el-cascader>
                         </el-form-item>
                         <el-form-item label="办结时限" prop="limitStartTime">
@@ -89,9 +89,9 @@
                     <el-table-column label="" fixed="left" type="selection" align="center" width="50" />
                     <!-- <el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> -->
 
-                    <el-table-column prop="workOrder" align="center" label="工单编号" :show-overflow-tooltip="true">
+                    <el-table-column prop="workOrderNum" align="center" label="工单编号" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="eventType" label="事件类别" min-width="140" align="center"
+                    <el-table-column prop="categoryAllName" label="事件类别" min-width="140" align="center"
                         :show-overflow-tooltip="true" />
                     <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
@@ -99,10 +99,10 @@
           </el-table-column> -->
                     <el-table-column prop="eventContent" label="事件描述" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="eventName" label="报件人" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="name" label="报件人" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="phone" align="center" width="110" label="联系电话" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                    <el-table-column prop="mobile" align="center" width="110" label="联系电话" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
                             <el-button v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''"
                                 @click="handleLook(scope.row)" type="text" size="small">
                                 {{ scope.row.phone }}
@@ -110,18 +110,18 @@
                             <span v-else>
                                 {{ scope.row.phone }}
                             </span>
-                        </template>
+                        </template> -->
                     </el-table-column>
-                    <el-table-column prop="date" align="center" width="110" label="办结时限" :show-overflow-tooltip="true">
+                    <el-table-column prop="timeLimit" align="center" width="110" label="办结时限" :show-overflow-tooltip="true">
                     </el-table-column>
 
-                    <el-table-column prop="handlestatus" align="center" width="110" label="办理状态"
+                    <el-table-column prop="statusName" align="center" width="110" label="办理状态"
                         :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <!-- <template slot-scope="scope">
                             <span v-if="scope.row.handlestatus === 0">联系当事人超期</span>
                             <span v-else-if="scope.row.handlestatus ===1">部门办结超期</span>
                             <span v-else>--</span>
-                        </template>
+                        </template> -->
                     </el-table-column>
                     <el-table-column prop="deliverystatus" align="center" width="110" label="办理超期"
                         :show-overflow-tooltip="true">
diff --git a/src/views/modules/shequzhili/timeOut/index.vue b/src/views/modules/shequzhili/timeOut/index.vue
index 467501020..673e07aca 100644
--- a/src/views/modules/shequzhili/timeOut/index.vue
+++ b/src/views/modules/shequzhili/timeOut/index.vue
@@ -4,8 +4,8 @@
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                     <div>
-                        <el-form-item label="事件类别" prop="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model.trim="eventTypeCheck" :options="cateOptions" collapse-tags
+                        <el-form-item label="事件类别" prop="categoryAllName">
+                            <el-cascader ref="cascaderEvent" v-model.trim="formData.categoryAllName" :options="cateOptions" collapse-tags
                                 :show-all-levels="false" :props="{
                                     multiple: true,
                                     checkStrictly: false,
@@ -30,15 +30,15 @@
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="指派部门" prop="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model.trim="formData.firstIdList" :options="cateOptions" collapse-tags
+                        <el-form-item label="指派部门" prop="deptName">
+                            <el-cascader ref="cascaderEvent" v-model.trim="formData.deptName" :options="cateOptions" collapse-tags
                                 :show-all-levels="false"  clearable class="u-item-width-normal" @change="handleEventType" />
                         </el-form-item>
-                        <el-form-item label="办理状态" prop="status">
+                        <el-form-item label="办理状态" prop="resolveStatus">
                             <el-cascader class="u-item-width-normal"
                                 size="small"
                                 ref="myCascader"
-                                v-model.trim="formData.status"
+                                v-model.trim="formData.resolveStatus"
                                :options="ProcessingList"
                                 :show-all-levels="false"
                                 clearable></el-cascader>
@@ -52,8 +52,8 @@
                                 :show-all-levels="false"
                                 clearable></el-cascader>
                         </el-form-item>
-                        <el-form-item label="办结时限" prop="limitStartTime">
-                            <el-date-picker v-model.trim="formData.startTime" 
+                        <el-form-item label="办结时限" prop="timeLimit">
+                            <el-date-picker v-model.trim="formData.timeLimit" 
                                 class="u-item-width-daterange" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
                                 value="yyyy-MM-dd HH:mm:ss" placeholder="开始时间">
                             </el-date-picker>
@@ -95,9 +95,9 @@
                     <el-table-column label="" fixed="left" type="selection" align="center" width="50" />
                     <!-- <el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> -->
 
-                    <el-table-column prop="workOrder" align="center" label="工单编号" :show-overflow-tooltip="true">
+                    <el-table-column prop="workOrderNum" align="center" label="工单编号" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="eventType"  label="事件类别" min-width="140" align="center"
+                    <el-table-column prop="categoryAllName"  label="事件类别" min-width="140" align="center"
                         :show-overflow-tooltip="true" />
                     <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
@@ -105,7 +105,7 @@
           </el-table-column> -->
                     <el-table-column prop="eventContent" label="事件描述" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="eventName" label="联系来电人时限" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="receptionTime" label="联系来电人时限" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
                     <!-- <el-table-column prop="phone" align="center" width="110" label="联系电话" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
@@ -131,12 +131,12 @@
                             <span v-else>--</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="handlestatus" align="center" width="110" label="办理状态" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                    <el-table-column prop="statusName" align="center" width="110" label="办理状态" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
                             <span v-if="scope.row.handlestatus === 0">联系当事人超期</span>
                             <span v-else-if="scope.row.handlestatus ===1">部门办结超期</span>
                             <span v-else>--</span>
-                        </template>
+                        </template> -->
                     </el-table-column>
               
                     <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">