Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppSensitiveXbot/conversationRecord.vue

@@ -184,7 +184,7 @@ export default {
       this.getListInit()
     },
     getKeywordList() {
-      this.$http.post(`/app/appsessionarchiveinfo/listForXbot`, null, {
+      this.$http.post(`/app/appsessionarchiveinfo/listByKeywordRecord`, null, {
         params: {
           userId: this.id,
           size: 10,
@@ -194,7 +194,7 @@ export default {
           content: this.keyword,
           startTime: this.time ? this.time[0] : '',
           endTime: this.time ? this.time[1] : '',
-          seq: this.params.seq,
+          seq: '',
           msgId: this.params.msgId
         }
       }).then(res => {
@@ -244,7 +244,7 @@ export default {
           this.preveHeight = res.height  
         }).exec();
       }
-      this.$http.post(`/app/appsessionarchiveinfo/list`, null, {
+      this.$http.post(`/app/appsessionarchiveinfo/listForXbot`, null, {
         params: {
           userId: this.id,
           current: this.current,

src/apps/AppWorkOrderXbot/AppWorkOrderXbot.vue

@@ -0,0 +1,145 @@
+<template>
+  <div class="AppWorkOrderXbot">
+    <component v-if="refresh" :is="component" @change="onChange" :params="params" :ref="component"/>
+    <div class="tabs" v-if="isTab">
+      <div class="item" @click="tabClick(index, item.component)" v-for="(item, index) in tabs" :key="index">
+        <img :src="tabIndex == index ? item.activeImg : item.img" alt=""/>
+        <p :class="tabIndex == index ? 'color-3267F0' : ''">{{ item.text }}</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import List from './List.vue'
+import Statistics from './Statistics.vue'
+import {mapState} from 'vuex'
+
+export default {
+  name: 'AppWorkOrderXbot',
+  appName: '工单管理',
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      refresh: true,
+      tabIndex: 0,
+      tabs: [
+        {
+          img: require('./components/img/handle-icon.png'),
+          activeImg: require('./components/img/handle-icon-active.png'),
+          text: '办理',
+          component: 'List',
+        },
+        {
+          img: require('./components/img/statistics-icon.png'),
+          activeImg: require('./components/img/statistics-icon-active.png'),
+          text: '统计',
+          component: 'Statistics',
+        },
+      ],
+      isTab: true,
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    isGridMember() {
+      return this.user.girdCheckType > 0
+    }
+  },
+  components: {
+    List,
+    Statistics,
+    Set,
+  },
+
+  methods: {
+    onChange(e) {
+      this.params = e.params
+      this.component = e.type
+    },
+    tabClick(index, component) {
+      this.tabIndex = index
+      this.component = component
+      this.refresh = false
+      this.$nextTick(() => {
+        this.refresh = true
+      })
+    }
+  },
+  onShow() {
+    document.title = '工单管理'
+    uni.$on('hideTab', () => {
+      this.isTab = false
+    })
+    uni.$on('showTab', () => {
+      this.isTab = true
+    })
+    if (!this.tabIndex) {
+      this.$nextTick(() => this.$refs['List'].getListInit())
+    }
+  },
+  onReachBottom() {
+    if (!this.tabIndex) {
+      this.$nextTick(() => this.$refs['List'].nextPage())
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppWorkOrderXbot {
+  height: 100%;
+}
+
+.tabs {
+  width: 100%;
+  height: 98px;
+  background: #fff;
+  border-top: 1px solid #ddd;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  display: flex;
+
+  .item {
+    flex: 1;
+    text-align: center;
+
+    img {
+      width: 56px;
+      height: 56px;
+      margin-top: 8px;
+    }
+
+    p {
+      font-size: 22px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #c4cad4;
+      line-height: 8px;
+    }
+
+    .color-3267F0 {
+      color: #3267f0;
+    }
+  }
+}
+
+.empty {
+  text-align: center;
+
+  img {
+    width: 282px;
+    height: 306px;
+    margin: 136px auto 0;
+  }
+
+  p {
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #999;
+    line-height: 40px;
+  }
+}
+</style>

src/apps/AppWorkOrderXbot/Content.vue

@@ -3,8 +3,7 @@
     <div class="contents">
       <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
         <u-form-item label="转交给" prop="status" required :border-bottom="false" right-icon="arrow-right" class="first-form" v-if="status == 1">
-          <!-- <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled/> -->
-          <AiPagePicker type="sysUser" single :isShowPhone="true" :selected.sync="forms.user" action="/app/wxcp/wxuser/list?status=1" nodeKey="id" @select="handleSelectUser" class="select-user">
+          <AiPagePicker type="deptUser" single :selected.sync="forms.user" nodeKey="id" @select="handleSelectUser" class="select-user">
             <span style="margin-left: 4px" v-if="forms.user && forms.user.length">{{ forms.user[0].name }}</span>
             <span v-else class="color-999">请选择</span>
           </AiPagePicker>
@@ -107,6 +106,7 @@ export default {
     },
 
     handleSelectUser(e) {
+      console.log(e)
       this.forms.user = e
       this.forms.handleUserId = e[0].id
       this.forms.handleUserName = e[0].name
@@ -125,6 +125,7 @@ export default {
       this.submit()
     },
     submit() {  //status 1转交  2拒绝受理  3我已办结
+      if(this.flag) return
       var url = '', successText = '', params = ''
       if (this.status == 1) {
         url = `/app/appsessionarchivereportinfo/transfer`
@@ -153,6 +154,7 @@ export default {
       params.id = this.id
       this.$http.post(url, params).then((res) => {
         if (res.code == 0) {
+          this.flag = true
           this.$u.toast(successText)
           uni.$emit('updateDeatil')
           uni.$emit('getListInit')
@@ -171,7 +173,7 @@ export default {
       this.forms.type = e[0].value
     },
     toSelectUser() {
-      uni.navigateTo({url: './SelectUser'})
+      uni.navigateTo({url: './SelectDeptUser'})
     },
   },
 }

src/apps/AppWorkOrderXbot/Detail.vue

@@ -8,7 +8,7 @@
 
         <div class="times">{{ data.createTime }}</div>
       </div>
-      <span class="edit-btn" @click="toEdit()" v-if="data.eventStatus != 2 || data.eventStatus != 3">编辑</span>
+      <span class="edit-btn" @click="toEdit()" v-if="data.eventStatus != 2 && data.eventStatus != 3">编辑</span>
     </div>
 
     <div class="header-middle">
@@ -105,7 +105,20 @@
         <div class="doIt" @click="doItShow = true">我来受理</div>
       </div>
 
-      <div class="endDoIt" v-if="data.eventStatus == 1" @click="toContent(3)">前往办理</div>
+      <div class="status00" v-if="data.eventStatus == 1 && data.handleUserId == user.wxUserId">
+        <div class="columns border-r" @click="toContent(1)">
+          <img src="./components/img/zhuanjiao.png" alt="" />
+          <span class="hint">转交事件</span>
+        </div>
+        <div class="columns" @click="toContent(2)">
+          <img src="./components/img/jujue.png" alt="" />
+          <span class="hint">拒绝受理</span>
+        </div>
+
+        <div class="doIt" @click="toContent(3)">前往办理</div>
+      </div>
+      
+      <!-- <div class="endDoIt" v-if="data.eventStatus == 1 && data.handleUserId == user.wxUserId" @click="toContent(3)">前往办理</div> -->
     </div>
     <AiEvaluation v-show="false" v-model="evaluation" :bid="data.id"/>
     <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定受理该事件?" :show-cancel-button="true" @confirm="doThings"></u-modal>
@@ -343,6 +356,7 @@ uni-page-body {
 
     .plan {
       padding: 0 32px;
+      background-color: #fff;
 
       .nav {
         padding: 26px 0;
@@ -351,6 +365,7 @@ uni-page-body {
       .cards {
         position: relative;
         padding-bottom: 80px;
+        background-color: #fff;
 
         .cardss {
           display: flex;
@@ -495,6 +510,10 @@ uni-page-body {
         font-weight: 500;
         color: #fff;
       }
+
+      .width78 {
+        width: 78%;
+      }
     }
 
     .endDoIt {

src/apps/AppWorkOrderXbot/Edit.vue

@@ -11,8 +11,11 @@
         </u-form-item>
         <div class="line"></div>
         <u-form-item label="所属网格" prop="girdName" :border-bottom="false">
-          <AiPagePicker type="gird" v-model="forms.girdId" @change="confirmGird" valueObj nodeKey="id" formType="2" class="right-span">
+          <!-- <AiPagePicker type="gird" v-model="forms.girdId" @change="confirmGird" nodeKey="id" formType="2" class="right-span">
             <AiMore v-model="forms.girdName" placeholder="请选择所属网格"/>
+          </AiPagePicker> -->
+          <AiPagePicker type="gird" v-model="selectGird" valueObj nodeKey="id" formType="2" class="right-span">
+            <AiMore v-model="selectGird.girdName"/>
           </AiPagePicker>
         </u-form-item>
         <u-form-item label="联系方式" prop="phone" :border-bottom="false" >
@@ -58,7 +61,8 @@ export default {
       flag: false,
       show: false,
       flList: [],
-      id: ''
+      id: '',
+      selectGird: {}
     }
   },
   computed: {
@@ -74,6 +78,7 @@ export default {
     document.title = '事件编辑'
     uni.$on('chooseLat', res => {
       this.forms.mapInfo = {...res}
+      this.$forceUpdate()
     })
   },
   methods: {
@@ -86,20 +91,14 @@ export default {
             lng: res.data.lng,
             address: res.data.address,
           }
-        }
-      })
-    },
-    typeList() {
-      this.$http.post(`/app/appresidentreportgroup/list?current=1&size=100000`).then((res) => {
-        if (res.code == 0) {
-          this.flList = res.data.records.map(v => {
-            return {
-              label: v.id,
-              value: v.groupName
+          this.forms.typeName = res.data.type
+          var list = this.$dict.getDict('xbotReportEventType')
+          list.map((item) => {
+            if(item.dictValue == res.data.type) {
+              this.forms.typeName = item.dictName
             }
           })
-          this.$forceUpdate()
-          this.getDetail()
+          this.selectGird = { girdId: res.data.girdId|| '', girdName: res.data.girdName || ''}
         }
       })
     },
@@ -108,6 +107,7 @@ export default {
       this.forms.typeName = e[0].label
     },
     confirmGird(v) {
+      console.log(v)
       this.forms.girdId = v.id
       this.forms.girdName = v.girdName
     },
@@ -137,6 +137,8 @@ export default {
       //   return this.$u.toast('请输入手机号')
       // }
       this.flag = true
+      this.forms.girdId = this.selectGird.girdId
+      this.forms.girdName = this.selectGird.girdName
       this.$http.post(`/app/appsessionarchivereportinfo/update`, {...this.forms, ...this.forms.mapInfo}).then((res) => {
         if (res.code == 0) {
           this.$u.toast('事件编辑成功')

src/apps/AppWorkOrderXbot/List.vue

@@ -56,8 +56,6 @@ import {mapState} from 'vuex'
 
 export default {
   props: {},
-  name: "AppWorkOrder",
-  appName: "工单管理",
   data() {
     return {
       datas: [],
@@ -104,6 +102,15 @@ export default {
     })
   },
   methods: {
+    getListInit() {
+      this.current = 1
+      this.getList()
+    },
+    nextPage() {
+      this.current++
+      this.getList()
+    },
+    
     getList() {
       let {current, eventStatus, searchGrid: {id: girdId}} = this
       this.$http.post(`/app/appsessionarchivereportinfo/list`, null, {

src/apps/AppWorkOrderXbot/Statistics.vue

@@ -0,0 +1,375 @@
+<template>
+  <div class="statistics">
+    <AiTopFixed>
+      <div class="select-gird">
+        <AiPagePicker type="dept" v-model="selectDept" valueObj nodeKey="fullId" formType="2" class="right-span" @change="changeDept">
+          <AiMore v-model="selectDept.fullName"/>
+        </AiPagePicker>
+      </div>
+    </AiTopFixed>
+    <div class="statstics-content">
+      <div class="info-content">
+        <div class="title">概况总览</div>
+        <div class="el-row">
+          <div class="item" v-for="(item, index) in todayList" :key="index" v-if="item.label != '累计办结'">
+            <h2>{{item.value}}</h2>
+            <p>{{item.label}}</p>
+          </div>
+        </div>
+      </div>
+      <div class="info-content">
+        <div class="title">事件办结率</div>
+        <div class="echart-content" id="finish"></div>
+        <div class="num" v-if="finishData">{{finshNum}}%</div>
+        <AiEmpty v-else></AiEmpty>
+      </div>
+
+      <div class="info-content">
+        <div class="title">工单上报趋势图</div>
+        <div class="echart-content" id="trend"></div>
+        <AiEmpty v-if="!trendData.length"></AiEmpty>
+      </div>
+
+      <div class="info-content">
+        <div class="title">工单事件分类
+          <div class="type-select" :style="statusInfo.name ? '' : 'color:#999;'" @click="show=true">{{statusInfo.name || '请选择'}}<u-icon name="arrow-right"></u-icon></div>
+          <u-select v-model="show" :list="$dict.getDict('xbotEventStatusSearch')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
+        </div>
+        <div class="echart-content" id="type"></div>
+        <AiEmpty v-if="!typeData.length"></AiEmpty>
+      </div>
+      <div class="pad-b120"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+import echarts from 'echarts'
+export default {
+  props: {},
+  data() {
+    return {
+      todayList: [],
+      selectDept: {fullId: '', fullName: ''},
+      finishChart: null,
+      trendChart: null,
+      typeChart: null,
+      show: false,
+      finishData: [],
+      finshNum: '',
+      trendData: [],
+      trendDataX: [],
+      typeData: [],
+      statusInfo: {name: '', eventStatus: ''}
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  
+  mounted() {
+    // this.selectGird.girdName = this.user.girdName
+    // this.selectGird.girdId = this.user.girdId
+    this.$dict.load('xbotEventStatusSearch').then(() => {
+      this.getStatistics()
+    })
+  },
+  methods: {
+    changeDept(e) {
+      this.selectDept = e[0]
+      this.getStatistics()
+    },
+    getStatistics() {
+      this.todayList = [], this.finishData = [], this.trendDataX = [], this.trendData = [], this.typeData = []
+      this.$http.post(`/app/appsessionarchivereportinfo/countByDeptId?deptFullId=${this.selectDept.fullId}&eventStatus=${this.statusInfo.eventStatus}`).then((res) => {
+        if (res.code == 0) {
+          this.$nextTick(() => {
+            this.chartInit()
+          })
+
+          Object.keys(res.data.allCountMap).forEach((key) => {
+            var info = {
+              label: key,
+              value: res.data.allCountMap[key]
+            }
+            this.todayList.push(info)
+          })
+
+          Object.keys(res.data.allCountMap).forEach((key) => {
+            if(key == '累计上报' || key == '累计办结') {
+              var info = {
+                name: key,
+                value: res.data.allCountMap[key]
+              }
+              this.finishData.push(info)
+            }
+          })
+          
+          var num = Number(res.data.allCountMap['累计办结'])/Number(res.data.allCountMap['累计上报'])
+          this.finshNum = Number(num*100).toFixed(2)
+
+          res.data.trend.map((item) => {
+            this.trendData.push(item.ecount)
+            this.trendDataX.push(item.ymd)
+          })
+
+          res.data.groupList.map((item) => {
+            var info = {
+              name: item.groupName,
+              value: item.totalNum
+            }
+            this.typeData.push(info)
+          })
+
+          this.chartInit()
+        }
+      })
+    },
+
+    chartInit() {
+      this.finishChart = echarts.init(document.getElementById('finish'))
+      this.trendChart = echarts.init(document.getElementById('trend'))
+      this.typeChart = echarts.init(document.getElementById('type'))
+
+      var option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        series: [
+          {
+            name: '事件办结率',
+            type: 'pie',
+            radius: ['30%', '60%'],
+            itemStyle: {
+              normal: {
+                color: function (colors) {
+                  var colorList = ['#83B5F7', '#7E94F6', '#85E3D5', '#2891FF'];
+                  return colorList[colors.dataIndex];
+                }
+              },
+            },
+            data: this.finishData,
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)',
+              }
+            }
+          }
+        ]
+      };
+      this.finishChart.setOption(option)
+
+      var option2 = {
+        grid: {
+          left: '5%',
+          right: '5%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          axisLine: {
+            lineStyle: {
+              color: '#E1E5EF', //x轴的颜色
+              width: 1, //轴线的宽度
+            },
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
+          data: this.trendDataX
+        },
+        yAxis: {
+          axisLine:{       //y轴
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
+          type: 'value',
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        series: [
+          {
+            data: this.trendData,
+            type: 'line',
+            areaStyle: {//覆盖区域的渐变色
+            	normal: {
+            		color: {
+                  type: 'linear',x: 0,y: 0,x2: 0,y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0, color: 'rgba(58,132,255, 0.8)' // 0% 处的颜色
+                    },
+                    {
+                      offset: 1, color: 'rgba(58,132,255, 0)' // 100% 处的颜色
+                    }
+                  ],
+                  global: false // 缺省为 false
+		       		  },
+            	}
+            },
+            lineStyle: {
+              normal: {
+                color: '#2891FF'
+              }
+            },
+            itemStyle : {
+              normal : {
+                color:'#2891FF',
+              }
+            }
+          }
+        ]
+      };
+      this.trendChart.setOption(option2)
+
+      var option3 = {
+        tooltip: {
+          trigger: 'item'
+        },
+        series: [
+          {
+            name: '工单事件分类',
+            type: 'pie',
+            radius: ['0%', '70%'],
+            itemStyle: {
+              normal: {
+                color: function (colors) {
+                  var colorList = ['#2891FF', '#FF8700', '#83B5F7', '#7E94F6', '#85E3D5', '#2891FF'];
+                  return colorList[colors.dataIndex];
+                }
+              },
+            },
+            data: this.typeData,
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)',
+              }
+            }
+          }
+        ]
+      };
+      this.typeChart.setOption(option3)
+    },
+
+    selectStatus(e) {
+      this.statusInfo.name = e[0].label
+      this.statusInfo.eventStatus = e[0].value
+      this.getStatistics()
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.statistics {
+  background-color: #F3F7F8;
+  
+  .statstics-content {
+    padding: 30px 30px 0;
+  }
+  ::v-deep .AiTopFixed {
+    .content {
+      background-color: #3975C6;
+      color: #fff;
+    }
+    .icon-img{
+      width: 48px;
+      height: 48px;
+    }
+  }
+  ::v-deep .AiMore{
+    span{
+      color: #fff;
+    }
+  }
+  .info-content{
+    width: 100%;
+    background: #FFF;
+    border-radius: 16px;
+    margin-bottom: 24px;
+    position: relative;
+    padding-bottom: 32px;
+    .title{
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #333;
+      line-height: 48px;
+      padding: 24px 16px 24px 24px;
+      img{
+        float: right;
+        width: 40px;
+        height: 40px;
+      }
+      .type-select {
+        font-size: 26px;
+        position: absolute;
+        top: 20px;
+        right: 32px;
+        width: calc(100% - 250px);
+        text-align: right;
+        line-height: 48px;
+      }
+    }
+    .el-row{
+      display: flex;
+      padding: 32px 0 60px 0;
+      .item{
+        flex: 1;
+        text-align: center;
+        h2{
+          font-size: 64px;
+          font-family: DINAlternate-Bold, DINAlternate;
+          font-weight: bold;
+          color: #3B424A;
+          line-height: 64px;
+          margin-bottom: 8px;
+        }
+        p{
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #999;
+          line-height: 40px;
+        }
+      }
+    }
+    .echart-content {
+      width: 100%;
+      height: 500px;
+    }
+    .num {
+      position: absolute;
+      left: 50%;
+      top: 320px;
+      margin-left: -100px;
+      font-size: 40px;
+      font-weight: 600;
+      width: 200px;
+      text-align: center;
+    }
+  }
+  .pad-b120{
+    background-color: #F3F7F8;
+    padding-bottom: 120px;
+  }
+}
+</style>

src/components/AiPagePicker.vue

@@ -37,6 +37,7 @@ export default {
         gridUser: {url: "/components/pages/selectGirdUser", label: "name"},
         party: {url: "/components/pages/selectParty", label: "name"},
         dept: {url: "/components/pages/selectDept", label: "name"},
+        deptUser: {url: "/components/pages/selectDeptUser", label: "name"},
         custom: {...this.ops}
       },
       pickList: []

src/components/pages/selectDeptUser.vue

@@ -0,0 +1,303 @@
+<template>
+  <section class="selectDeptUser">
+    <div class="header-middle">
+      <div class="hint">
+        <span v-for="(item, index) in selectDeptPath" :key="index">
+          <span v-if="index>0" class="mar-h4">/</span>
+          <span class="color-3F8DF5" @click="deptNameClick(item, index)">{{ item.name }}</span>
+        </span>
+      </div>
+      <div class="cards" v-for="item in treeList" :key="item.id" @click="itemClick(item)">
+        <div class="imges">
+          <div class="imgselect" v-if="type == 1" :class="{checked:item.isChecked}" />
+          <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
+        </div>
+        <div class="rightes">
+          <div class="applicationNames">{{ item.name }}</div>
+          <img src="./img/right-icon.png" alt="" class="imgs"/>
+        </div>
+      </div>
+      <div v-if="type == 0">
+        <div class="userCards" v-for="(e, userIndex) in userList" :key="e.id">
+          <div class="imges">
+            <div class="imgselect" :class="{checked:e.isChecked}" @click.stop="itemCheck(e, 'user', userIndex)"/>
+            <img src="./img/tx@2x.png" alt="" class="avatras"/>
+          </div>
+          <div class="rights fill">
+            <div class="applicationNames" v-text="e.name"></div>
+            <div class="idNumbers">{{ e.phone }}</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" v-if="!hasData"/>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+  </section>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "selectDeptUser",
+  appName: "选择人员",
+  data() {
+    return {
+      selected: [],
+      allData: null,
+      treeList: [],
+      selectDeptPath: [],
+      userList: [],
+      type: 0,
+    }
+  },
+  computed: {
+    isSingle: v => !!v.$route.query.single,
+    nodeKey: v => v.$route.query.nodeKey || "id",
+    isRequire: v => v.$route.query.isRequire || 1,
+    hasData() {
+      return this.treeList?.length > 0 || this.userList?.length > 0
+    },
+    ...mapState(['user'])
+  },
+  onLoad(query) {
+    if (query.selected) {
+      this.selected = query.selected?.split(",") || []
+    }
+    this.getListAll() 
+  },
+  methods: {
+    isSelected(id) {
+      return !!this.selected.find(e => e == id)
+    },
+    getListAll() {
+      this.$http.post('/app/wxcp/wxdepartment/listAllByCorp').then((res) => {
+        if (res?.data) {
+          let parents = res.data.map(e => e.parentid)
+          this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id), isChecked: this.isSelected(e.id)}))
+          this.deptInit()
+        }
+      })
+    },
+    deptInit() {
+      this.treeList = this.allData.filter(e => !e.parentid)
+      this.selectDeptPath = [{name: "可选范围", id: ''}]
+    },
+    itemClick({id, name, corpId}) {
+      let index = this.selectDeptPath.findIndex(e => e.id == id && e.corpId == corpId)
+      if (index == -1) {
+        this.selectDeptPath.push({name, id, corpId})
+        this.getDeptsAndUsersByParent(id, corpId)
+      }
+    },
+    getDeptsAndUsersByParent(departmentId, corpId) {
+      this.treeList = this.allData.filter(e => e.parentid == departmentId && e.corpId == corpId)
+      this.userList = []
+      this.$http.post(`/app/wxcp/wxuser/listByDeptId`, null, {
+        params: {departmentId, status: 1, cid: corpId}
+      }).then(res => {
+        if (res?.data) {
+          this.userList = res.data.map(e => ({...e, isChecked: this.isSelected(e.id, e.corpId)}))
+        }
+      })
+    },
+    deptNameClick(row, index) {
+      this.userList = []
+      if (!index) { //第一级别
+        this.deptInit()
+      } else {
+        let length = this.selectDeptPath.length - index
+        this.selectDeptPath.splice(index + 1, length)
+        this.getDeptsAndUsersByParent(row.id, row.corpId)
+      }
+    },
+    itemCheck(row, kind, index) {
+      if(this.isSingle) {
+        this.selected = []
+        this.userList.map((item) => {
+          item.isChecked = false
+        })
+        this.userList[index].isChecked = true
+        this.selected.push({...row, kind})
+      } else {
+        row.isChecked = !row.isChecked
+        if (row.isChecked) {
+          this.selected.push({...row, kind})
+        } else {
+          let index = this.selected.findIndex(e => e.id == row.id)
+          this.selected.splice(index, 1)
+        }
+      }
+      this.$forceUpdate()
+    },
+    submit() {
+      if(![this.selected].flat().length) {
+        return this.$u.toast('请选择人员')
+      }
+      uni.navigateBack({
+        success: () => {
+          uni.$emit("pagePicker:deptUser",  this.selected)
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selectDeptUser {
+  height: 100%;
+  background: #fff;
+
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0 1px 0 0 #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      word-break: break-all;
+    }
+
+    .empty-div {
+      height: 16px;
+      background: #f5f5f5;
+    }
+
+    .imges {
+      display: flex;
+      align-items: center;
+
+      .imgselect {
+        width: 48px;
+        height: 48px;
+        vertical-align: middle;
+        background-image: url("./img/xz.png");
+        background-position: center;
+        background-size: 100% 100%;
+
+        &.checked {
+          background-image: url("./img/xzh.png");
+        }
+      }
+
+      .avatras {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+        margin-left: 36px;
+      }
+    }
+
+    .cards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+
+      img {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+      }
+
+      .rightes {
+        width: calc(100% - 160px);
+        display: flex;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+
+        .applicationNames {
+          flex: 1;
+          min-width: 0;
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .imgs {
+          flex-shrink: 0;
+          width: 40px;
+          height: 40px;
+          margin-right: 20px;
+        }
+      }
+    }
+
+    .userCards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+      .rights {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+        padding-right: 40px;
+        height: inherit;
+
+        .applicationNames {
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .idNumbers {
+          color: #666;
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+
+  .color-3F8DF5 {
+    color: #3F8DF5;
+  }
+
+  .mar-h4 {
+    margin: 0 4px;
+  }
+}
+</style>

src/project/lulong/AppHandSnapshot/Add.vue

@@ -73,7 +73,7 @@ export default {
     this.typeList()
   },
   onShow() {
-    document.title = '事件添加'
+    document.title = '巡查添加'
     this.forms.name = this.user.name
     this.forms.phone = this.user.phone
     this.forms.girdId = this.user.girdId
@@ -84,7 +84,7 @@ export default {
   },
   methods: {
     typeList() {
-      this.$http.post(`/app/appresidentreportgroup/list`, null, {
+      this.$http.post(`/app/apppatrolreportgroup/list`, null, {
         params: {
           size: 9999,
         },

src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue

@@ -79,11 +79,9 @@ export default {
     uni.$on('showTab', () => {
       this.isTab = true
     })
-    uni.$on('getListInit', () => {
+    if (!this.tabIndex) {
       this.$nextTick(() => this.$refs['List'].getListInit())
-    })
-    
-    this.$nextTick(() => this.$refs['List'].getListInit())
+    }
   },
   onReachBottom() {
     if (!this.tabIndex) {

src/project/lulong/AppHandSnapshot/Content.vue

@@ -83,7 +83,7 @@ export default {
   },
   methods: {
     typeList() {
-      this.$http.post(`/app/appresidentreportgroup/list`, null, {
+      this.$http.post(`/app/apppatrolreportgroup/list`, null, {
         params: {
           size: 9999,
         },
@@ -113,7 +113,7 @@ export default {
     submit() {  //status 1转交  2拒绝受理  3我已办结
       var url = '', successText = '', params = ''
       if (this.status == 1) {
-        url = `/app/appresidentreportinfo/transfer`
+        url = `/app/apppatrolreportinfo/transfer`
         successText = '转交成功'
         params = {
           ...this.forms,
@@ -127,12 +127,12 @@ export default {
         // }
       }
       if (this.status == 2) {
-        url = `/app/appresidentreportinfo/finishByGirdMember`
+        url = `/app/apppatrolreportinfo/finishByGirdMember`
         successText = '拒绝成功'
         params = {...this.forms, eventStatus: 0}
       }
       if (this.status == 3) {
-        url = `/app/appresidentreportinfo/finishByGirdMember`
+        url = `/app/apppatrolreportinfo/finishByGirdMember`
         successText = '办结成功'
         params = {...this.forms, eventStatus: 1}
       }

src/project/lulong/AppHandSnapshot/Detail.vue

@@ -94,7 +94,7 @@
     </div>
 
     <div class="fixedBtn">
-      <div class="status00" v-if="data.eventStatus == 0 || data.eventStatus == 1">
+      <div class="status00" v-if="data.eventStatus == 0">
         <div class="columns border-r" @click="toContent(1)">
           <img src="./components/img/zhuanjiao.png" alt="" />
           <span class="hint">转交事件</span>
@@ -107,6 +107,18 @@
 
         <div class="doIt" @click="toContent(3)">我来受理</div>
       </div>
+      <div class="status00" v-if="data.eventStatus == 1 && data.girdMemberId == user.girdMemberId">
+        <div class="columns border-r" @click="toContent(1)">
+          <img src="./components/img/zhuanjiao.png" alt="" />
+          <span class="hint">转交事件</span>
+        </div>
+        <div class="columns" @click="toContent(2)">
+          <img src="./components/img/jujue.png" alt="" />
+          <span class="hint">拒绝受理</span>
+        </div>
+
+        <div class="doIt" @click="toContent(3)">前往办理</div>
+      </div>
 
       <!-- <div class="endDoIt" v-if="data.eventStatus == 1 && data.rightType == 0" @click="toContent(3)">前往办理</div> -->
     </div>
@@ -169,11 +181,11 @@ export default {
     })
   },
   onShow() {
-    document.title = '事件上报'
+    document.title = '巡查上报'
   },
   methods: {
     getDetail() {
-      this.$http.post(`/app/appresidentreportinfo/queryDetailById?id=${this.id}`).then((res) => {
+      this.$http.post(`/app/apppatrolreportinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
           this.data = res.data
         }
@@ -197,6 +209,9 @@ export default {
     },
 
     toContent(status) {
+      if(status == 3 && !this.data.doRight) {
+        return this.$u.toast('没有办理权限')
+      }
       uni.navigateTo({url: `./Content?status=${status}&groupId=${this.data.groupId}&groupName=${this.data.groupName}&id=${this.id}`})
     },
     previewImage(images, img) {
@@ -352,6 +367,7 @@ uni-page-body {
       .cards {
         position: relative;
         padding-bottom: 80px;
+        background-color: #fff;
 
         .cardss {
           display: flex;
@@ -496,6 +512,7 @@ uni-page-body {
         font-weight: 500;
         color: #fff;
       }
+
     }
 
     .endDoIt {

src/project/lulong/AppHandSnapshot/List.vue

@@ -51,7 +51,7 @@
       <AiEmpty v-if="!datas.length"></AiEmpty>
     </template>
     <div class="pad-b120" v-if="datas.length"></div>
-    <AiAdd @add="add"/>
+    <AiAdd @add="add" v-if="isAdd"/>
   </div>
 </template>
 
@@ -78,6 +78,7 @@ export default {
       showType: false,
       eventStatus: '',
       eventStatusText: '',
+      isAdd: true
     }
   },
   computed: {
@@ -89,7 +90,7 @@ export default {
   onLoad() {
   },
   onShow() {
-    document.title = '事件上报'
+    document.title = '巡查上报'
     this.searchGrid.girdId = this.user.girdId
     this.searchGrid.girdName = this.user.girdName
     this.current = 1
@@ -98,6 +99,7 @@ export default {
   created() {
     this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory', 'residentEventSource').then(() => {
       this.getList()
+      this.getIsAdd()
     })
   },
   methods: {
@@ -111,7 +113,7 @@ export default {
     },
     getList() {
       let {current, eventStatus, searchGrid: {id: girdId}} = this
-      this.$http.post(`/app/apppatrolreportinfo/list`, null, {
+      this.$http.post(`/app/apppatrolreportinfo/listByGirdMember`, null, {
         params: {
           size: 10,
           current, 
@@ -165,7 +167,15 @@ export default {
     },
     add() {
       uni.navigateTo({url: './Add'})
-    }
+    },
+
+    getIsAdd() {
+      this.$http.post(`/app/apppatrolreportinfo/checkGirdMemberUser`).then((res) => {
+        if (res.code == 0) {
+          this.isAdd = res.data
+        }
+      })
+    },
   },
 }
 </script>

src/project/lulong/AppHandSnapshot/Map.vue

@@ -152,7 +152,10 @@ export default {
         position: evt.latLng
       });
       this.latLng = evt.latLng
-      this.address = evt.poi.name
+      var geocoder = new TMap.service.Geocoder();
+      geocoder.getAddress({ location: this.latLng }).then((result) => {
+        this.address = result.result.address;
+      });
     },
     confirm() {
       if (!this.latLng.lat) {

src/project/lulong/AppHandSnapshot/SelectUser.vue

@@ -74,7 +74,7 @@ export default {
   methods: {
     getTree() {
       this.slectList = []
-      this.$http.post(`/app/appresidentreportinfo/listGirdInfoByTransfer?id=${this.detailId}`).then((res) => {
+      this.$http.post(`/app/apppatrolreportinfo/listGirdInfoByTransfer?id=${this.detailId}`).then((res) => {
         if (res?.data) {
           this.allData = res.data
           this.treeInit()

src/project/lulong/AppHandSnapshot/Statistics.vue

@@ -1,157 +1,294 @@
 <template>
-  <div class="statistics" v-if="pageShow">
-    <div class="info-content">
-      <div class="title">今日概况</div>
-      <div class="el-row">
-        <div class="item" v-for="(item, index) in todayList" :key="index">
-          <h2>{{item.value}}</h2>
-          <p>{{item.label}}</p>
+  <div class="statistics">
+    <AiTopFixed>
+      <div class="select-gird">
+        <AiPagePicker type="gird" v-model="selectGird" valueObj nodeKey="id" formType="2" class="right-span" @change="handleSelectGird">
+          <AiMore v-model="selectGird.girdName"/>
+        </AiPagePicker>
+      </div>
+    </AiTopFixed>
+    <div class="statstics-content">
+      <div class="info-content">
+        <div class="title">概况总览</div>
+        <div class="el-row">
+          <div class="item" v-for="(item, index) in todayList" :key="index">
+            <h2>{{item.value}}</h2>
+            <p>{{item.label}}</p>
+          </div>
         </div>
       </div>
+      <div class="info-content">
+        <div class="title">事件办结率</div>
+        <div class="echart-content" id="finish" v-if="showFinish"></div>
+        <div class="num" v-if="showFinish">{{finshNum || 0}}%</div>
+        <AiEmpty v-else></AiEmpty>
+      </div>
+
+      <div class="info-content">
+        <div class="title">巡查上报趋势图</div>
+        <AiEmpty v-if="!trendData.length"></AiEmpty>
+        <div class="echart-content" id="trend" v-else></div>
+      </div>
+
+      <div class="info-content">
+        <div class="title">巡查事件分类
+          <!-- <div class="type-select" :style="statusInfo.name ? '' : 'color:#999;'" @click="show=true">{{statusInfo.name || '请选择'}}<u-icon name="arrow-right"></u-icon></div> -->
+          <u-select v-model="show" :list="$dict.getDict('clapEventStatusHistory')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
+        </div>
+        <AiEmpty v-if="!typeData.length"></AiEmpty>
+         <div class="echart-content" id="type" v-else></div>
+      </div>
+      <div class="pad-b120"></div>
     </div>
-    <div class="info-content">
-      <div class="title">业务透视</div>
-      <div class="business">
-        <div class="left">
-          <div class="item">
-            <p>受理率</p>
-            <h2>{{info.businessCountMap['受理率'] || '0'}}%</h2>
-          </div>
-          <div class="item">
-            <p>办结率</p>
-            <h2>{{info.businessCountMap['办结率'] || '0'}}%</h2>
-          </div>
-        </div>
-        <div class="right">
-          <div class="img">
-            <img src="./components/img/line-img.png" alt="">
-            <img src="./components/img/line-img.png" alt="">
-          </div>
-          <div class="num">
-            <div class="item bg1">
-              <h2>累计反馈</h2>
-              <p>{{info.businessCountMap['累计反馈'] || '0'}}</p>
-            </div>
-            <div class="item bg2">
-              <h2>累计受理</h2>
-              <p>{{info.businessCountMap['累计受理'] || '0'}}</p>
-            </div>
-            <div class="item bg3">
-              <h2>累计办结</h2>
-              <p>{{info.businessCountMap['累计办结'] || '0'}}</p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="info-content">
-      <div class="title" @click="toPercentageDetail">分类统计
-        <!-- <img src="./components/img/right-icon.png" alt=""> -->
-      </div>
-      <div class="percentage">
-        <div class="item" v-for="(item, index) in info.groupList" :key="index">
-          <div class="mini-title">{{item.groupName}}</div>
-          <div class="info">
-            <div class="line-bg" :style="`width:${item.width}%`" ><div class="active-bg" :style="`width:${item.percentage*100}%`"></div></div>共{{item.totalNum}}条 | 已办结{{item.finishNum}}
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- <div class="info-content" @click="toUserList">
-      <div class="title">成员明细
-        <img src="./components/img/right-icon.png" alt="">
-      </div>
-    </div> -->
-    <div class="pad-b120"></div>
   </div>
 </template>
 
 <script>
+import {mapState} from 'vuex'
+import echarts from 'echarts'
 export default {
   props: {},
   data() {
     return {
       todayList: [],
-      info: {},
-      pageShow: false,
-      showSelect: false,
-      myGirdList: [],
-      girdName: '全部网格'
+      selectGird: {id: '', girdName: ''},
+      finishChart: null,
+      trendChart: null,
+      typeChart: null,
+      show: false,
+      finishData: [],
+      showFinish: false,
+      finshNum: '',
+      trendData: [],
+      trendDataX: [],
+      typeData: [],
+      statusInfo: {name: '', eventStatus: ''}
     }
   },
+  computed: {
+    ...mapState(['user']),
+  },
+  
   mounted() {
-    this.girdList()
-    this.getStatistics()
+    // this.selectGird.girdName = this.user.girdName
+    // this.selectGird.girdId = this.user.girdId
+    this.$dict.load('clapEventStatusHistory').then(() => {
+      this.getStatistics()
+    })
   },
   methods: {
     getStatistics() {
-      this.$http.post('/app/appresidentreportinfo/countByGirdMember').then((res) => {
+      this.todayList = [], this.finishData = [], this.trendDataX = [], this.trendData = [], this.typeData = [], this.showFinish = false
+      this.$http.post(`/app/apppatrolreportinfo/countByGirdId?girdId=${this.selectGird.id}&eventStatus=${this.statusInfo.eventStatus}`).then((res) => {
         if (res.code == 0) {
-          if(res.data.businessCountMap['受理率']) {
-            res.data.businessCountMap['受理率'] = Number(res.data.businessCountMap['受理率'] * 100).toFixed(1)
-          }
-          if(res.data.businessCountMap['办结率']) {
-            res.data.businessCountMap['办结率'] = Number(res.data.businessCountMap['办结率'] * 100).toFixed(1)
-          }
-          this.info = res.data
 
-          Object.keys(res.data.todayCountMap).forEach((key) => {
+          Object.keys(res.data.allCountMap).forEach((key) => {
             var info = {
               label: key,
-              value: res.data.todayCountMap[key]
+              value: res.data.allCountMap[key]
             }
             this.todayList.push(info)
           })
-          if(this.info.groupList.length) {
-            this.info.groupList.map((item, index) => {
-              if(item.finishNum) {
-                item.percentage = (item.finishNum/item.totalNum).toFixed(2)
-              }else {
-                item.percentage = 0
-              }
-              item.width = 56-(index*10)
-            })
+
+          Object.keys(res.data.finishCountMap).forEach((key) => {
+            var info = {
+              name: key,
+              value: res.data.finishCountMap[key]
+            }
+            if(res.data.finishCountMap[key] > 0) {
+              this.showFinish = true
+            }
+            this.finishData.push(info)
+          })
+          
+          if(this.showFinish) {
+            var num = res.data.finishCountMap['累计事件办结']/res.data.finishCountMap['累计事件上报']
+            this.finshNum = Number(num*100).toFixed(2)
           }
+          
+
+          res.data.dateCountList.map((item) => {
+            this.trendData.push(item.ecount)
+            this.trendDataX.push(item.ymd)
+          })
+
+          res.data.groupList.map((item) => {
+            var info = {
+              name: item.groupName,
+              value: item.totalNum
+            }
+            this.typeData.push(info)
+          })
+
+          this.$nextTick(() => {
+            if(this.showFinish) {
+              this.finishChartInit()
+            }
+            if(this.trendData.length) {
+              this.trendChartInit()
+            }
+            if(this.typeData.length) {
+              this.typeChartInit()
+            }
+          })
         }
-        this.pageShow = true
       })
     },
 
-    goDetail(item) {
-      uni.navigateTo({ url: `./Detail?id=${item.id}` })
-    },
-
-    change(index) {
-      this.currentTabs = index
-      this.getList()
-    },
-
-    toPercentageDetail() {
-      // uni.navigateTo({url: './PercentageDetail'})
-    },
-    toUserList() {
-      uni.navigateTo({url: './UserList'})
-    },
-
-    girdList() {
-      this.$http.post(`/app/appgirdmemberinfo/queryMyGirdList`, null, {
-        params: {
-          size: 9999,
+    finishChartInit() {
+      this.finishChart = echarts.init(document.getElementById('finish'))
+      var option = {
+        tooltip: {
+          trigger: 'item'
         },
-      })
-      .then((res) => {
-        if (res.code == 0) {
-          this.myGirdList = res.data
-          var all = {
-            id: '',
-            girdName: '全部'
+        series: [
+          {
+            name: '事件办结率',
+            type: 'pie',
+            radius: ['30%', '60%'],
+            itemStyle: {
+              normal: {
+                color: function (colors) {
+                  var colorList = ['#7E94F6', '#85E3D5', '#2891FF'];
+                  return colorList[colors.dataIndex];
+                }
+              },
+            },
+            data: this.finishData,
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)',
+              }
+            }
           }
-          this.myGirdList.unshift(all)
-        }
-      })
+        ]
+      };
+      this.finishChart.setOption(option)
     },
-    confirm(e) {
 
+    trendChartInit() {
+      this.trendChart = echarts.init(document.getElementById('trend'))
+      var option2 = {
+        grid: {
+          left: '5%',
+          right: '5%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          axisLine: {
+            lineStyle: {
+              color: '#E1E5EF', //x轴的颜色
+              width: 1, //轴线的宽度
+            },
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
+          data: this.trendDataX
+        },
+        yAxis: {
+          axisLine:{       //y轴
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
+          type: 'value',
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        series: [
+          {
+            data: this.trendData,
+            type: 'line',
+            areaStyle: {//覆盖区域的渐变色
+            	normal: {
+            		color: {
+                  type: 'linear',x: 0,y: 0,x2: 0,y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0, color: 'rgba(58,132,255, 0.8)' // 0% 处的颜色
+                    },
+                    {
+                      offset: 1, color: 'rgba(58,132,255, 0)' // 100% 处的颜色
+                    }
+                  ],
+                  global: false // 缺省为 false
+		       		  },
+            	}
+            },
+            lineStyle: {
+              normal: {
+                color: '#2891FF'
+              }
+            },
+            itemStyle : {
+              normal : {
+                color:'#2891FF',
+              }
+            }
+          }
+        ]
+      };
+      this.trendChart.setOption(option2)
+    },
+
+    typeChartInit() {
+      this.typeChart = echarts.init(document.getElementById('type'))
+      var option3 = {
+        tooltip: {
+          trigger: 'item'
+        },
+        series: [
+          {
+            name: '巡查事件分类',
+            type: 'pie',
+            radius: ['0%', '70%'],
+            itemStyle: {
+              normal: {
+                color: function (colors) {
+                  var colorList = ['#2891FF', '#FF8700', '#83B5F7', '#7E94F6', '#85E3D5', '#2891FF'];
+                  return colorList[colors.dataIndex];
+                }
+              },
+            },
+            data: this.typeData,
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)',
+              }
+            }
+          }
+        ]
+      };
+      this.typeChart.setOption(option3)
+    },
+
+    selectStatus(e) {
+      this.statusInfo.name = e[0].label
+      this.statusInfo.eventStatus = e[0].value
+      this.getStatistics()
+    },
+    handleSelectGird(v) {
+      this.selectGird = v || {}
+      this.getStatistics()
     }
   },
 }
@@ -160,27 +297,23 @@ export default {
 <style scoped lang="scss">
 .statistics {
   background-color: #F3F7F8;
-  padding: 30px 30px 0;
-  .gird-select{
-    width: 100%;
-    background: #FFF;
-    border-radius: 16px;
-    margin: 0 0 24px;
-    text-align: center;
-    padding: 24px 0;
-    img{
-      width: 32px;
-      height: 32px;
-      vertical-align: middle;
+  
+  .statstics-content {
+    padding: 30px 30px 0;
+  }
+  ::v-deep .AiTopFixed {
+    .content {
+      background-color: #3975C6;
+      color: #fff;
     }
+    .icon-img{
+      width: 48px;
+      height: 48px;
+    }
+  }
+  ::v-deep .AiMore{
     span{
-      display: inline-block;
-      font-size: 34px;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #333;
-      line-height: 48px;
-      margin: 0 10px;
+      color: #fff;
     }
   }
   .info-content{
@@ -188,6 +321,8 @@ export default {
     background: #FFF;
     border-radius: 16px;
     margin-bottom: 24px;
+    position: relative;
+    padding-bottom: 32px;
     .title{
       font-size: 32px;
       font-family: PingFangSC-Regular, PingFang SC;
@@ -200,6 +335,15 @@ export default {
         width: 40px;
         height: 40px;
       }
+      .type-select {
+        font-size: 26px;
+        position: absolute;
+        top: 20px;
+        right: 32px;
+        width: calc(100% - 250px);
+        text-align: right;
+        line-height: 48px;
+      }
     }
     .el-row{
       display: flex;
@@ -223,119 +367,19 @@ export default {
         }
       }
     }
-    .business{
-      display: flex;
-      padding: 40px 0 30px 0;
-      .left{
-        width: 220px;
-        padding: 20px 0 78px 50px;
-        .item{
-          margin-bottom: 58px;
-        }
-        h2{
-          font-size: 58px;
-          font-family: DINAlternate-Bold, DINAlternate;
-          font-weight: bold;
-          color: #3B424A;
-          line-height: 64px;
-          letter-spacing: -4px;
-        }
-        p{
-          font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          color: #666;
-          line-height: 48px;
-        }
-      }
-      .right{
-        width: calc(100% - 220px);
-        display: flex;
-        .img{
-          width: 140px;
-          margin-top: 42px;
-          img{
-            width: 140px;
-            height: 144px;
-            margin-bottom: 20px;
-          }
-        }
-        .num{
-          width: calc(100% - 140px);
-          text-align: center;
-          .item{
-            height: 130px;
-            border-radius: 6px;
-            background-size: 100% 100%;
-            margin-bottom: 4px;
-            color: #2F7EE5;
-            h2{
-              font-size: 26px;
-              font-family: PingFangSC-Medium, PingFang SC;
-              font-weight: 500;
-              line-height: 48px;
-              padding-top: 20px;
-            }
-            p{
-              font-size: 40px;
-              font-family: DINAlternate-Bold, DINAlternate;
-              font-weight: bold;
-            }
-          }
-          .bg1{
-            width: 272px;
-            background-image: url('./components/img/bg-1.png');
-          }
-          .bg2{
-            width: 234px;
-            background-image: url('./components/img/bg-2.png');
-            margin-left: 16px;
-          }
-          .bg3{
-            width: 208px;
-            background-image: url('./components/img/bg-3.png');
-            margin-left: 32px;
-          }
-        }
-      }
+    .echart-content {
+      width: 100%;
+      height: 500px;
     }
-    .percentage{
-      padding: 16px 0 0 26px;
-      .item{
-        width: 100%;
-        padding-bottom: 32px;
-        .mini-title{
-          font-size: 30px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          color: #333;
-          line-height: 48px;
-          margin-bottom: 14px;
-        }
-        .info{
-          width: 100%;
-          font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          color: #999;
-          line-height: 48px;
-          .line-bg{
-            display: inline-block;
-            height: 14px;
-            background: #D7D8D9;
-            border-radius: 8px;
-            margin-right: 12px;
-            .active-bg{
-              height: 100%;
-              background: #257FF1;
-              border-radius: 8px;
-              min-width: 1%;
-            }
-          }
-          img{
-            width: 32px;
-            height: 32px;
-            vertical-align: middle;
-          }
-        }
-      }
+    .num {
+      position: absolute;
+      left: 50%;
+      top: 320px;
+      margin-left: -100px;
+      font-size: 40px;
+      font-weight: 600;
+      width: 200px;
+      text-align: center;
     }
   }
   .pad-b120{

src/project/pidu/AppSensitive/conversationRecord.vue

@@ -196,7 +196,7 @@ export default {
           startTime: this.time ? this.time[0] : '',
           endTime: this.time ? this.time[1] : '',
           seq: this.params.seq,
-          msgId: this.params.msgId
+          // msgId: this.params.msgId
         }
       }).then(res => {
         if (res.code === 0) {