diff --git a/src/views/modules/shequzhili/analysis/report.vue b/src/views/modules/shequzhili/analysis/report.vue
new file mode 100644
index 000000000..9ace795b2
--- /dev/null
+++ b/src/views/modules/shequzhili/analysis/report.vue
@@ -0,0 +1,1075 @@
+<template>
+  <div class="g-main">
+    <div>
+      <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="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="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="结束时间" style="width: 202px" clearable>
+            </el-date-picker>
+          </el-form-item>
+          <el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+          <el-button style="margin-left: 10px" is-plain class="diy-button--white el-button--default" size="small"
+            @click="exportReport">导出</el-button>
+        </el-form>
+
+      </div>
+      <div class="m-table">
+        <div style="margin:30px 0">
+          <h1 style="font-size: 24px; font-weight: bold;"> 事件统计 </h1>
+        </div>
+        <div class="div_room">
+          <div class="item">
+                            <div class="item_category">
+                                <img src="@/assets/images/category/perpon.png" alt />
+                                <div class="item_content">
+                                    <div class="item_row1">
+                                        <div class="row_left">{{analysisList.total}}</div>
+                                
+  
+                                 
+                                    </div>
+                                    <div class="item_row2">
+                                        <div class="row_left">事件总数</div>
+                                    </div>
+                                </div>
+                            </div>
+
+          </div>
+          <div class="item1">
+                            <div class="item_category">
+                                <img src="./img//eventNum.png"  />
+                                <div class="item_content">
+                                    <div class="item_row1">
+                                        <div class="row_left1">{{analysisList.resolveTotal}}</div>
+                                        <div class="text1">{{analysisList.resolveRate}}%</div>
+                                    </div>
+                                    <div class="item_row2">
+                                        <div class="row_left">已办结事件数</div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="item_category">
+                                <div class="item_content">
+                                    <div class="item_row1">
+                                        <div class="row_left2">{{analysisList.unresolveTotal}}</div>
+                                        <div class="text1">{{analysisList.unresolveRate}}%</div>
+                                    </div>
+                                    <div class="item_row2">
+                                        <div class="row_left">未办结事件数</div>
+                                    </div>
+                                </div>
+                            </div>
+
+          </div>
+          <div class="item">
+                            <div class="item_category">
+                                <img src="./img/perp.png" alt />
+                                <div class="item_content">
+                                    <div class="item_row1">
+                                        <div class="row_left">{{analysisList.illegalConnectTotal}}</div>
+                                
+                                            <div class="text1">{{analysisList.illegalConnectRate}}%</div>
+                                 
+                                    </div>
+                                    <div class="item_row2">
+                                        <div class="row_left">联系当事人超期事件数</div>
+                                    </div>
+                                </div>
+                            </div>
+
+          </div>
+          <div class="item">
+                            <div class="item_category">
+                                <img src="@/assets/images/category/perpon.png" alt />
+                                <div class="item_content">
+                                    <div class="item_row1">
+                                        <div class="row_left">{{analysisList.illegalResolveTotal}}</div>
+                                
+                                            <div class="text2">{{analysisList.illegalResolveRate}}%</div>
+                                 
+                                    </div>
+                                    <div class="item_row2">
+                                        <div class="row_left">办理超期事件数</div>
+                                    </div>
+                                </div>
+                            </div>
+
+          </div>
+    </div>
+        <div style="display: flex;justify-content: space-between;flex-direction:row;">
+          <h1 style="font-size: 24px; font-weight: bold;"> 事件类型统计 </h1>
+        </div>
+      <el-table
+    :data="tableList"
+    style="width: 100%;margin-bottom: 20px;"
+    row-key="id"
+    border
+    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+    <el-table-column
+      prop="categoryName"
+      label="事件类型">
+    </el-table-column>
+    <el-table-column
+      prop="eventCount"
+      label="事件数量">
+    </el-table-column>
+    <el-table-column
+      prop="proportion"
+      label="同级占比"
+      >
+    </el-table-column>
+  </el-table>
+        <div style="display: flex;justify-content: space-between;flex-direction:row; height:500px">
+          <div style="display: flex;width: 49%; flex-direction:column;">
+            <h1 style="font-size: 24px; font-weight: bold; margin: 20px 0;"> 部门科室工单量统计 </h1>
+            <el-table :data="departmentList"  height="250" border class="m-table-item" style="width: 100%">
+          <el-table-column prop="assignOrgName" align="center" label="部门科室"
+            :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="total" align="center" label="事件数" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="totalRate" align="center" label="占比" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.totalRate }}%
+            </template>
+          </el-table-column>
+          <el-table-column prop="unresolveTotal" align="center" label="未办结数" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="illegalConnectRate" align="center" label="联系当事人超期数" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="illegalResolveTotal" align="center" label="办理超期数" :show-overflow-tooltip="true"></el-table-column>
+        </el-table>
+        </div>
+          
+          <div  style="display: flex;width: 49%;flex-direction:column;">
+                <h1 style="font-size: 24px; font-weight: bold;  margin: 20px 0;"> 社区工单量统计 </h1>
+          <el-table :data="communityList"   height="300" border class="m-table-item" style="">
+          <!-- <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="assignOrgName" align="center" label="社区"
+            :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column prop="total" align="center" label="事件数" :show-overflow-tooltip="true">
+            <!-- <template slot-scope="{row}">
+              <el-button style="width: 100%" type="text" @click="clickAddressData(row)">{{row.amount}}</el-button>
+            </template> -->
+          </el-table-column>
+          <el-table-column prop="totalRate" align="center" label="占比" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.totalRate }}%
+            </template>
+        
+          </el-table-column>
+          <el-table-column prop="unresolveTotal" align="center" label="未办结数" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="illegalConnectRate" align="center" label="联系当事人超期数" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="illegalResolveTotal" align="center" label="办理超期数" :show-overflow-tooltip="true"></el-table-column>
+        </el-table>
+        </div>
+       
+        </div>
+
+      </div>
+
+
+    </div>
+
+  </div>
+</template>
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import * as echarts from "echarts";
+import util from "@js/util.js";
+import TableRow from './TableRow.vue';
+export default {
+  components: {TableRow},
+  data() {
+      return {
+        starttime:"",
+        endtime:"",
+        level:1,
+        tableList:[],
+        communityList:[],
+        departmentList:[],
+          searchH: 20,
+          formData: {
+            queryDateStart: "",
+            queryDateEnd: "",
+          },
+        
+          agencyLevel:'',
+
+          orgData: {
+            id: "",
+            level: "agency",
+          },
+          analysisList:{},
+
+          // 内容字段
+          report:{
+            streetName:"",
+            overallOperation:"",
+            geoStatis:"",
+            departHotline:"",
+            hotDemand:"",
+          },
+
+          addressData:[],
+          mobileData:[],
+          addressMobileData:[],
+          addComplainData:[],
+
+          eventCategorys:[],
+
+          categoryPie: {},
+          communityChart: {},
+          departChart: {},
+          hotlineChart: {},
+
+          categoryCountShow:false,
+          communityCountShow:false,
+          departCountShow:false,
+          subCategoryCountShow:false,
+
+          showFormList: false,
+          showFormDetail: false,
+          showAreaSameEventList: false,
+          showMobileEventList: false,
+          showAreaNoSameEventList: false,
+          showAddEventList: false,
+
+          recId: "",
+          departId:"",
+          communityId:"",
+
+          eventId: "",
+          eventDetailData: {},
+          pageType: "info",
+
+          mergeObj: {},
+          mergeArr: ['address'],
+
+
+
+
+          categoryPieOption:{
+            tooltip: {
+              trigger: 'item'
+            },
+            legend: {
+              type: 'scroll',
+              bottom: 0,
+            },
+            series: [
+              {
+                name: '数量',
+                type: 'pie',
+                radius: '80%',
+                data: [
+
+                ],
+                emphasis: {
+                  itemStyle: {
+                    shadowBlur: 10,
+                    shadowOffsetX: 0,
+                    shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
+              }
+            ]
+          },
+
+          communityOption : {
+            color: ['#5470C6', '#91CC75'],
+            tooltip: {
+              trigger: 'axis',
+              axisPointer: {
+                type: 'cross'
+              }
+            },
+            grid: {
+              right: '20%'
+            },
+            toolbox: {
+              feature: {
+                dataView: { show: true, readOnly: false },
+                restore: { show: true },
+                saveAsImage: { show: true }
+              }
+            },
+            legend: {
+              data: ['数量', '占比']
+            },
+            xAxis: [
+              {
+                type: 'category',
+                axisTick: {
+                  alignWithLabel: true
+                },
+                data: [],
+              }
+            ],
+            yAxis: [
+              {
+                type: 'value',
+                name: '数量',
+                position: 'right',
+                alignTicks: true,
+                axisLine: {
+                  show: true,
+                  lineStyle: {
+                    color: '#91CC75'
+                  }
+                },
+                axisLabel: {
+                  formatter: '{value} 件'
+                }
+              },
+              {
+                type: 'value',
+                name: '占比',
+                position: 'left',
+                alignTicks: true,
+                axisLine: {
+                  show: true,
+                  lineStyle: {
+                    color: '#5470C6'
+                  }
+                },
+                axisLabel: {
+                  formatter: '{value} %'
+                }
+              }
+            ],
+            series: [
+              {
+                name: '数量',
+                type: 'bar',
+                barWidth: 36, // 设置柱子宽度
+                data: [
+
+                ]
+              },
+              {
+                name: '占比',
+                type: 'line',
+                yAxisIndex: 1,
+                data: [
+
+                ]
+              }
+            ]
+          },
+
+          departOption : {
+            color: ['#5470C6', '#91CC75'],
+            tooltip: {
+              trigger: 'axis',
+              axisPointer: {
+                type: 'cross'
+              }
+            },
+            grid: {
+              right: '20%'
+            },
+            toolbox: {
+              feature: {
+                dataView: { show: true, readOnly: false },
+                restore: { show: true },
+                saveAsImage: { show: true }
+              }
+            },
+            legend: {
+              data: ['数量', '占比']
+            },
+            xAxis: [
+              {
+                type: 'category',
+                axisTick: {
+                  alignWithLabel: true
+                },
+                data: [],
+              }
+            ],
+            yAxis: [
+              {
+                type: 'value',
+                name: '占比',
+                position: 'right',
+                alignTicks: true,
+                axisLine: {
+                  show: true,
+                  lineStyle: {
+                    color: '#5470C6'
+                  }
+                },
+                axisLabel: {
+                  formatter: '{value} %'
+                }
+              },
+              {
+                type: 'value',
+                name: '数量',
+                position: 'left',
+                alignTicks: true,
+                axisLine: {
+                  show: true,
+                  lineStyle: {
+                    color: '#00264D'
+                  }
+                },
+                axisLabel: {
+                  formatter: '{value} 件'
+                }
+              }
+            ],
+            series: [
+              {
+                name: '数量',
+                type: 'bar',
+                barWidth: 36, // 设置柱子宽度
+                itemStyle: {
+                    normal: {
+                        // 定制显示（按顺序）
+                        color: function(params) {
+                            var colorList = ['#00BFFF', '#800080', '#008080', '#FF8C00', '#FF3333', '#6600CC', '#00FF00', '#4682B4', '#282828', '#FF4500'];
+                            return colorList[params.dataIndex]
+                        }
+                    },
+                },
+                data: [
+
+                ]
+              },
+              {
+                name: '占比',
+                type: 'line',
+                yAxisIndex: 1,
+                data: [
+
+                ]
+              }
+            ]
+          },
+
+          hotlineChartOption: {
+                tooltip: {
+                    trigger: 'axis'
+                },
+                legend: {
+                    data: ['工单数量'],
+                    bottom: '10%',
+                    icon: 'rect',
+                    itemWidth: 20,
+                    itemHeight: 5,
+                    itemGap: 20,
+                },
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '25%',
+                    containLabel: true
+                },
+                toolbox: {},
+
+
+                xAxis: {
+                    type: 'category',
+                    boundaryGap: true,
+                    data: [],
+                },
+                yAxis: {
+                    type: 'value',
+                    name: '单位(个)',
+                    min: 0,
+                },
+                series: [
+                    {
+                        name: '工单数量',
+                        type: 'bar',
+                        data: [],
+                        barWidth: 36, // 设置柱子宽度
+                        barCategoryGap: 0, // 设置柱子间的间隔为0
+                        itemStyle: {
+                            color: new echarts.graphic.LinearGradient(
+                                0, 0, 0, 1,
+                                [
+                                    { offset: 0, color: '#2c7cf2' }, // 从顶部开始
+                                    { offset: 1, color: '#80b3ff' } // 到底部结束
+                                ]
+                            )
+                        },
+                        showBackground: true,
+                        backgroundStyle: {
+                            color: '#fafbfc',
+                            opacity: "0.5"
+                        }
+                    },
+                ]
+            },
+    };
+  },
+
+  computed: {
+      maxTableHeight() {
+          const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
+          const _h = this.clientHeight - 330 - this.searchH;
+          return this.$store.state.inIframe ? h : _h;
+      },
+      ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {},
+   mounted() {
+      this.user = this.$store.state.user;
+      this.agencyId = this.user.agencyId;
+      this.getLastMonthRange()
+       this.getOrgData();
+      this.agencyLevel = localStorage.getItem("level", this.orgData.level);
+       this.EventCategoryAnalysis();
+       this.EventCate();
+       this.getCategoryTree()
+  },
+  methods: {
+    calculateRowspan(item) {
+      
+      if (!item.children || !item.children.length) {
+        return 1;
+      }
+ 
+    },
+      initEcharts() {
+
+          if(this.categoryCountShow){
+            this.categoryPie= echarts.init(document.getElementById("categoryPie"));
+            this.categoryPie.setOption(this.categoryPieOption);
+            let than = this;
+            this.categoryPie.on("click", function (params) {
+              than.handelClickChart(params);
+            });
+          }
+
+          if(this.communityCountShow && this.agencyLevel!='community'){
+            this.communityChart= echarts.init(document.getElementById("communityChart"));
+            this.communityChart.setOption(this.communityOption);
+            let than = this;
+            this.communityChart.on("click", function (params) {
+              than.handelClickCommunityChart(params);
+            });
+          }
+
+          if(this.departCountShow && this.agencyLevel!='community'){
+            this.departChart= echarts.init(document.getElementById("departChart"));
+            this.departChart.setOption(this.departOption);
+            let than = this;
+            this.departChart.on("click", function (params) {
+              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);
+            });
+          }
+
+          window.addEventListener("resize", this.handleWindowResize);
+
+          console.log("图表加载")
+      },
+      handleWindowResize() {
+          if (this.categoryPie) {
+              this.categoryPie.resize();
+          }
+      },
+      handelClickChart(params) {
+        this.hiddenAllDialog();
+          this.showFormList = true;
+          this.cleanSearchForm();
+          this.recId = params.data.id;
+      },
+
+
+      handelClickCommunityChart(params) {
+        this.hiddenAllDialog();
+          this.showFormList = true;
+          this.cleanSearchForm();
+          this.communityId = params.data.id;
+      },
+
+      handelClickDepartChart(params) {
+        this.hiddenAllDialog();
+          this.showFormList = true;
+          this.cleanSearchForm();
+          this.departId = params.data.id;
+      },
+      handleClose() {
+          this.showFormList = false;
+      },
+
+
+      // 查看
+      async handleLook(row) {
+
+        let { name,resiId } = row
+        this.$store.dispatch('saveData', { name,resiId });
+        this.$router.push({ name: 'jumin-huaxiang' });
+        this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+            if (item.name === "jumin-huaxiang") {
+            return {...item, title: name };
+            }
+            return item;
+        });
+      },
+
+      handleClose() {
+            this.hiddenAllDialog();
+            this.pageType = "list";
+            this.cleanSearchForm();
+        },
+        handleOk() {
+          this.hiddenAllDialog();
+            this.pageType = "list";
+            this.cleanSearchForm();
+            this.pageNo = 1;
+        },
+
+        handleEditSuccess() {
+            this.handleClose();
+        },
+
+
+      //加载组织数据
+      async getOrgData() {
+        const url = "/gov/org/agency/maporg";
+        let params = {
+          orgId: "",
+          level: "",
+        };
+
+        const { data, code, msg } = await requestPost(url, params);
+
+        if (code === 0) {
+          this.orgData = data;
+        } else {
+          this.$message.error(msg);
+        }
+      },
+
+      // 搜索事件
+       handleSearch(val) {
+          this.communityList= [];
+          this.departmentList=[];
+         
+          console.log(this.formData);
+          // 清空数据
+          this.cleanReportData();
+          //  this.getTableData();
+          // await this.initEcharts();
+           this.EventCategoryAnalysis();
+           this.EventCate();
+           this.getCategoryTree()
+      },
+      //事件类型统计
+      async getCategoryTree(){
+        if(this.formData.queryDateStart&&this.formData.queryDateEnd){
+          this.starttime=this.formData.queryDateStart,
+          this.endtime=this.formData.queryDateEnd
+        }else{{
+          this.getLastMonthRange()
+        }
+        }
+         const url = "/governance/icEventOld/getCategoryTreeAnalysis";
+        let param = {
+          startDate:this.starttime,
+          endDate:this.endtime,
+          usableFlag:true   
+          }
+        const { data, code, msg } = await requestPost(url, param);
+        if (code === 0) {
+          this.tableList=data
+          // this.tableList=this.flattenTree(data);
+          console.log(this.tableList);
+          console.log(this.tableList,"lksdjfklj s");
+        } else {
+          this.$message.error(msg);
+        }
+        },
+  formatDate1(date) {
+  // 获取年份、月份和日期
+  const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, '0');
+    const day = date.getDate().toString().padStart(2, '0');
+    const hours = date.getHours().toString().padStart(2, '0');
+    const minutes = date.getMinutes().toString().padStart(2, '0');
+    const seconds = date.getSeconds().toString().padStart(2, '0');
+
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+
+
+},
+   //获取前一个月的日期
+   getLastMonthRange() {
+    const now = new Date();
+    const startOfYear = new Date(now.getFullYear(), 0, 1); // 当前年份的1月1日
+  const endOfYear = new Date(now.getFullYear(), 11, 31); // 当前年份的12月31日
+
+  startOfYear.setHours(0, 0, 0, 0);
+  endOfYear.setHours(23, 59, 59, 999);
+  
+    this.formData.queryDateStart =this.formatDate1(startOfYear),
+    this.formData.queryDateEnd=this.formatDate1(endOfYear)
+    console.log(this.formData.queryDateEnd);
+},
+      //对部门进行统计
+      async EventCate(){
+         const url = "/governance/icEventOld/EventCategoryAnalysis";
+          // 对社区，部门进行更改
+          if(this.formData.queryDateStart&&this.formData.queryDateEnd){
+          this.starttime=this.formData.queryDateStart,
+          this.endtime=this.formData.queryDateEnd
+        }else{{
+          this.getLastMonthRange()
+        }
+        }
+          let param = {
+          startDate: this.starttime,
+          endDate:this.endtime,
+          usableFlag:true   
+        }
+        const { data, code, msg } = await requestPost(url, param);
+        if (code === 0) {
+          console.log(data);
+          data.map(item=>{
+            if(item.assignOrgType=="duty"){
+              this.departmentList.push(item)
+            }else{
+              this.communityList.push(item)
+            }
+          })
+          console.log(this.departmentList,"564534");
+          console.log(this.communityList,"sd ads ");
+        } else {
+          this.$message.error(msg);
+        }
+        },
+  flattenTree(tree, levelKeys = []) {
+  let result = [];
+  console.log(tree,"tree");
+  tree.forEach(node => {
+    console.log(levelKeys);
+    let newLevelKeys = [...levelKeys];
+    newLevelKeys.push(node.categoryName);
+    console.log(newLevelKeys,"newLevelKeys");
+    let level1 = newLevelKeys[0] || null;
+    let level2 = newLevelKeys[1] || null;
+    let level3 = newLevelKeys[2] || null;
+    let level4 = newLevelKeys[3] || null;
+    let level5 = newLevelKeys[4] || null;
+
+    if (level2) level1 = null;
+    if (level3) level2 = null;
+    if (level4) level3 = null;
+    if (level5) level4 = null;
+
+    let flattenedNode = {
+      ...node,
+      level1: level1,
+      level2: level2,
+      level3: level3,
+      level4: level4,
+      level5: level5
+    };
+    
+    delete flattenedNode.children;
+    result.push(flattenedNode);
+    
+    if (node.children && node.children.length > 0) {
+      console.log(node,"node");
+      result = result.concat(this.flattenTree(node.children, newLevelKeys));
+    }
+  });
+  console.log( result);
+  return result;
+},
+      // 对总数做出统计
+      async  EventCategoryAnalysis(){
+        const url = "/governance/icEventOld/EventCategoryAnalysis";
+        if(this.formData.queryDateStart&&this.formData.queryDateEnd){
+          this.starttime=this.formData.queryDateStart,
+          this.endtime=this.formData.queryDateEnd
+        }else{{
+          this.getLastMonthRange()
+        }
+        }
+          let params = {
+          startDate: this.starttime,
+          endDate:this.endtime,
+          usableFlag:false   
+        }
+        const { data, code, msg } = await requestPost(url, params);
+        if (code === 0) {
+          console.log(data);
+          this.analysisList = data[0];
+          console.log(this.analysisList);
+        } else {
+          this.$message.error(msg);
+        } 
+      },
+      cleanReportData(){
+          console.log("刷新数据");
+          this.report={}
+          this.addressData=[]
+          this.mobileData=[]
+          this.addressMobileData=[]
+          this.addComplainData=[]
+          this.eventCategorys=[]
+
+
+          this.categoryPieOption.series[0].data=[];
+
+          this.communityOption.xAxis[0].data=[];
+          this.communityOption.series[0].data=[];
+          this.communityOption.series[1].data=[];
+
+          this.departOption.xAxis[0].data=[];
+          this.departOption.series[0].data=[];
+          this.departOption.series[1].data=[];
+
+          this.hotlineChartOption.xAxis.data=[];
+          this.hotlineChartOption.series[0].data=[];
+      },
+
+      //   导出
+      exportReport() {
+        // this.$message.info('功能即将开通，敬请期待')
+
+
+        let url = "/governance/icEventOld/getCategoryTreeAnalysis/generateEventReport"
+
+
+        let params = {
+          startDate: this.starttime,
+          endDate:this.endtime,
+          usableFlag:true 
+        }
+
+
+        app.ajax.exportFilePost(
+          url,
+          params,
+          (data, rspMsg) => {
+            this.download(data, '分析报告.pdf')
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg);
+          }
+        );
+      },
+
+
+        clickEventCategorys(row, column){
+          this.hiddenAllDialog();
+          this.showFormList = true;
+          this.recId = row.categoryId;
+        },
+
+        clickAddressData(row, column){
+          this.hiddenAllDialog();
+          this.showFormList = true;
+          this.recId = row.categoryId;
+          this.address = row.address;
+        },
+
+        handelMoreAddressData(){
+          this.hiddenAllDialog();
+          this.cleanSearchForm();
+          this.showAreaSameEventList = true;
+        },
+        handelMoreMobileData(){
+          this.hiddenAllDialog();
+          this.cleanSearchForm();
+          this.showMobileEventList = true;
+        },
+        handelMoreAddressMobileData(){
+          this.hiddenAllDialog();
+          this.cleanSearchForm();
+          this.showAreaNoSameEventList = true;
+        },
+        handelMoreAddComplainData(){
+          this.hiddenAllDialog();
+          this.cleanSearchForm();
+          this.showAddEventList = true;
+        },
+
+        clickMobileData(row, column){
+          this.hiddenAllDialog();
+          this.showFormList = true;
+          this.cleanSearchForm();
+          this.mobile = row.mobile;
+        },
+
+        clickAddressMobileData(row, column){
+          this.hiddenAllDialog();
+          this.showFormList = true;
+          this.cleanSearchForm();
+          this.address = row.address;
+        },
+        clickAwoFlagData(row, column){
+          this.hiddenAllDialog();
+          this.$refs.awoList.open(row)
+        },
+
+        cleanSearchForm(){
+          this.departId ='';
+          this.eventId = "";
+          this.recId ='';
+          this.address ='';
+          this.mobile ='';
+          this.awo_flag ='';
+        },
+
+        hiddenAllDialog(){
+          this.showFormList = false;
+          this.showFormDetail = false;
+          this.showAreaSameEventList = false;
+          this.showMobileEventList = false;
+          this.showAreaNoSameEventList = false;
+          this.showAddEventList = false;
+        },
+
+        getSpanArr(data) {
+            this.mergeArr.forEach((key, index1) => {
+                let count = 0; // 用来记录需要合并行的起始位置
+                this.mergeObj[key] = []; // 记录每一列的合并信息
+                data.forEach((item, index) => {
+                    // index == 0表示数据为第一行，直接 push 一个 1
+                    if(index === 0) {
+                        this.mergeObj[key].push(1);
+                    } else {
+                        // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位
+                        if(item[key] === data[index - 1][key]) {
+                            this.mergeObj[key][count] += 1;
+                            this.mergeObj[key].push(0);
+                        } else {
+                            // 如果当前行和上一行其值不相等
+                            count = index; // 记录当前位置
+                            this.mergeObj[key].push(1); // 重新push 一个 1
+                        }
+                    }
+                })
+            })
+        },
+        // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+            // 判断列的属性
+            if(this.mergeArr.indexOf(column.property) !== -1) {
+                // 判断其值是不是为0
+                if(this.mergeObj[column.property][rowIndex]) {
+                    return [this.mergeObj[column.property][rowIndex], 1]
+                } else {
+                    // 如果为0则为需要合并的行
+                    return [0, 0];
+                }
+            }
+        }
+  },
+
+  props: {},
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+@import "./css/index.scss";
+table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+th, td {
+  width: 40px;
+  height: 20px;
+  border: 1px solid #ccc;
+  padding: 8px;
+  text-align: center;
+}
+
+thead {
+  background-color: #f9f9f9;
+}
+
+.div_btn_left>* {
+  margin-right: 10px;
+}
+
+.m-table-item {
+  display: flex;
+  flex-direction: column;
+}
+
+
+#categoryPie {
+    width: 100%;
+    flex: 1;
+}
+
+#communityChart {
+    width: 100%;
+    flex: 1;
+}
+
+#departChart {
+    width: 100%;
+    flex: 1;
+}
+
+#hotlineChart {
+    width: 100%;
+    flex: 1;
+}
+
+.centered-title {
+  text-align: center; /* 将文本水平居中对齐 */
+  font-size: 28px; /* 设置标题字体大小 */
+  font-weight: bold; /* 设置标题加粗 */
+  color: #333; /* 设置标题颜色 */
+  margin-bottom: 20px; /* 设置标题与下方内容的间距 */
+}
+
+.no-data {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px; /* 调整高度以适应你的需要 */
+  color: #888; /* 灰色字体颜色 */
+  font-size: 20px; /* 字体大小 */
+}
+
+
+.arrow-container {
+  position: relative;
+  width: 100px; /* 调整箭头容器的宽度 */
+  height: 100px; /* 调整箭头容器的高度 */
+}
+
+.arrow {
+  width: 0;
+  height: 0;
+  border-style: solid;
+  border-width: 20px 0 20px 34.6px; /* 通过调整这里的数值可以改变箭头的大小 */
+  border-color: transparent transparent transparent #007bff; /* 改变箭头颜色 */
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+</style>
+  
+  
\ No newline at end of file
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index a60f4cfad..7ed0d6e2e 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -125,6 +125,18 @@
             <div class="m-table">
                 <div class="div_btn">
                     <el-button size="small" type="primary " @click="handleAdd">新增</el-button>
+                    <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
+                        @command="(command) => handleMarkDiffcult(command)">
+                        标记
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item command="1">标记为难点堵点</el-dropdown-item>
+                            <el-dropdown-item command="2">标记为矛盾纠纷</el-dropdown-item>
+                            <el-dropdown-item command="3">标记为自身问题</el-dropdown-item>
+                            <el-dropdown-item command="4">标记为超出服务范围</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+
                     <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
                         @command="(command) => handleMarkDiffcult(command)">
                         标记
diff --git a/src/views/modules/shequzhili/materialcode/event.vue b/src/views/modules/shequzhili/materialcode/event.vue
index fa1550443..e97e46987 100644
--- a/src/views/modules/shequzhili/materialcode/event.vue
+++ b/src/views/modules/shequzhili/materialcode/event.vue
@@ -29,14 +29,15 @@
                       <div class="m-info-prop" style="flex: 0 0 50%;">
                         <span class="u-info-title-2">照片: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.picture || "--" }}</span>
+                        <span><img :src="formData.picture" style="width: 50px;height: 50px;"/></span>
                       </div>
                   </div>
                   <div style="display: flex;">
                       <div class="m-info-prop" style="flex: 0 0 50%;">
                         <span class="u-info-title-2">二维码: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.code || "--" }}</span>
+<!--                        <span>{{ formData.code || "&#45;&#45;" }}</span>-->
+                        <span><img :src="formData.code" style="width: 50px;height: 50px;"/></span>
                       </div>
                   </div>
 
diff --git a/src/views/modules/shequzhili/materialcode/icmaterialcode.vue b/src/views/modules/shequzhili/materialcode/icmaterialcode.vue
index 6de32d938..48ae98ca7 100644
--- a/src/views/modules/shequzhili/materialcode/icmaterialcode.vue
+++ b/src/views/modules/shequzhili/materialcode/icmaterialcode.vue
@@ -46,10 +46,10 @@
 
         <el-table-column prop="name" label="名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="introduce" label="介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="picture" label="图片" header-align="center" align="center">
+        <el-table-column prop="picture" label="图片" header-align="center" align="center" >
 
-          <template slot-scope="scope">
-              <img :src="scope.row.picture"/>
+          <template slot-scope="scope" >
+              <img :src="scope.row.picture" style="width: 50px;height: 50px;"/>
           </template>
 
         </el-table-column>
@@ -66,7 +66,7 @@
             <el-button type="text" style="color:#1C6AFD;" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
             <el-button type="text" style="color:#1C6AFD;" size="small"
-                       @click="download(scope.row)">下载</el-button>
+                       @click="download(scope.row)">二维码</el-button>
           </template>
         </el-table-column>
       </el-table>