diff --git a/src/apps/AppWorkOrderXbot/AppWorkOrderXbot.vue b/src/apps/AppWorkOrderXbot/AppWorkOrderXbot.vue
index 6139a73e..5e2043f4 100644
--- a/src/apps/AppWorkOrderXbot/AppWorkOrderXbot.vue
+++ b/src/apps/AppWorkOrderXbot/AppWorkOrderXbot.vue
@@ -1,57 +1,18 @@
 <template>
-  <div class="AppWorkOrder">
-    <AiTopFixed>
-      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff"
-              @change="change"></u-tabs>
-      <div class="select-top">
-        <!-- <div class="tab-item">
-          <AiPagePicker type="gird" v-model="searchGrid" @change="confirm" valueObj nodeKey="id" formType="2">
-            <AiMore v-model="searchGrid.girdName" icon="arrow-down" placeholder="所属网格"/>
-          </AiPagePicker>
-        </div> -->
-        <div class="tab-item" @click="showType = true">
-          <AiMore v-model="eventStatusText" icon="arrow-down" placeholder="办件状态"/>
-        </div>
-        <u-select v-model="showType" :list="listType" value-name="dictValue" label-name="dictName" @confirm="confirm"></u-select>
+  <div class="AppWorkOrderXbot">
+    <component v-if="refresh && isGridMember" :is="component" @change="onChange" :params="params" :ref="component"/>
+    <div class="tabs" v-if="isTab && isGridMember">
+      <div class="item" @click="tabClick(index, item.component)" v-for="(item, index) in tabs" :key="index">
+        <img :src="tabIndex == index ? item.activeImg : item.img" alt=""/>
+        <p :class="tabIndex == index ? 'color-3267F0' : ''">{{ item.text }}</p>
       </div>
-    </AiTopFixed>
-    <template>
-      <AiCard v-for="(item, i) in datas" :key="i" @click.native="goDetail(item, 1)">
-        <template #custom>
-          <div class="card-top">
-            <div class="titles">{{ item.content }}</div>
-
-            <div class="types">
-              <span>事件类型</span>
-              <span class="types-right">{{ $dict.getLabel('xbotReportEventType', item.type)}}</span>
-            </div>
-            <div class="types">
-              <span>所属群聊</span>
-              <span class="types-right">{{ item.groupName }}</span>
-            </div>
-
-            <div class="gards">
-              <span>上报时间</span>
-              <span class="gards-right">{{ item.createTime }}</span>
-            </div>
-          </div>
-
-          <div class="status" :class="item.eventStatus == 0 ? 'status0' : item.eventStatus == 1 ? 'status1' : item.eventStatus == 2 ? 'status2' : 'status3'"
-               v-if="item.eventStatus">
-            <span class="icon"></span>
-            <span>
-              {{ $dict.getLabel('clapEventStatus', item.eventStatus) }}
-            </span>
-          </div>
-        </template>
-      </AiCard>
-      <AiEmpty v-if="!datas.length"></AiEmpty>
-    </template>
-    <div class="pad-b120" v-if="datas.length"></div>
+    </div>
   </div>
 </template>
 
 <script>
+import List from './List.vue'
+import Statistics from './Statistics.vue'
 import {mapState} from 'vuex'
 
 export default {
@@ -59,232 +20,126 @@ export default {
   appName: '工单管理',
   data() {
     return {
-      datas: [],
-      tabList: [
+      component: 'List',
+      params: {},
+      refresh: true,
+      tabIndex: 0,
+      tabs: [
         {
-          name: '全部待办',
+          img: require('./components/img/handle-icon.png'),
+          activeImg: require('./components/img/handle-icon-active.png'),
+          text: '办理',
+          component: 'List',
         },
         {
-          name: '办件历史',
+          img: require('./components/img/statistics-icon.png'),
+          activeImg: require('./components/img/statistics-icon-active.png'),
+          text: '统计',
+          component: 'Statistics',
         },
       ],
-      currentTabs: 0,
-      current: 1,
-      pages: 0,
-      searchGrid: {},
-      showType: false,
-      eventStatus: '',
-      eventStatusText: '',
+      isTab: true,
     }
   },
   computed: {
     ...mapState(['user']),
-    listType() {
-      return this.$dict.getDict(this.currentTabs == 0 ? 'clapEventStatusAll' : 'clapEventStatusHistory')
+    isGridMember() {
+      return this.user.girdCheckType > 0
     }
   },
-  onLoad() {
-    uni.$on('nextList', () => {
-      this.current++
-      this.getList()
-    })
-    uni.$on('getListInit', () => {
-      this.current = 1
-      this.getList()
-    })
+  components: {
+    List,
+    Statistics,
+    Set,
+  },
 
+  methods: {
+    onChange(e) {
+      this.params = e.params
+      this.component = e.type
+    },
+    tabClick(index, component) {
+      this.tabIndex = index
+      this.component = component
+      this.refresh = false
+      this.$nextTick(() => {
+        this.refresh = true
+      })
+    }
   },
   onShow() {
     document.title = '工单管理'
-  },
-  created() {
-    this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory', 'xbotReportEventType').then(() => {
-      this.getList()
+    uni.$on('hideTab', () => {
+      this.isTab = false
     })
+    uni.$on('showTab', () => {
+      this.isTab = true
+    })
+    if (!this.tabIndex) {
+      this.$nextTick(() => this.$refs['List'].getListInit())
+    }
   },
-  methods: {
-    getListInit() {
-      this.current = 1
-      this.getList()
-    },
-    nextPage() {
-      this.current++
-      this.getList()
-    },
-    
-    getList() {
-      let {current, eventStatus, searchGrid: {id: girdId}} = this
-      this.$http.post(`/app/appsessionarchivereportinfo/list`, null, {
-        params: {
-          size: 10,
-          current, searchType: this.currentTabs == 1 ? '1' : '0',
-          eventStatus, girdId
-        },
-      })
-      .then((res) => {
-        if (res.code == 0) {
-          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
-          this.pages = res.data.pages
-          this.$forceUpdate()
-        }
-      })
-    },
-
-    confirm(e) {
-      if (this.showType) {
-        this.eventStatus = e[0].value
-        this.eventStatusText = e[0].label
-      }
-      this.current = 1
-      this.getList()
-    },
-
-    goDetail(item) {
-      uni.navigateTo({url: `./Detail?id=${item.id}`})
-    },
-
-    change(index) {
-      this.current = 1
-      this.datas = []
-      this.eventStatus = ''
-      this.currentTabs = index
-      this.getList()
-    },
-
-    linkTo(url) {
-      uni.navigateTo({url})
-    },
+  onReachBottom() {
+    if (!this.tabIndex) {
+      this.$nextTick(() => this.$refs['List'].nextPage())
+    }
   },
 }
 </script>
 
-<style scoped lang="scss">
-.AppWorkOrder {
+<style lang="scss" scoped>
+.AppWorkOrderXbot {
   height: 100%;
-  padding: 0;
-  width: 100vw;
+}
 
-  .select-top {
-    background: #fff;
-    display: flex;
-    padding: 24px 0;
+.tabs {
+  width: 100%;
+  height: 98px;
+  background: #fff;
+  border-top: 1px solid #ddd;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  display: flex;
 
-    .tab-item {
-      flex: 1;
-      text-align: center;
-      line-height: 48px;
-      font-size: 26px;
-      font-family: PingFangSC-Regular, PingFang SC;
-      color: #666;
+  .item {
+    flex: 1;
+    text-align: center;
 
-      img {
-        width: 32px;
-        height: 32px;
-        margin-left: 8px;
-        vertical-align: middle;
-      }
+    img {
+      width: 56px;
+      height: 56px;
+      margin-top: 8px;
     }
 
-    .tab-item:nth-of-type(1) {
-      border-right: 1px solid #eee;
+    p {
+      font-size: 22px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #c4cad4;
+      line-height: 8px;
+    }
+
+    .color-3267F0 {
+      color: #3267f0;
     }
   }
+}
 
-  ::v-deep .AiTopFixed .content {
-    padding: 0;
+.empty {
+  text-align: center;
+
+  img {
+    width: 282px;
+    height: 306px;
+    margin: 136px auto 0;
   }
 
-  ::v-deep .AiCard {
-    background: #f3f6f9;
-    padding: 24px 40px 0 32px;
-
-    .start {
-      background: #fff;
-      border-radius: 16px;
-
-      .card-top {
-        padding: 32px;
-
-        .titles {
-          margin-bottom: 34px;
-          font-size: 32px;
-          font-weight: 500;
-          color: #333333;
-          line-height: 1.4;
-          word-break: break-all;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 2;
-          -webkit-box-orient: vertical;
-        }
-
-        .types,
-        .gards {
-          margin-top: 8px;
-          font-size: 26px;
-
-          .types-right,
-          .gards-right {
-            margin-left: 32px;
-            color: #333333;
-          }
-        }
-      }
-
-      .status {
-        padding: 32px;
-        border-top: 1px solid #dddddd;
-
-        .icon {
-          display: inline-block;
-          width: 8px;
-          height: 8px;
-          vertical-align: middle;
-          margin-right: 8px;
-        }
-      }
-
-      .status0 {
-        color: #ff883c;
-
-        .icon {
-          background: #ff883c;
-        }
-      }
-
-      .status1 {
-        color: #1aaaff;
-
-        .icon {
-          background: #1aaaff;
-        }
-      }
-
-      .status2 {
-        color: #42d784;
-
-        .icon {
-          background: #42d784;
-        }
-      }
-
-      .status3 {
-        color: #ff4466;
-
-        .icon {
-          background: #ff4466;
-        }
-      }
-    }
-  }
-
-  // ::v-deep .AiCard:last-child {
-  //   padding-bottom: 24px;
-  // }
-  .pad-b120 {
-    background-color: #f3f6f9;
-    padding-bottom: 120px;
+  p {
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #999;
+    line-height: 40px;
   }
 }
 </style>
diff --git a/src/apps/AppWorkOrderXbot/SelectDeptUser.vue b/src/apps/AppWorkOrderXbot/SelectDeptUser.vue
deleted file mode 100644
index 31685974..00000000
--- a/src/apps/AppWorkOrderXbot/SelectDeptUser.vue
+++ /dev/null
@@ -1,323 +0,0 @@
-<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/apps/AppWorkOrderXbot/Statistics.vue b/src/apps/AppWorkOrderXbot/Statistics.vue
index c8005b00..5d757298 100644
--- a/src/apps/AppWorkOrderXbot/Statistics.vue
+++ b/src/apps/AppWorkOrderXbot/Statistics.vue
@@ -2,8 +2,8 @@
   <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 type="dept" v-model="selectDept" valueObj nodeKey="fullId" formType="2" class="right-span" @change="changeDept">
+          <AiMore v-model="selectDept.fullName"/>
         </AiPagePicker>
       </div>
     </AiTopFixed>
@@ -11,7 +11,7 @@
       <div class="info-content">
         <div class="title">概况总览</div>
         <div class="el-row">
-          <div class="item" v-for="(item, index) in todayList" :key="index">
+          <div class="item" v-for="(item, index) in todayList" :key="index" v-if="item.label != '累计办结'">
             <h2>{{item.value}}</h2>
             <p>{{item.label}}</p>
           </div>
@@ -51,7 +51,7 @@ export default {
   data() {
     return {
       todayList: [],
-      selectGird: {girdId: '', girdName: ''},
+      selectDept: {fullId: '', fullName: ''},
       finishChart: null,
       trendChart: null,
       typeChart: null,
@@ -76,9 +76,13 @@ export default {
     })
   },
   methods: {
+    changeDept(e) {
+      this.selectDept = e[0]
+      this.getStatistics()
+    },
     getStatistics() {
       this.todayList = [], this.finishData = [], this.trendDataX = [], this.trendData = [], this.typeData = []
-      this.$http.post(`/app/apppatrolreportinfo/countByGirdId?girdId=${this.selectGird.girdId}&eventStatus=${this.statusInfo.eventStatus}`).then((res) => {
+      this.$http.post(`/app/appsessionarchivereportinfo/countByDeptId?deptFullId=${this.selectDept.fullId}&eventStatus=${this.statusInfo.eventStatus}`).then((res) => {
         if (res.code == 0) {
           this.$nextTick(() => {
             this.chartInit()
@@ -92,19 +96,20 @@ export default {
             this.todayList.push(info)
           })
 
-          Object.keys(res.data.finishCountMap).forEach((key) => {
-            var info = {
-              name: key,
-              value: res.data.finishCountMap[key]
+          Object.keys(res.data.allCountMap).forEach((key) => {
+            if(key == '累计上报' || key == '累计办结') {
+              var info = {
+                name: key,
+                value: res.data.allCountMap[key]
+              }
+              this.finishData.push(info)
             }
-            this.finishData.push(info)
           })
           
-          var total = Number(res.data.finishCountMap['累计事件上报'])+Number(res.data.finishCountMap['累计事件办结'])
-          var num = res.data.finishCountMap['累计事件办结']/total
+          var num = Number(res.data.allCountMap['累计办结'])/Number(res.data.allCountMap['累计上报'])
           this.finshNum = Number(num*100).toFixed(2)
 
-          res.data.dateCountList.map((item) => {
+          res.data.trend.map((item) => {
             this.trendData.push(item.ecount)
             this.trendDataX.push(item.ymd)
           })