diff --git a/src/project/xbot/AppDataStatistics/AppDataOverview.vue b/src/project/xbot/AppDataStatistics/AppDataOverview.vue
new file mode 100644
index 00000000..08ecea55
--- /dev/null
+++ b/src/project/xbot/AppDataStatistics/AppDataOverview.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="AppDataOverview">
+    <div class="head">
+      <div class="head_title">
+        <span>数据总览</span>
+        <span>数据截至 昨日24:00</span>
+      </div>
+      <div class="head_data">
+        <div class="head_data_item" v-for="(e,ind) in monthData" :key="ind">
+          <span class="dot"></span>
+          <span>{{ e }} {{ data[e] }}</span>
+        </div>
+      </div>
+    </div>
+
+    <div class="information">
+      <div class="u-sub">
+        <u-subsection :list="list" :current="current"  @change="sectionChange"></u-subsection>
+      </div>
+
+      <div class="card_list">
+        <div class="card" v-for="(item,index) in dataArray" :key="index">
+          <div class="card_name">{{ item }}</div>
+          <div class="card_num">{{ Number(data[item]).toLocaleString('en-US') }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "AppDataOverview",
+  data() {
+    return {
+      list: [
+        { name: '本周' },
+        { name: '本月' }
+      ],
+      current: 0,
+      data: {},
+      dataArray: ['新增居民档案','居民档案更新','新增网格员','新增走访记录','新增矛盾调解','新增宣发记录'],
+      monthData: ['本月访问次数','本月访问人数'],
+      beginDate: ''
+    }
+  },
+  onShow() {
+    this.getData()
+  },
+  methods: {
+    sectionChange(e) {
+      this.current = e
+      this.getData()
+    },
+    getData() {
+      this.$http.post(`/app/appwxcpopenstatistics/statistics`,null, {
+        params: {
+          beginDate: this.beginDate,
+          type: this.current==0? '1':'2'
+        }
+      }).then(res=> {
+        if(res?.data) {
+          this.data = res.data
+        }
+      })
+    }
+  },
+  onLoad(o) {
+    document.title = '慧政务'
+    this.beginDate = o.beginDate
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppDataOverview {
+  .head {
+    height: 212px;
+    background: #3975C6;
+    .head_title { 
+      color: #FFFFFF;
+      padding: 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      span:first-child {
+        font-size: 44px;
+      }
+      span:last-child {
+        font-size: 24px;
+      }
+    }
+    .head_data {
+      display: flex;
+      padding: 0 32px;
+      box-sizing: border-box;
+      .head_data_item {
+        flex: 1;
+        color: #FFFFFF;
+        .dot {
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          border-radius: 4px;
+          background: #FFFFFF;
+          margin-right: 8px;
+        }
+      }
+    }
+  }
+
+  .information {
+    width: 100%;
+    border-radius: 16px;
+    padding: 32px;
+    box-sizing: border-box;
+
+    .u-sub {
+      padding: 32px;
+      box-sizing: border-box;
+      background: #FFFFFF;
+      border-radius: 16px 16px 0 0;
+    }
+
+    .card_list {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      background: #FFFFFF;
+      padding: 0 32px;
+      box-sizing: border-box;
+      border-radius: 0 0 16px 16px;
+      
+      .card {
+        width: 50%;
+        height: 160px;
+        text-align: center;
+        .card_name {
+          margin-top: 32px;
+          color: #666666;
+        }
+        .card_num {
+          font-size: 36px;
+          color: #000000;
+          font-weight: 600;
+          margin-top: 12px;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/xbot/AppDataStatistics/AppDataStatistics.vue b/src/project/xbot/AppDataStatistics/AppDataStatistics.vue
new file mode 100644
index 00000000..e5ca7db2
--- /dev/null
+++ b/src/project/xbot/AppDataStatistics/AppDataStatistics.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class="AppDataStatistics">
+    <AiTopFixed v-if="tabIndex != 1">
+      <div class="area-content">
+        <!-- <AiAreaPicker v-model="areaId" :name.sync="areaName" :area-id="user.areaId" @select="areaSelect">
+          <div flex>
+            <img src="./img/location.png" alt="" class="icon-img">
+            <AiMore v-model="areaName" icon="arrow-down"/>
+          </div>
+        </AiAreaPicker> -->
+        <AiPagePicker type="dept" :selected.sync="deptList" nodeKey="id" single @select="deptSelect">
+          <span class="label" v-if="deptList.length">{{deptList[0].name}}</span>
+          <span v-else style="color:#fff;">部门名称</span>
+          <u-icon name="arrow-down" color="#fff" size="24" style="margin-left:8px;"/>
+        </AiPagePicker>
+      </div>
+    </AiTopFixed>
+    <div class="tab-list">
+      <div :class="index == tabIndex ? 'tab-item active' : 'tab-item'" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">{{ item.text }}<span></span></div>
+    </div>
+    <component ref='list' :is="tabList[tabIndex].component" :departmentId="departmentId" class="component" />
+  </div>
+</template>
+
+<script>
+import sensitive from './components/sensitive'
+import wechat from './components/wechat'
+import message from './components/message'
+import { mapState } from 'vuex'
+
+export default {
+  name: "AppDataStatistics",
+  appName: "数据统计",
+  data() {
+    return {
+      tabList: [
+        {
+          text: '微信统计',
+          component: wechat
+        },
+        {
+          text: '会话统计',
+          component: message
+        },
+        {
+          text: '敏感词统计',
+          component: sensitive
+        },
+      ],
+      tabIndex: 0,
+      // areaId: '',
+      // areaName: '',
+      departmentId: '',
+      deptList: [],
+
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  components: {sensitive, wechat, message},
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index
+    },
+    toOverData() {
+      uni.navigateTo({url:'./AppDataOverview'})
+    },
+    areaSelect(e) {
+      this.areaId = e
+      this.refreshList()
+    },
+    deptSelect(e) {
+      this.deptList = e
+      this.departmentId = e[0].id
+      this.refreshList()
+    },
+    refreshList() {
+      this.$nextTick(() => this.$refs.list.getData())
+    },
+    refreshTally() {
+      this.$http.post('/app/appwxcpopenstatistics/tally').then(res=> {
+        if(res.code == 0) {
+          console.log('手动触发成功');
+        }
+      })
+    }
+    
+  },
+  onLoad() {
+    this.deptList = [{name: this.user.departName, id: this.user.departId}]
+    this.departmentId = this.user.departId
+    // this.refreshTally()
+  },
+  onShow() {
+    document.title = "数据统计"
+    // this.areaId = this.user.areaId
+    // this.areaName = this.user.areaName
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppDataStatistics {
+  width: 100%;
+  height: 100%;
+  background-color: #F5F6F7;
+  padding-bottom: 112px;
+  ::v-deep .AiTopFixed {
+    .content {
+      background-color: #3975C6;
+      color: #fff;
+    }
+    .icon-img{
+      width: 48px;
+      height: 48px;
+    }
+  }
+  ::v-deep .AiMore{
+    span{
+      color: #fff;
+    }
+  }
+  .tab-list {
+    width: 100%;
+    line-height: 88px;
+    display: flex;
+    background-color: #fff;
+    position: fixed;
+    z-index: 9;
+
+    .tab-item {
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #666;
+      position: relative;
+    }
+    .active {
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #000;
+      span {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        margin-left: -25px;
+        width: 50px;
+        height: 6px;
+        background: #3399FF;
+        border-radius: 4px;
+      }
+    }
+  }
+  .component{
+    padding-top: 88px;
+  }
+}
+</style>
diff --git a/src/project/xbot/AppDataStatistics/components/message.vue b/src/project/xbot/AppDataStatistics/components/message.vue
new file mode 100644
index 00000000..237d5974
--- /dev/null
+++ b/src/project/xbot/AppDataStatistics/components/message.vue
@@ -0,0 +1,486 @@
+<template>
+  <div class="message">
+    <div class="head">
+      <span>消息回复率</span>
+    </div>
+
+    <div class="echarts_list">
+      <div id="echarts1"></div>
+      <div id="echarts2"></div>
+      <div id="echarts3"></div>
+    </div>
+
+    <div class="head">
+      <span>单聊统计</span>
+    </div>
+
+    <div class="card">
+      <div class="item" :class="privateCurrent == 0? 'active':''" @click="privateCurrent = 0,getPrivateData()">
+        <div class="item_name">单聊会话</div>
+        <div class="item_num" v-if="privateCard">{{ Number(privateCard.chatCnt).toLocaleString('en-US') }}</div>
+        <div class="item_num" v-else>0</div>
+      </div>
+      <div class="item" :class="privateCurrent == 1? 'active':''" @click="privateCurrent = 1,getPrivateData()">
+        <div class="item_name">单聊消息</div>
+        <div class="item_num" v-if="privateCard">{{ Number(privateCard.messageCnt).toLocaleString('en-US') }}</div>
+        <div class="item_num" v-else>0</div>
+      </div>
+    </div>
+
+    <div class="privateChat_box">
+      <div id="privateChat" v-if="privateData.length > 0"></div>
+      <AiEmpty style="padding-top: 10px;" description="暂无数据" v-else></AiEmpty>
+    </div>
+
+    <div class="head">
+      <span>群聊统计</span>
+    </div>
+
+    <div class="card">
+      <div class="item" :class="groupCurrent == 0? 'active':''" @click="groupCurrent = 0,getGroupData()">
+        <div class="item_name">活跃群聊</div>
+        <div class="item_num" v-if="groupCard">{{ Number(groupCard.chatHasMsg).toLocaleString('en-US') }}</div>
+        <div class="item_num" v-else>0</div>
+      </div>
+      <div class="item" :class="groupCurrent == 1? 'active':''" @click="groupCurrent = 1,getGroupData()">
+        <div class="item_name">活跃群成员</div>
+        <div class="item_num" v-if="groupCard">{{ Number(groupCard.memberHasMsg).toLocaleString('en-US') }}</div>
+        <div class="item_num" v-else>0</div>
+      </div>
+      <div class="item" :class="groupCurrent == 2? 'active':''" @click="groupCurrent = 2,getGroupData()">
+        <div class="item_name">群聊消息</div>
+        <div class="item_num" v-if="groupCard">{{ Number(groupCard.msgTotal).toLocaleString('en-US') }}</div>
+        <div class="item_num" v-else>0</div>
+      </div>
+    </div>
+
+    <div class="groupChat_box">
+      <div id="groupChat" v-if="groupData.length > 0"></div>
+      <AiEmpty style="padding-top: 10px;" description="暂无数据" v-else></AiEmpty>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import echarts from "echarts"
+export default {
+  name: 'message',
+  props: {
+    departmentId: String
+  },
+  data() {
+    return {
+      privateCard: {},
+      privateData: [],
+      privateDate: [],
+      privateMsg: [],
+      privateCurrent: 0,
+      groupCard: {},
+      groupData: [],
+      groupDate: [],
+      groupMsg: [],
+      groupCurrent: 0,
+      replyData: {},
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      // 回复率
+      this.$http.post(`/app/wxgroupstatistic/replyPercentage?departmentId=${this.departmentId}`).then(res=> {
+        if(res?.data) {
+          this.replyData = res.data
+          this.getEcharts1(this.replyData)
+          this.getEcharts2(this.replyData)
+          this.getEcharts3(this.replyData)
+        }
+      })
+      this.getPrivateData()
+      this.getGroupData()
+    },
+    getPrivateData() {
+      // 单聊统计
+      this.$http.post(`/app/wxgroupstatistic/getUserChatNumber?departmentId=${this.departmentId}`).then(res=> {
+        if(res?.data) {
+          this.privateCard = res.data.单聊总和
+          this.privateData = res.data.条形统计
+          this.privateDate = this.privateData?.map(v=> v.dateDay)
+          if(this.privateCurrent == 0) {
+            this.privateMsg = this.privateData?.map(v=> v.chatCnt)
+          } else if(this.privateCurrent == 1) {
+            this.privateMsg = this.privateData?.map(v=> v.messageCnt)
+          }
+          this.$nextTick(()=> {
+            this.getPrivateChat(this.privateDate,this.privateMsg)
+          })
+        }
+      })
+    },
+    getGroupData() {
+      // 群聊统计
+      this.$http.post(`/app/wxgroupstatistic/getgroupChatNumber?departmentId=${this.departmentId}`).then(res=> {
+        if(res?.data) {
+          this.groupCard = res.data.群聊总和
+          this.groupData = res.data.条形统计
+          this.groupDate = this.groupData?.map(v=> v.dateDay)
+          if(this.groupCurrent == 0) {
+            this.groupMsg = this.groupData?.map(v=>v.chatHasMsg)
+          } else if(this.groupCurrent ==1) {
+            this.groupMsg = this.groupData?.map(v=>v.memberHasMsg)
+          } else if(this.groupCurrent == 2) {
+            this.groupMsg = this.groupData?.map(v=>v.msgTotal)
+          }
+          this.$nextTick(()=> {
+            this.getGroupChat(this.groupDate,this.groupMsg)
+          })
+        }
+      })
+    },
+    getEcharts1({replyPercentage}) {
+      let echarts1 = document.getElementById('echarts1');
+      let myChart1 = echarts.init(echarts1);
+      let option = {
+        // tooltip: {
+        //   trigger: 'item',
+        // },
+        title: {
+          zlevel: 0,
+          text: [`{name|昨日}\n{value|${ replyPercentage } %}`],
+          top: 'center',
+          left: '46%',
+          textAlign: 'center',
+          textStyle: {
+            rich: {
+              name: {
+                color: '#999999',
+                fontSize: 13,
+                lineHeight: 15
+              },
+              value: {
+                color: '#333333',
+                fontSize: 13,
+                lineHeight: 16
+              }
+            },
+          },
+        },
+        color: ['#3975C6','#C7C7C7'], 
+        series: [
+          {
+            name: '昨天',
+            type: 'pie',
+            radius: ['50%', '70%'],
+            avoidLabelOverlap: false,
+            hoverAnimation: false,
+            labelLine: {
+              show: false,
+            },
+            data: [
+              { value: replyPercentage, name: '' },
+              { value: 100 - replyPercentage, name: '' },
+            ]
+          }
+        ]
+      };
+      option && myChart1.setOption(option);
+    },
+    getEcharts2({weekSum}) {
+      let echarts2 = document.getElementById('echarts2');
+      let myChart2 = echarts.init(echarts2);
+      let option = {
+        // tooltip: {
+        //   trigger: "item",
+        // },
+        title: {
+          zlevel: 0,
+          text: [`{name|近7天}\n{value|${ weekSum } %}`],
+          top: 'center',
+          left: '46%',
+          textAlign: 'center',
+          textStyle: {
+            rich: {
+              name: {
+                color: '#999999',
+                fontSize: 13,
+                lineHeight: 15
+              },
+              value: {
+                color: '#333333',
+                fontSize: 13,
+                lineHeight: 16
+              }
+            },
+          },
+        },
+        color: ['#3975C6','#C7C7C7'], 
+        series: [
+          {
+            name: '近7天',
+            type: 'pie',
+            radius: ['50%', '70%'],
+            avoidLabelOverlap: false,
+            hoverAnimation: false,
+            labelLine: {
+              show: false,
+            },
+            data: [
+              { value: weekSum, name: '' },
+              { value: 100 - weekSum, name: '' },
+            ]
+          }
+        ]
+      };
+      option && myChart2.setOption(option);
+    },
+    getEcharts3({monthSum}) {
+      let echarts3 = document.getElementById('echarts3');
+      let myChart3 = echarts.init(echarts3);
+      let option = {
+        // tooltip: {
+        //   trigger: "item",
+        // },
+        title: {
+          zlevel: 0,
+          text: [`{name|近30天}\n{value|${ monthSum } %}`],
+          top: 'center',
+          left: '46%',
+          textAlign: 'center',
+          textStyle: {
+            rich: {
+              name: {
+                color: '#999999',
+                fontSize: 13,
+                lineHeight: 15
+              },
+              value: {
+                color: '#333333',
+                fontSize: 13,
+                lineHeight: 16
+              }
+            },
+          },
+        },
+        color: ['#3975C6','#C7C7C7'], 
+        series: [
+          {
+            name: '近30天',
+            type: 'pie',
+            radius: ['50%', '70%'],
+            avoidLabelOverlap: false,
+            hoverAnimation: false,
+            labelLine: {
+              show: false,
+            },
+            data: [
+              { value: monthSum, name: '' },
+              { value: 100 - monthSum, name: '' },
+            ]
+          }
+        ]
+      };
+      option && myChart3.setOption(option);
+    },
+    getPrivateChat(privateDate,privateMsg) {
+      let privateDom = document.getElementById('privateChat');
+      let myChartPrivate = echarts.init(privateDom);
+      let option = {
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: {
+          type: 'category',
+          data: privateDate,
+          axisTick: {
+            show: false,
+          }
+        },
+        yAxis: {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          }
+        },
+        series: [
+          {
+            data: privateMsg,
+            type: 'line',
+            lineStyle: {
+              color: '#3975C6', // 折线线条颜色
+            },
+            itemStyle: {
+              color: '#3975C6', // 折角颜色
+            },
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [  // 渐变颜色
+                  {
+                    offset: 0,
+                    color: '#2891ff33',
+                  },
+                  {
+                    offset: 1,
+                    color: '#2891ff00',
+                  },
+                ],
+                global: false,
+              },
+            },
+          }
+        ]
+      };
+      option && myChartPrivate.setOption(option);
+    },
+    getGroupChat(groupDate,groupMsg) {
+      let groupDom = document.getElementById('groupChat');
+      let myChartGroup = echarts.init(groupDom);
+      let option = {
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: {
+          type: 'category',
+          data: groupDate,
+          axisTick: {
+            show: false,
+          }
+        },
+        yAxis: {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          }
+        },
+        series: [
+          {
+            data: groupMsg,
+            type: 'line',
+            lineStyle: {
+              color: '#3975C6', // 折线线条颜色
+            },
+            itemStyle: {
+              color: '#3975C6', // 折角颜色
+            },
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [  // 渐变颜色
+                  {
+                    offset: 0,
+                    color: '#2891ff33',
+                  },
+                  {
+                    offset: 1,
+                    color: '#2891ff00',
+                  },
+                ],
+                global: false,
+              },
+            },
+          }
+        ]
+      };
+      option && myChartGroup.setOption(option);
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.message {
+  padding: 0 32px;
+  box-sizing: border-box;
+  .head {
+    margin-top: 32px;
+    span {
+      font-size: 32px;
+      color: #333333;
+      font-weight: 600;
+    }
+  }
+
+  .card {
+    padding: 8px;
+    box-sizing: border-box;
+    display: flex;
+    text-align: center;
+    align-items: center;
+    background: #FFF;
+    border-radius: 16px 16px 0 0;
+    margin-top: 24px;
+
+    .item {
+      flex: 1;
+      padding: 16px 0;
+      box-sizing: border-box;
+
+      .item_name {
+        color: #666666;
+      }
+
+      .item_num {
+        color: #000000;
+        font-size: 36px;
+        font-weight: 600;
+      }
+
+      .imgs {
+        width: 30px;
+        height: 30px;
+      }
+    }
+    .active {
+      background: #EBF1F9;
+      border-radius: 16px;
+    }
+  }
+
+  .privateChat_box,
+  .groupChat_box {
+    width: 100%;
+    height: 514px;
+    background: #FFF;
+    border-radius: 0 0 16px 16px;
+    
+    #privateChat,
+    #groupChat {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .echarts_list {
+    width: 100%;
+    height: 256px;
+    background: #FFF;
+    border-radius: 8px;
+    margin-top: 24px;
+    display: flex;
+
+    #echarts1,
+    #echarts2,
+    #echarts3 {
+      flex: 1;
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/xbot/AppDataStatistics/components/sensitive.vue b/src/project/xbot/AppDataStatistics/components/sensitive.vue
new file mode 100644
index 00000000..a1c1fe96
--- /dev/null
+++ b/src/project/xbot/AppDataStatistics/components/sensitive.vue
@@ -0,0 +1,330 @@
+<template>
+  <div class="sensitive">
+    <div class="card">
+      <div class="item">
+        <div class="item_name">敏感词累计</div>
+        <div class="item_num">{{ Number(info.recordSum) }}</div>
+      </div>
+      <div class="item">
+        <div class="item_name">群聊敏感词</div>
+        <div class="item_num">{{ Number(info.groupRecordSum) }}</div>
+      </div>
+      <div class="item">
+        <div class="item_name">私聊敏感词</div>
+        <div class="item_num">{{ Number(info.personRecordSum) }}</div>
+        <!-- <img src="../img/down.png" alt="" class="imgs" v-show="info.personRecordSum !=0"> -->
+      </div>
+    </div>
+
+    <div class="head">
+      <span>群聊敏感词统计</span>
+    </div>
+    <div class="friends_box">
+      <div id="group" v-if="groupData.length > 0"></div>
+      <AiEmpty
+        style="padding-top: 10px"
+        description="暂无数据"
+        v-else
+      ></AiEmpty>
+    </div>
+
+    <div class="head">
+      <span>单聊敏感词统计</span>
+    </div>
+    <div class="groups_box">
+      <div id="user" v-if="userData.length > 0"></div>
+      <AiEmpty
+        style="padding-top: 10px"
+        description="暂无数据"
+        v-else
+      ></AiEmpty>
+    </div>
+
+    <div class="groups_box" v-if="wordData">
+      <div id="main"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import echarts from "echarts";
+import "echarts-wordcloud";
+
+export default {
+  name: "sensitive",
+  props: {
+    departmentId: String,
+  },
+  data() {
+    return {
+      info: {},
+      groupData: [],
+      userData: [],
+      wordData: [],
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      this.$http
+        .post(
+          `/app/appsessionarchivekeywordrecord/getKeywordRecordStatistic?departmentId=${this.departmentId}`
+        )
+        .then((res) => {
+          if (res?.data) {
+            this.info = { ...res.data };
+            var groupMonth = res.data.groupRecordListMap.map((e) => e.dateDay);
+            this.groupData = res.data.groupRecordListMap.map((e) => e.cnt);
+
+            var userMonth = res.data.personRecordListMap.map((e) => e.dateDay);
+            this.userData = res.data.personRecordListMap.map((e) => e.cnt);
+
+            res.data.wordNames.map((item) => {
+              var i = { name: item.wordName, value: item.wordCount };
+              this.wordData.push(i);
+            });
+            this.$nextTick(() => {
+              this.getGroupEcharts(groupMonth, this.groupData);
+              this.getUserEcharts(userMonth, this.userData);
+              if (this.wordData) {
+                this.getKeyWordEcharts(this.wordData);
+              }
+            });
+          }
+        });
+    },
+    getGroupEcharts(groupMonth, groupData) {
+      let groupDom = document.getElementById("group");
+      let groupChart = echarts.init(groupDom);
+      let option = {
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: {
+          type: "category",
+          data: groupMonth,
+          axisTick: {
+            show: false,
+          },
+        },
+        yAxis: {
+          type: "value",
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        grid: {
+          x: 50,
+          y: 50,
+        },
+        series: [
+          {
+            data: groupData,
+            type: "line",
+            lineStyle: {
+              color: "#3975C6", // 折线线条颜色
+            },
+            itemStyle: {
+              color: "#3975C6", // 折角颜色
+            },
+            areaStyle: {
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  // 渐变颜色
+                  {
+                    offset: 0,
+                    color: "#2891ff33",
+                  },
+                  {
+                    offset: 1,
+                    color: "#2891ff00",
+                  },
+                ],
+                global: false,
+              },
+            },
+          },
+        ],
+      };
+      option && groupChart.setOption(option);
+    },
+    getUserEcharts(userMonth, userData) {
+      let userDom = document.getElementById("user");
+      let userChart = echarts.init(userDom);
+      let option = {
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: {
+          type: "category",
+          data: userMonth,
+          axisTick: {
+            show: false,
+          },
+        },
+        yAxis: {
+          type: "value",
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        grid: {
+          x: 50,
+          y: 50,
+        },
+        series: [
+          {
+            data: userData,
+            type: "line",
+            lineStyle: {
+              color: "#3975C6", // 折线线条颜色
+            },
+            itemStyle: {
+              color: "#3975C6", // 折角颜色
+            },
+            areaStyle: {
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  // 渐变颜色
+                  {
+                    offset: 0,
+                    color: "#2891ff33",
+                  },
+                  {
+                    offset: 1,
+                    color: "#2891ff00",
+                  },
+                ],
+                global: false,
+              },
+            },
+          },
+        ],
+      };
+      option && userChart.setOption(option);
+    },
+    getKeyWordEcharts(data) {
+      var chart = echarts.init(document.getElementById("main"));
+
+      chart.setOption({
+        series: [
+          {
+            type: "wordCloud",
+            sizeRange: [15, 80],
+            rotationRange: [0, 0],
+            rotationStep: 45,
+            gridSize: 8,
+            shape: "pentagon",
+            width: "100%",
+            height: "100%",
+            textStyle: {
+              normal: {
+                color: function () {
+                  return (
+                    "rgb(" +
+                    [
+                      Math.round(Math.random() * 160),
+                      Math.round(Math.random() * 160),
+                      Math.round(Math.random() * 160),
+                    ].join(",") +
+                    ")"
+                  );
+                },
+                fontFamily: "sans-serif",
+                fontWeight: "normal",
+              },
+              emphasis: {
+                shadowBlur: 10,
+                shadowColor: "#333",
+              },
+            },
+            data,
+          },
+        ],
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.sensitive {
+  padding: 0 32px;
+  box-sizing: border-box;
+  .head {
+    margin-top: 32px;
+    span:first-child {
+      font-size: 32px;
+      color: #333333;
+      font-weight: 600;
+    }
+    span:last-child {
+      font-size: 26px;
+      color: #999999;
+    }
+  }
+
+  .card {
+    padding: 24px 0;
+    box-sizing: border-box;
+    display: flex;
+    text-align: center;
+    align-items: center;
+    background: #fff;
+    border-radius: 16px;
+    margin-top: 24px;
+
+    .item {
+      flex: 1;
+
+      .item_name {
+        color: #666666;
+      }
+
+      .item_num {
+        color: #000000;
+        font-size: 36px;
+        font-weight: 600;
+      }
+
+      .imgs {
+        width: 30px;
+        height: 30px;
+      }
+    }
+  }
+
+  .friends_box,
+  .groups_box {
+    margin-top: 24px;
+    width: 100%;
+    height: 514px;
+    background: #fff;
+
+    #user,
+    #group,
+    #main {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/xbot/AppDataStatistics/components/wechat.vue b/src/project/xbot/AppDataStatistics/components/wechat.vue
new file mode 100644
index 00000000..0adb4ad4
--- /dev/null
+++ b/src/project/xbot/AppDataStatistics/components/wechat.vue
@@ -0,0 +1,300 @@
+<template>
+  <div class="wechat">
+    <div class="head">
+      <span>居民好友统计</span><span>(统计数据为去重后的数据)</span>
+    </div>
+
+    <div class="card">
+      <div class="item">
+        <div class="item_name">居民好友</div>
+        <div class="item_num">{{ Number(friendsCard.customerTotal).toLocaleString('en-US') }}</div>
+      </div>
+      <div class="item">
+        <div class="item_name">昨日新增</div>
+        <div class="item_num">{{ Number(friendsCard.addCustomerCount).toLocaleString('en-US') }}
+          <img src="../img/up.png" alt="" class="imgs" v-show="friendsCard.addCustomerCount != 0">
+        </div>
+      </div>
+      <div class="item">
+        <div class="item_name">昨日流失</div>
+        <div class="item_num">{{ Number(friendsCard.removeCustomerCount).toLocaleString('en-US') }}
+          <img src="../img/down.png" alt="" class="imgs" v-show="friendsCard.removeCustomerCount !=0"></div>
+      </div>
+    </div>
+
+    <div class="friends_box">
+      <div id="friends" v-if="friendsData.length > 0"></div>
+      <AiEmpty style="padding-top: 10px;" description="暂无数据" v-else></AiEmpty>
+    </div>
+
+    <div class="head">
+      <span>居民群统计</span><span>(统计数据为去重后的数据)</span>
+    </div>
+
+    <div class="card">
+      <div class="item">
+        <div class="item_name">居民群</div>
+        <div class="item_num">{{ Number(groupsCard.groupSum).toLocaleString('en-US') }}</div>
+      </div>
+      <div class="item">
+        <div class="item_name">群成员</div>
+        <div class="item_num">{{ Number(groupsCard.totalSum).toLocaleString('en-US') }}</div>
+      </div>
+      <div class="item">
+        <div class="item_name">昨日新增</div>
+        <div class="item_num">{{ Number(groupsCard.increaseSum).toLocaleString('en-US') }}
+          <img src="../img/up.png" alt="" class="imgs" v-show="groupsCard.increaseSum"></div>
+      </div>
+      <div class="item">
+        <div class="item_name">昨日流失</div>
+        <div class="item_num">{{ Number(groupsCard.decreaseSum).toLocaleString('en-US') }}
+          <img src="../img/down.png" alt="" class="imgs" v-show="groupsCard.decreaseSum"></div>
+      </div>
+    </div>
+
+    <div class="groups_box">
+      <div id="groups" v-if="groupsData.length > 0"></div>
+      <AiEmpty style="padding-top: 10px;" description="暂无数据" v-else></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts';
+export default {
+  name: "wechat",
+  props: {
+    departmentId: String
+  },
+  data() {
+    return {
+      friendsCard: {},
+      friendsData: [],
+      friendsMonth: [],
+      friendsNumber: [],
+      groupsCard: {},
+      groupsData: [],
+      groupsMonth: [],
+      groupsNumber: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      // 居民好友
+      this.$http.post(`/app/wxgroupstatistic/getCustommerNumber?departmentId=${this.departmentId}`).then(res=> {
+        if(res?.data) {
+          this.friendsCard = res.data.居民统计
+          this.friendsData = res.data.居民好友数
+          this.friendsMonth = this.friendsData.map(e=> e.month)
+          this.friendsNumber = this.friendsData.map(e=> e.totalNumber)
+          this.$nextTick(()=> {
+            this.getFriendsEcharts(this.friendsMonth,this.friendsNumber)
+          })
+        }
+      })
+      // 居民群
+      this.$http.post(`/app/wxgroupstatistic/getGroupNumber?departmentId=${this.departmentId}`).then(res=> {
+        if(res?.data) {
+          this.groupsCard = res.data.居民群统计
+          this.groupsData = res.data.群成员数
+          this.groupsMonth = this.groupsData.map(e=> e.month)
+          this.groupsNumber = this.groupsData.map(e=> e.totalNumber)
+          this.$nextTick(()=> {
+            this.getGroupsEcharts(this.groupsMonth,this.groupsNumber)
+          })
+        }
+      })
+    },
+    getFriendsEcharts(friendsMonth,friendsNumber) {
+      let friendsDom = document.getElementById('friends');
+      let myFriendsChart = echarts.init(friendsDom);
+      let option = {
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: {
+          type: 'category',
+          data: friendsMonth,
+          axisTick: {
+            show: false,
+          }
+        },
+        yAxis: {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          }
+        },
+        grid:{
+          x:50,
+          y:50,
+	      },
+        series: [
+          {
+            data: friendsNumber,
+            type: 'line',
+            lineStyle: {
+              color: '#3975C6', // 折线线条颜色
+            },
+            itemStyle: {
+              color: '#3975C6', // 折角颜色
+            },
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [  // 渐变颜色
+                  {
+                    offset: 0,
+                    color: '#2891ff33',
+                  },
+                  {
+                    offset: 1,
+                    color: '#2891ff00',
+                  },
+                ],
+                global: false,
+              },
+            },
+          }
+        ]
+      };
+      option && myFriendsChart.setOption(option);
+    },
+    getGroupsEcharts(groupsMonth,groupsNumber) {
+      let groupsDom = document.getElementById('groups');
+      let myGroupsChart = echarts.init(groupsDom);
+      let option = {
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: {
+          type: 'category',
+          data: groupsMonth,
+          axisTick: {
+            show: false,
+          }
+        },
+        yAxis: {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          }
+        },
+        grid:{
+          x:50,
+          y:50,
+	      },
+        series: [
+          {
+            data: groupsNumber,
+            type: 'line',
+            lineStyle: {
+              color: '#3975C6', // 折线线条颜色
+            },
+            itemStyle: {
+              color: '#3975C6', // 折角颜色
+            },
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [  // 渐变颜色
+                  {
+                    offset: 0,
+                    color: '#2891ff33',
+                  },
+                  {
+                    offset: 1,
+                    color: '#2891ff00',
+                  },
+                ],
+                global: false,
+              },
+            },
+          }
+        ]
+      };
+      option && myGroupsChart.setOption(option);
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.wechat {
+  padding: 0 32px;
+  box-sizing: border-box;
+  .head {
+    margin-top: 32px;
+    span:first-child {
+      font-size: 32px;
+      color: #333333;
+      font-weight: 600;
+    }
+    span:last-child {
+      font-size: 26px;
+      color: #999999;
+    }
+  }
+
+  .card {
+    padding: 24px 0;
+    box-sizing: border-box;
+    display: flex;
+    text-align: center;
+    align-items: center;
+    background: #FFF;
+    border-radius: 16px;
+    margin-top: 24px;
+
+    .item {
+      flex: 1;
+
+      .item_name {
+        color: #666666;
+      }
+
+      .item_num {
+        color: #000000;
+        font-size: 36px;
+        font-weight: 600;
+      }
+
+      .imgs {
+        width: 30px;
+        height: 30px;
+      }
+    }
+  }
+
+  .friends_box,
+  .groups_box {
+    margin-top: 24px;
+    width: 100%;
+    height: 514px;
+    background: #FFF;
+    
+    #friends,
+    #groups {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/xbot/AppDataStatistics/img/down.png b/src/project/xbot/AppDataStatistics/img/down.png
new file mode 100644
index 00000000..4e2fa711
Binary files /dev/null and b/src/project/xbot/AppDataStatistics/img/down.png differ
diff --git a/src/project/xbot/AppDataStatistics/img/location.png b/src/project/xbot/AppDataStatistics/img/location.png
new file mode 100644
index 00000000..c6f04638
Binary files /dev/null and b/src/project/xbot/AppDataStatistics/img/location.png differ
diff --git a/src/project/xbot/AppDataStatistics/img/up.png b/src/project/xbot/AppDataStatistics/img/up.png
new file mode 100644
index 00000000..3f93b69f
Binary files /dev/null and b/src/project/xbot/AppDataStatistics/img/up.png differ
diff --git a/src/project/xbot/AppWorkOrder/Content.vue b/src/project/xbot/AppWorkOrder/Content.vue
index 8d49311a..ff345452 100644
--- a/src/project/xbot/AppWorkOrder/Content.vue
+++ b/src/project/xbot/AppWorkOrder/Content.vue
@@ -3,7 +3,11 @@
     <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/>
+          <!-- <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">
+            <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>
         </u-form-item>
         <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 1">
           <!-- <u-input v-model="forms.groupName" placeholder="请选择事件分类"  /> -->
@@ -52,7 +56,9 @@ export default {
         groupId: '',
         content: '',
         files: [],
-        name: ''
+        name: '',
+        handleUserId: '',
+        handleUserName: ''
       },
       flag: false,
       show: false,
@@ -97,8 +103,14 @@ export default {
       })
     },
 
+    handleSelectUser(e) {
+      this.forms.user = e
+      this.forms.handleUserId = e[0].id
+      this.forms.handleUserName = e[0].name
+    },
+
     confirm() {
-      if (this.status == 1 && !this.forms.name) {
+      if (this.status == 1 && !this.forms.handleUserName) {
         return this.$u.toast('请选择转交对象')
       }
       if (this.status != 1 && !this.forms.groupName) {
@@ -156,7 +168,7 @@ export default {
       this.forms.groupId = e[0].value
     },
     toSelectUser() {
-      uni.navigateTo({url: '../AppGridManagement/selectGridMember'})
+      uni.navigateTo({url: './SelectUser'})
     },
   },
 }
diff --git a/src/project/xbot/AppWorkOrder/Detail.vue b/src/project/xbot/AppWorkOrder/Detail.vue
index a82bf254..c4c80643 100644
--- a/src/project/xbot/AppWorkOrder/Detail.vue
+++ b/src/project/xbot/AppWorkOrder/Detail.vue
@@ -8,6 +8,7 @@
 
         <div class="times">{{ data.createTime }}</div>
       </div>
+      <span class="edit-btn" @click="toEdit()" v-if="data.eventStatus != 2 || data.eventStatus != 3">编辑</span>
     </div>
 
     <div class="header-middle">
@@ -104,7 +105,7 @@
         <div class="doIt" @click="doItShow = true">我来受理</div>
       </div>
 
-      <div class="endDoIt" v-if="data.eventStatus == 1 && data.rightType == 0" @click="toContent(3)">前往办理</div>
+      <div class="endDoIt" v-if="data.eventStatus == 1" @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>
@@ -137,7 +138,7 @@ export default {
       const getAvatar = str => str?.substring(str?.length, str?.length - 2)
       const list = this.data.processList.map(e => ({
         ...e,
-        avatar: getAvatar(e.girdMemberName),
+        avatar: getAvatar(e.userName),
         statusLabel: this.$dict.getLabel('clapDoStatus', e.doStatus)
       }))
       if (this.evaluation.id) {
@@ -196,6 +197,9 @@ export default {
         current: img
       })
     },
+    toEdit() {
+      uni.navigateTo({url: `./Edit?id=${this.id}`})
+    }
   },
 }
 </script>
@@ -213,6 +217,7 @@ uni-page-body {
     display: flex;
     margin: 26px 0 14px 0;
     padding: 0 32px;
+    position: relative;
 
     .avatars {
       width: 80px;
@@ -239,6 +244,17 @@ uni-page-body {
         color: #999999;
       }
     }
+
+    .edit-btn {
+      position: absolute;
+      color: #197df0;
+      top: 16px;
+      right: 32px;
+      width: 150px;
+      height: 44px;
+      line-height: 44px;
+      text-align: right;
+    }
   }
 
   .header-middle {
diff --git a/src/project/xbot/AppWorkOrder/Edit.vue b/src/project/xbot/AppWorkOrder/Edit.vue
new file mode 100644
index 00000000..9e864a20
--- /dev/null
+++ b/src/project/xbot/AppWorkOrder/Edit.vue
@@ -0,0 +1,253 @@
+<template>
+  <div class="Edit">
+    <div class="contents">
+      <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
+        <u-form-item label="事件描述" prop="content" required :border-bottom="false" label-position="top" class="contents">
+          <u-input v-model="forms.content" placeholder="请输入事件描述..." type="textarea" auto-height height="100" maxlength="500"/>
+        </u-form-item>
+        <u-form-item label="事件类型" prop="flName" required :border-bottom="false" right-icon="arrow-right">
+          <span @click="show = true" class="right-span" :style="forms.flName ? '' : 'color:#999;'">{{ forms.flName || '请选择事件类型' }}</span>
+          <u-select v-model="show" :list="flList" value-name="id" label-name="groupName" @confirm="selectFl"></u-select>
+        </u-form-item>
+        <div class="line"></div>
+        <u-form-item label="所属网格" prop="girdName" required :border-bottom="false">
+          <AiPagePicker type="gird" v-model="forms.girdId" @change="confirmGird" valueObj nodeKey="id" formType="2" class="right-span">
+            <AiMore v-model="forms.girdName" placeholder="请选择所属网格"/>
+          </AiPagePicker>
+        </u-form-item>
+        <u-form-item label="联系方式" prop="phone" required :border-bottom="false" >
+          <u-input v-model="forms.phone" placeholder="请输入联系方式" />
+        </u-form-item>
+        <u-form-item label="上报位置" prop="mapInfo" required :border-bottom="false" right-icon="arrow-right" class="border">
+          <span @click="toMap" class="right-span" :style="forms.mapInfo.address ? '' : 'color:#999;'">{{ forms.mapInfo.address || '请选择上报位置' }}</span>
+        </u-form-item>
+        <div class="line"></div>
+        <u-form-item label="图片上传(最多9张)" prop="files" :border-bottom="false" class="avatars" label-position="top">
+          <AiUploader :def.sync="forms.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+        </u-form-item>
+
+        <div class="line"></div>
+
+      </u-form>
+    </div>
+
+    <div class="btn" @click="confirm">
+      <span>提交</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+export default {
+  name: 'Edit',
+  data() {
+    return {
+      forms: {
+        groupName: '',
+        groupId: '',
+        content: '',
+        mapInfo: {address: ''},
+        girdId: '',
+        girdName: '',
+        files: [],
+        name: '',
+        phone: ''
+      },
+      flag: false,
+      show: false,
+      flList: [],
+      id: ''
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.id = option.id
+    this.typeList()
+  },
+  onShow() {
+    document.title = '事件编辑'
+    this.forms.name = this.user.name
+    this.forms.phone = this.user.phone
+    this.forms.girdId = this.user.girdId
+    this.forms.girdName = this.user.girdName
+    uni.$on('chooseLat', res => {
+      this.forms.mapInfo = {...res}
+    })
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appsessionarchivereportinfo/queryDetailById?id=${this.id}`).then((res) => {
+        if (res?.data) {
+          this.forms = res.data
+          this.forms.mapInfo = {
+            lat: res.data.lat,
+            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.$forceUpdate()
+          this.getDetail()
+        }
+      })
+    },
+    selectFl(e) {
+      this.forms.flName = e[0].label
+      this.forms.flId = e[0].value
+    },
+    confirmGird(v) {
+      this.forms.girdId = v.id
+      this.forms.girdName = v.girdName
+    },
+    toMap() {
+      uni.navigateTo({url: `./Map`})
+    },
+    confirm() {
+      if(this.flag) return
+
+      if (!this.forms.content) {
+        return this.$u.toast('请输入事件描述')
+      }
+      if (!this.forms.flName) {
+        return this.$u.toast('请选择事件类型')
+      }
+      
+      // if (!this.forms.mapInfo.address) {
+      //   return this.$u.toast('请选择上报位置')
+      // }
+      // if (!this.forms.girdName) {
+      //   return this.$u.toast('请选择所属网格')
+      // }
+      // if (!this.forms.name) {
+      //   return this.$u.toast('请输入姓名')
+      // }
+      // if (!this.forms.phone) {
+      //   return this.$u.toast('请输入手机号')
+      // }
+      this.flag = true
+      this.$http.post(`/app/appsessionarchivereportinfo/update`, {...this.forms, ...this.forms.mapInfo}).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('事件编辑成功')
+          uni.$emit('getListInit')
+          uni.$emit('updateDeatil')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600)
+        }
+      })
+
+    },
+
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.Edit {
+  height: 100%;
+
+  .contents {
+    padding-bottom: 140px;
+
+    ::v-deep .u-form {
+      .u-form-item {
+        // padding: 0 45px !important;
+
+        .u-form-item__body {
+          .u-form-item--right__content__slot {
+            padding-bottom: 0;
+
+            .u-input {
+              text-align: right !important;
+            }
+          }
+        }
+      }
+
+      .u-form-item:first-child {
+        .u-form-item__body {
+          border-bottom: 1px solid #ddd;
+        }
+      }
+
+      .line {
+        height: 24px;
+        background: #f3f6f9;
+      }
+
+      .contents {
+        padding-bottom: 20px !important;
+
+        .u-form-item__body {
+          .u-form-item--right__content__slot {
+            .u-input {
+              text-align: left !important;
+            }
+          }
+        }
+      }
+
+      .avatars {
+        padding-bottom: 20px !important;
+
+        .u-form-item__body {
+          // .default {
+          //   width: 160px;
+          //   height: 160px;
+          // }
+        }
+      }
+    }
+  }
+
+  .border {
+    ::v-deep .u-form-item__body {
+      border-bottom: 1px solid #ddd;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    box-sizing: border-box;
+    background: #3975c6;
+    padding: 34px 0;
+    text-align: center;
+    font-size: 32px;
+    font-weight: 500;
+    color: #ffffff;
+  }
+
+  .right-span {
+    display: inline-block;
+    width: 100%;
+    text-align: right;
+
+    ::v-deep .u-icon__label {
+      font-size: 28px!important;
+    }
+
+    ::v-deep .uicon-arrow-right{
+      color: #c0c4cc!important;
+    }
+  }
+  ::v-deep .uni-input-placeholder {
+    color: #999!important;
+    font-size: 28px!important;
+  }
+}
+</style>
diff --git a/src/project/xbot/AppWorkOrder/Map.vue b/src/project/xbot/AppWorkOrder/Map.vue
new file mode 100644
index 00000000..9e6e379b
--- /dev/null
+++ b/src/project/xbot/AppWorkOrder/Map.vue
@@ -0,0 +1,333 @@
+<template>
+  <div class="map">
+    <!-- <div class="build-btn locate" @click="getLocale">
+      <img src="https://cdn.cunwuyun.cn/dvcp/h5/Location2.png" alt=""/>
+      当前<br>位置
+    </div> -->
+    <div class="address-search">
+      <div class="address-search__wrapper">
+        <image src="./components/img/search.png" />
+        <input placeholder-style="color: #98A6B6" placeholder="搜索地点" v-model="address" @input="onChange">
+      </div>
+    </div>
+    <scroll-view scroll-y scroll-into-view="address-item1" v-if="addressList.length">
+      <div class="address-item" :id="'address-item' + index" v-for="(item, index) in addressList" :key="index" @click="chooseAddress(index)">
+        <div class="left">
+          <h2>{{ item.title }}</h2>
+          <p>{{ item.address }}</p>
+        </div>
+        <!-- <div class="right" :class="[currIndex === index ? 'active' : '']"></div> -->
+      </div>
+    </scroll-view>
+    <div class="map-content">
+      <AiTMap :map.sync="map" :lib.sync="lib" :ops="ops" :libraries="['service', 'tools', 'geocoder']"/>
+    </div>
+    <div class="footer">
+      <div class="btn" @click="confirm">确认定位</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState, mapActions} from 'vuex'
+
+export default {
+  data() {
+    return {
+      ops: {},
+      lib: null,
+      map: null,
+      markerLayer: '',
+      isFlag: false,
+      latLng: {lat: '', lng: ''},
+      address: '',
+      addressList: []
+    }
+  },
+  computed: {...mapState(['user'])},
+  mounted() {
+    this.initMap()
+  },
+  onShow() {
+    document.title = "选择上报位置"
+  },
+  methods: {
+    ...mapActions(['injectJWeixin']),
+    initMap(retryTimes = 0) {  //初始化地图
+      this.$nextTick(() => {
+        let {map} = this
+        if (map) {
+          map.setZoom(15)
+          map.on("click", (evt) => {
+            this.handleMapClick(evt)
+          });
+        } else {
+          if (retryTimes < 10)
+            setTimeout(() => {
+              this.initMap(++retryTimes)
+            }, 500)
+          else console.error("地图渲染失败")
+        }
+      })
+    },
+    onChange () {
+      if (this.timeout) {
+        clearTimeout(this.timeout)
+      }
+      this.timeout = setTimeout(() => {
+        this.currIndex = -1
+        new this.lib.service.Suggestion({
+          pageSize: 20
+        }).getSuggestions({
+          keyword: this.address
+        }).then(res => {
+          this.addressList = []
+          if (res.data.length) {
+            this.addressList = res.data
+          }
+        })
+      }, 500)
+    },
+    getAddress () {
+      new this.lib.service.Search({
+        pageSize: 20
+      }).explore({
+        center: this.latLng,
+        radius: 2000,
+        orderBy: '_distance'
+      }).then(res => {
+        this.addressList = []
+        if (res.data.length) {
+          this.addressList = res.data
+        }
+      })
+    },
+    chooseAddress (index) {
+      this.address = this.addressList[index].address
+      this.latLng = {lat: this.addressList[index].location.lat, lng: this.addressList[index].location.lng}
+      this.addMarker(this.addressList[index].location)
+    },
+    addMarker (position) {
+      if (this.marker) {
+        this.marker.setMap(null)
+        this.marker = null
+      }
+      this.marker = new this.lib.MultiMarker({
+        id: 'marker-layer',
+        map: this.map,
+        styles: {
+          marker: new this.lib.MarkerStyle({
+            width: 30,
+            height: 45,
+            anchor: { x: 10, y: 30 }
+          }),
+        },
+        geometries: [{
+          id: 'marker',
+          styleId: 'marker',
+          position: position,
+          properties: {
+            title: 'marker'
+          }
+        }]
+      })
+      this.easeTo(position)
+    },
+
+    easeTo (position) {
+      this.map.easeTo({
+        center: position,
+        zoom: 17
+      },
+      { duration: 500 })
+    },
+    handleMapClick(evt) {
+      console.log(evt)
+      let {lib: TMap, map} = this
+      if (this.markerLayer) {
+        this.markerLayer.setMap(null);
+      }
+      this.markerLayer = new TMap.MultiMarker({id: 'marker-layer', map});
+      this.markerLayer.add({
+        position: evt.latLng
+      });
+      this.latLng = evt.latLng
+
+      // var geocoder = new TMap.geocoder({
+      //   city: "全国",
+      //   radius: 1000 //范围，默认：500
+      // });
+      // geocoder.getAddress(this.latLng, function(status, result) {
+      //   if (status === 'complete'&&result.regeocode) {
+      //     var address = result.regeocode.formattedAddress;
+      //     this.address = address
+      //     console.log(this.address)
+      //   }else{
+      //     log.error('根据经纬度查询地址失败')
+      //   }
+      // })
+
+      // this.address = evt.poi.name
+    },
+    confirm() {
+      if (!this.latLng.lat) {
+        return this.$u.toast(`未获取到定位信息，无法定位`)
+      }
+
+      uni.$emit('chooseLat', {
+        lat: this.latLng.lat,
+        lng: this.latLng.lng, 
+        address: this.address
+      })
+      uni.navigateBack({
+        delta: 1
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+uni-page-body {
+  height: 100%;
+}
+
+.map {
+  height: 100vh;
+
+  .build-btn {
+    width: 80px;
+    height: 160px;
+    background: #FFF;
+    box-shadow: 0 4px 8px 0 rgba(138, 138, 138, 0.5);
+    border-radius: 8px;
+    position: fixed;
+    bottom: 136px;
+    right: 24px;
+    z-index: 99999;
+    padding: 16px 16px 0;
+    box-sizing: border-box;
+    font-size: 24px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #666;
+    line-height: 30px;
+
+    &.locate {
+      transform: translateY(calc(-100% - 20px));
+    }
+
+    img {
+      width: 48px;
+      height: 48px;
+      margin-bottom: 8px;
+    }
+  }
+
+  .map-content {
+    width: 100%;
+    height: 100%;
+  }
+
+  .footer {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 99999;
+    display: flex;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+
+    .click {
+      flex: 1;
+      color: #333;
+      background-color: #fff;
+    }
+
+    .btn {
+      flex: 2;
+      background: #1365DD;
+      color: #FFF;
+    }
+  }
+  .address-search {
+    display: flex;
+    align-items: center;
+    height: 100px;
+    padding: 0 32px;
+
+    .address-search__wrapper {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      height: 72px;
+      padding: 0 32px;
+      background: #F6F7F9;
+      border-radius: 36px;
+
+      image {
+        width: 48px;
+        height: 48px;
+      }
+
+      input {
+        flex: 1;
+        font-size: 26px;
+        color: #333;
+      }
+    }
+  }
+  scroll-view {
+    height: 400px;
+    padding: 0 32px;
+
+    .address-item {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 32px 0;
+      border-bottom: 1px solid #EEEEEE;
+
+      &:last-child {
+        border: none;
+      }
+
+      .left {
+        flex: 1;
+        margin-right: 20px;
+      }
+
+      .right {
+        flex-shrink: 1;
+        width: 32px;
+        height: 32px;
+        border-radius: 50%;
+        border: 4px solid #CCCCCC;
+        transition: all ease 0.3s;
+
+        &.active {
+          border: 10px solid #1365DD;
+        }
+      }
+
+      h2 {
+        margin-bottom: 20px;
+        color: #222222;
+        font-weight: 600;
+        font-size: 34px;
+      }
+
+      p {
+        line-height: 1.2;
+        color: #999999;
+        font-size: 28px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/xbot/AppWorkOrder/SelectUser.vue b/src/project/xbot/AppWorkOrder/SelectUser.vue
deleted file mode 100644
index 0389c29f..00000000
--- a/src/project/xbot/AppWorkOrder/SelectUser.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<template>
-  <div class="SelectUser">
-    <div class="header-middle">
-      <div class="hint">
-        <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span style="color:#3F8DF5" @click="girdNameClick(item, index)">{{item.girdName}}</span></span>
-      </div>
-
-      <div class="showTypes" v-if="!userList.length">
-        <div v-if="treeList.length > 0">
-          <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
-            <div class="imges">
-              <span v-if="item.girdLevel == 2">
-                <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
-                <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />
-              </span>
-              <img src="./components/img/gird--select-icon.png" alt="" class="avatras" />
-            </div>
-            <div class="rightes">
-              <div class="applicationNames">{{ item.girdName }}</div>
-              <img src="./components/img/right-icon.png" alt="" class="imgs" />
-            </div>
-          </div>
-        </div>
-
-        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
-      </div>
-
-      <div class="showUsers" v-else>
-        <div v-if="userList.length > 0">
-          <div class="cards" v-for="(e, index) in userList" :key="index">
-            <div class="imges">
-              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)" />
-              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)" />
-
-              <img src="./components/img/tx@2x.png" alt="" class="avatras" />
-            </div>
-
-            <div class="rights">
-              <div class="applicationNames">{{ e.name }}</div>
-              <div class="idNumbers">{{ e.phone }}</div>
-            </div>
-          </div>
-        </div>
-
-        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
-      </div>
-    </div>
-
-    <div class="subBtn" @click="submit">
-      <div>确定选择</div>
-    </div>
-
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'SelectUser',
-  data() {
-    return {
-      selectUser: {},
-      allData: null,
-      treeList: [],
-      slectList: [],
-      userList: [],
-    }
-  },
-  onLoad() {
-    this.getTree()
-  },
-  onShow() {
-    document.title = '选择人员'
-  },
-  methods: {
-    getTree() {
-      this.slectList = []
-      this.$http.post('/app/appgirdinfo/listAllByTop').then((res) => {
-        if (res?.data) {
-          this.allData = res.data
-          this.treeInit()
-        }
-      })
-    },
-
-    treeInit() {
-      if(this.allData[0].girdLevel == 2) {
-        if(this.allData[0].girdMemberList && this.allData[0].girdMemberList.length) {
-            this.userList = this.allData[0].girdMemberList
-            this.userList.map((item) => {
-            item.isChecked = false
-          })
-        }
-      }else {
-        this.treeList = this.allData[0].girdList
-      }
-      var obj = {
-        girdName: this.allData[0].girdName,
-        id: this.allData[0].id,
-        girdLevel: this.allData[0].girdLevel
-      }
-      this.slectList.push(obj)
-    },
-
-    itemClick(row) {
-      console.log(row)
-      var obj = {
-        girdName: row.girdName,
-        id: row.id,
-        girdLevel: row.girdLevel
-      }
-      this.slectList.push(obj)
-      this.searckGird(row)
-    },
-
-    searckGird(row) {
-      this.treeList = []
-      if(row.girdLevel != 2) { //查网格
-        this.$http.post(`/app/appgirdinfo/list?parentGirdId=${row.id}&size=999`).then((res) => {
-          if (res?.data) {
-            this.treeList = res.data.records
-          }
-        })
-      }else { //查网格员
-        this.userList = []
-        this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
-          if (res?.data) {
-            this.userList = res.data
-            this.userList.map((item) => {
-              item.isChecked = false
-            })
-          }
-        })
-      }
-    },
-
-    girdNameClick(row, index) {
-      this.userList = []
-      if(!index) { //第一级别
-        this.slectList = []
-        this.treeInit()
-      }else {
-        var list = []
-        this.slectList.map((item, i) => {
-          if(i <= index) {
-            list.push(item)
-          }
-        })
-        this.slectList = list
-        this.searckGird(row)
-      }
-    },
-    
-
-    girdClick(row, index) {
-      if (this.treeList[index].isChecked) {//取消
-        this.treeList[index].isChecked = false
-        this.selectUser = {}
-      } else {
-        this.treeList.map((item) => {
-          item.isChecked = false
-        })
-        this.treeList[index].isChecked = true
-        this.selectUser = row
-      }
-      this.$forceUpdate()
-    },
-
-    userClick(row, index) {
-      if (this.userList[index].isChecked) {//取消
-        this.userList[index].isChecked = false
-        this.selectUser = {}
-      } else {
-        this.userList.map((item) => {
-          item.isChecked = false
-        })
-        this.userList[index].isChecked = true
-        this.selectUser = row
-      }
-      this.$forceUpdate()
-    },
-
-    submit() {
-      if (this.selectUser.id != null) {
-        uni.$emit('goback', this.selectUser)
-        uni.navigateBack()
-      } else {
-        return this.$u.toast('请选择网格或网格员')
-      }
-    },
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.SelectUser {
-  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: 0px 1px 0px 0px #e4e5e6;
-      font-size: 30px;
-      font-weight: 500;
-      word-break: break-all;
-    }
-
-    .showTypes {
-      .empty-div {
-        height: 16px;
-        background: #f5f5f5;
-      }
-
-      .cards {
-        display: flex;
-        align-items: center;
-        height: 120px;
-        line-height: 120px;
-        // background: pink;
-        padding: 0 0 0 32px;
-
-        .imges {
-          display: flex;
-          align-items: center;
-          // width: 200px;
-          .imgselect {
-            width: 48px;
-            height: 48px;
-            vertical-align: middle;
-          }
-
-          .avatras {
-            width: 74px;
-            height: 74px;
-            border-radius: 8px;
-            margin-left: 36px;
-          }
-        }
-        img {
-          width: 74px;
-          height: 74px;
-          border-radius: 8px;
-        }
-        .rightes {
-          width: 100%;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin-left: 32px;
-          border-bottom: 1px solid #e4e5e6;
-          .applicationNames {
-            font-size: 36px;
-            font-weight: 500;
-            color: #333333;
-          }
-          .imgs {
-            width: 40px;
-            height: 40px;
-            margin-right: 20px;
-          }
-        }
-      }
-    }
-
-    .showUsers {
-      .cards {
-        display: flex;
-        align-items: center;
-        height: 120px;
-        line-height: 120px;
-        // background: pink;
-        padding: 0 0 0 32px;
-
-        .imges {
-          display: flex;
-          align-items: center;
-          width: 200px;
-          .imgselect {
-            width: 48px;
-            height: 48px;
-          }
-
-          .avatras {
-            width: 74px;
-            height: 74px;
-            border-radius: 8px;
-            margin-left: 36px;
-          }
-        }
-
-        .rights {
-          width: 100%;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin-left: 32px;
-          border-bottom: 1px solid #e4e5e6;
-          padding-right: 40px;
-          .applicationNames {
-            font-size: 36px;
-            font-weight: 500;
-            color: #333333;
-          }
-          .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;
-    }
-  }
-}
-</style>
diff --git a/src/project/xbot/AppWorkOrder/components/img/search.png b/src/project/xbot/AppWorkOrder/components/img/search.png
new file mode 100644
index 00000000..601a7b3c
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/components/img/search.png differ