diff --git a/src/project/lulong/AppHandSnapshot/Add.vue b/src/project/lulong/AppHandSnapshot/Add.vue
index 0c80136f..62556ade 100644
--- a/src/project/lulong/AppHandSnapshot/Add.vue
+++ b/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
diff --git a/src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue b/src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue
index 2eef94c8..1d8f817b 100644
--- a/src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue
+++ b/src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue
@@ -24,7 +24,7 @@ export default {
   appName: '巡查上报',
   data() {
     return {
-      component: 'List',
+      component: 'Statistics',
       params: {},
       refresh: true,
       tabIndex: 0,
diff --git a/src/project/lulong/AppHandSnapshot/Content.vue b/src/project/lulong/AppHandSnapshot/Content.vue
index fdba5ef6..8b879394 100644
--- a/src/project/lulong/AppHandSnapshot/Content.vue
+++ b/src/project/lulong/AppHandSnapshot/Content.vue
@@ -66,8 +66,8 @@ export default {
   onLoad(option) {
     this.status = option.status
     this.id = option.id
-    this.forms.groupId = option.groupId
-    this.forms.groupName = option.groupName
+    // this.forms.groupId = option.groupId
+    // this.forms.groupName = option.groupName
     this.typeList()
     uni.$on('goback', (res) => {
       this.selectUser = res
@@ -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}
       }
diff --git a/src/project/lulong/AppHandSnapshot/Detail.vue b/src/project/lulong/AppHandSnapshot/Detail.vue
index 923c00ce..088392a9 100644
--- a/src/project/lulong/AppHandSnapshot/Detail.vue
+++ b/src/project/lulong/AppHandSnapshot/Detail.vue
@@ -169,11 +169,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
         }
diff --git a/src/project/lulong/AppHandSnapshot/List.vue b/src/project/lulong/AppHandSnapshot/List.vue
index 35640deb..4202096e 100644
--- a/src/project/lulong/AppHandSnapshot/List.vue
+++ b/src/project/lulong/AppHandSnapshot/List.vue
@@ -89,7 +89,7 @@ export default {
   onLoad() {
   },
   onShow() {
-    document.title = '事件上报'
+    document.title = '巡查上报'
     this.searchGrid.girdId = this.user.girdId
     this.searchGrid.girdName = this.user.girdName
     this.current = 1
@@ -111,7 +111,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, 
diff --git a/src/project/lulong/AppHandSnapshot/Map.vue b/src/project/lulong/AppHandSnapshot/Map.vue
index d73d4269..e22678ac 100644
--- a/src/project/lulong/AppHandSnapshot/Map.vue
+++ b/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) {
diff --git a/src/project/lulong/AppHandSnapshot/SelectUser.vue b/src/project/lulong/AppHandSnapshot/SelectUser.vue
index ebf3075a..cc09a1fd 100644
--- a/src/project/lulong/AppHandSnapshot/SelectUser.vue
+++ b/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()
diff --git a/src/project/lulong/AppHandSnapshot/Statistics.vue b/src/project/lulong/AppHandSnapshot/Statistics.vue
index 66f9c01f..62dffa32 100644
--- a/src/project/lulong/AppHandSnapshot/Statistics.vue
+++ b/src/project/lulong/AppHandSnapshot/Statistics.vue
@@ -1,72 +1,48 @@
 <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">
+          <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"></div>
+        <div class="num">98.26%</div>
+      </div>
+
+      <div class="info-content">
+        <div class="title">巡查上报趋势图</div>
+        <div class="echart-content" id="trend"></div>
+      </div>
+
+      <div class="info-content">
+        <div class="title">巡查事件分类
+          <div class="type-select" :style="groupInfo.groupName ? '' : 'color:#999;'" @click="show=true">{{groupInfo.groupName || '请选择'}}<u-icon name="arrow-right"></u-icon></div>
+          <u-select v-model="show" :list="typeList" value-name="id" label-name="groupName" @confirm="selectStatus"></u-select>
+        </div>
+        <div class="echart-content" id="type"></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() {
@@ -76,83 +52,233 @@ export default {
       pageShow: false,
       showSelect: false,
       myGirdList: [],
-      girdName: '全部网格'
+      girdName: '全部网格',
+      selectGird: {},
+      finishChart: null,
+      trendChart: null,
+      typeChart: null,
+      typeList: [],
+      show: false,
+      groupInfo: {groupId: '', groupName: ''}
     }
   },
+  computed: {
+    ...mapState(['user']),
+  },
+  
   mounted() {
-    this.girdList()
+    this.selectGird.girdName = this.user.girdName
+    this.selectGird.girdId = this.user.girdId
     this.getStatistics()
+    this.getTypeList()
   },
   methods: {
     getStatistics() {
       this.$http.post('/app/appresidentreportinfo/countByGirdMember').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) => {
-            var info = {
-              label: key,
-              value: res.data.todayCountMap[key]
-            }
-            this.todayList.push(info)
+          this.$nextTick(() => {
+            this.chartInit()
           })
-          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)
-            })
-          }
+          // 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) => {
+          //   var info = {
+          //     label: key,
+          //     value: res.data.todayCountMap[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)
+          //   })
+          // }
         }
         this.pageShow = true
       })
     },
 
-    goDetail(item) {
-      uni.navigateTo({ url: `./Detail?id=${item.id}` })
+    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: [
+              { value: 100, name: '吸毒人员100' },
+              { value: 150, name: '高龄老人150' },
+              { value: 80, name: '刑满释放人员80' },
+              { value: 84, name: '退伍军人84' },
+            ],
+            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: ['4月', '5月', '6月', '7月', '8月',]
+        },
+        yAxis: {
+          axisLine:{       //y轴
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
+          type: 'value',
+          minInterval: 50,
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        series: [
+          {
+            data: [155, 130, 120, 160, 120, 130, 110],
+            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: [
+              { value: 100, name: '男100' },
+              { value: 100, name: '女100' },
+            ],
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)',
+              }
+            }
+          }
+        ]
+      };
+      this.typeChart.setOption(option3)
     },
 
-    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, {
+    getTypeList() {
+      this.$http.post(`/app/apppatrolreportgroup/list`, null, {
         params: {
           size: 9999,
         },
       })
       .then((res) => {
         if (res.code == 0) {
-          this.myGirdList = res.data
-          var all = {
-            id: '',
-            girdName: '全部'
-          }
-          this.myGirdList.unshift(all)
+          this.typeList = res.data.records
+          this.$forceUpdate()
         }
       })
     },
-    confirm(e) {
 
-    }
+    selectStatus(e) {
+      this.groupInfo.groupName = e[0].label
+      this.groupInfo.groupId = e[0].value
+    },
   },
 }
 </script>
@@ -160,27 +286,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 +310,7 @@ export default {
     background: #FFF;
     border-radius: 16px;
     margin-bottom: 24px;
+    position: relative;
     .title{
       font-size: 32px;
       font-family: PingFangSC-Regular, PingFang SC;
@@ -200,6 +323,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 +355,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: 600px;
     }
-    .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: 364px;
+      margin-left: -100px;
+      font-size: 40px;
+      font-weight: 600;
+      width: 200px;
+      text-align: center;
     }
   }
   .pad-b120{
diff --git a/src/project/xbot/AppWorkOrder/Content.vue b/src/project/xbot/AppWorkOrder/Content.vue
index 2538a521..156d5b0e 100644
--- a/src/project/xbot/AppWorkOrder/Content.vue
+++ b/src/project/xbot/AppWorkOrder/Content.vue
@@ -4,7 +4,7 @@
       <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="sysUser" single :isShowPhone="true" :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>
@@ -171,7 +171,7 @@ export default {
       this.forms.type = e[0].value
     },
     toSelectUser() {
-      uni.navigateTo({url: './SelectUser'})
+      uni.navigateTo({url: './SelectDeptUser'})
     },
   },
 }
diff --git a/src/project/xbot/AppWorkOrder/Edit.vue b/src/project/xbot/AppWorkOrder/Edit.vue
index 17a861f5..c3f1899a 100644
--- a/src/project/xbot/AppWorkOrder/Edit.vue
+++ b/src/project/xbot/AppWorkOrder/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: {
@@ -86,20 +90,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 +106,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 +136,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('事件编辑成功')
diff --git a/src/project/xbot/AppWorkOrder/SelectDeptUser.vue b/src/project/xbot/AppWorkOrder/SelectDeptUser.vue
new file mode 100644
index 00000000..31685974
--- /dev/null
+++ b/src/project/xbot/AppWorkOrder/SelectDeptUser.vue
@@ -0,0 +1,323 @@
+<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}" @click.stop="itemCheck(item, 'dept')"/>
+          <img src="./images/gird--select-icon.png" alt="" class="avatras"/>
+        </div>
+        <div class="rightes">
+          <div class="applicationNames">{{ item.name }}</div>
+          <img src="./images/right-icon.png" alt="" class="imgs"/>
+        </div>
+      </div>
+      <div v-if="type == 0">
+        <div class="userCards" v-for="e in userList" :key="e.id">
+          <div class="imges">
+            <div class="imgselect" :class="{checked:e.isChecked}" @click.stop="itemCheck(e, 'user')"/>
+            <img src="./images/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: null,
+    }
+  },
+  computed: {
+    hasData() {
+      return this.treeList?.length > 0 || this.userList?.length > 0
+    },
+    ...mapState(['user'])
+  },
+  onLoad(o) {
+    // this.type = o.selectTtype.split('?')[0]
+    this.type = 0
+    if(this.type == 1) {  //选择发送范围部门
+      this.getAllDepts()
+      this.selected = uni.getStorageSync('deptList') || []
+    }else {  //选择审批人
+      this.getListAll()
+      this.selected = uni.getStorageSync('selectDeptUser') || []
+    }
+  },
+  methods: {
+    isSelected(id, corpId) {
+      return !!this.selected.find(e => e.id == id && e.corpId == corpId)
+    },
+    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, e.corpId)}))
+          this.deptInit()
+        }
+      })
+    },
+    getAllDepts() {
+      // 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, e.corpId)}))
+      //     this.deptInit()
+      //   }
+      // })
+
+      this.$http.post(`/app/wxcp/wxdepartment/listAll?wxMainDepartmentId=${this.user.wxMainDepartmentId}`).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, e.corpId)}))
+          this.deptInit()
+        }
+      })
+    },
+    deptInit() {
+      if(this.type == 1) {  //选择发送范围部门
+        this.treeList = this.allData.filter(e => e.id == this.user.wxMainDepartmentId)
+      }else {  //选择审批人
+        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) {
+      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() {
+      console.log([this.selected].flat())
+      if(this.type == 1) {  //选择部门
+      if(![this.selected].flat().length) {
+          return this.$u.toast('请选择部门')
+        }
+        uni.setStorageSync('deptList', [this.selected].flat())
+      }else {  //选择人
+        if(![this.selected].flat().length) {
+          return this.$u.toast('请选择审核人员')
+        }
+        uni.$emit("pagePicker:custom", [this.selected].flat())
+        // uni.setStorageSync('selectDeptUser', [this.selected].flat())
+      }
+      uni.navigateBack()
+    },
+  }
+}
+</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("./images/xz.png");
+        background-position: center;
+        background-size: 100% 100%;
+
+        &.checked {
+          background-image: url("./images/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>
diff --git a/src/project/xbot/AppWorkOrder/images/files.png b/src/project/xbot/AppWorkOrder/images/files.png
new file mode 100644
index 00000000..10d53502
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/files.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/gird--select-icon.png b/src/project/xbot/AppWorkOrder/images/gird--select-icon.png
new file mode 100644
index 00000000..205144d2
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/gird--select-icon.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/local-icon.png b/src/project/xbot/AppWorkOrder/images/local-icon.png
new file mode 100644
index 00000000..3e23aff6
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/local-icon.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/pass.png b/src/project/xbot/AppWorkOrder/images/pass.png
new file mode 100644
index 00000000..36f698b2
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/pass.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/refuse.png b/src/project/xbot/AppWorkOrder/images/refuse.png
new file mode 100644
index 00000000..af15b9e5
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/refuse.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/right-icon.png b/src/project/xbot/AppWorkOrder/images/right-icon.png
new file mode 100644
index 00000000..e1c626b7
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/right-icon.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/shaixuan.png b/src/project/xbot/AppWorkOrder/images/shaixuan.png
new file mode 100644
index 00000000..88015ea5
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/shaixuan.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/tx@2x.png b/src/project/xbot/AppWorkOrder/images/tx@2x.png
new file mode 100644
index 00000000..d9620e08
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/tx@2x.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/xz.png b/src/project/xbot/AppWorkOrder/images/xz.png
new file mode 100644
index 00000000..98f78cda
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/xz.png differ
diff --git a/src/project/xbot/AppWorkOrder/images/xzh.png b/src/project/xbot/AppWorkOrder/images/xzh.png
new file mode 100644
index 00000000..967fa399
Binary files /dev/null and b/src/project/xbot/AppWorkOrder/images/xzh.png differ