diff --git a/src/project/weiyang/AppWorkOrder/Edit.vue b/src/project/weiyang/AppWorkOrder/Add.vue
similarity index 58%
rename from src/project/weiyang/AppWorkOrder/Edit.vue
rename to src/project/weiyang/AppWorkOrder/Add.vue
index 364f5e27..2dc4c233 100644
--- a/src/project/weiyang/AppWorkOrder/Edit.vue
+++ b/src/project/weiyang/AppWorkOrder/Add.vue
@@ -1,35 +1,39 @@
 <template>
-  <div class="Edit">
+  <div class="Add">
     <div class="contents">
       <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
+        <u-form-item label="事件类型" prop="groupName" required :border-bottom="false" right-icon="arrow-right">
+          <span @click="show = true" class="right-span" :style="forms.groupName ? '' : 'color:#999;'">{{ forms.groupName || '请选择事件类型' }}</span>
+          <u-select v-model="show" :list="myList" value-name="id" label-name="groupName" @confirm="selectStatus"></u-select>
+        </u-form-item>
         <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="type" required :border-bottom="false" right-icon="arrow-right">
-          <span @click="show = true" class="right-span" :style="forms.typeName ? '' : 'color:#999;'">{{ forms.typeName || '请选择事件类型' }}</span>
-          <u-select v-model="show" :list="typeList" value-name="dictValue" label-name="dictName" @confirm="selectFl"></u-select>
-        </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" 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" >
-          <u-input v-model="forms.phone" placeholder="请输入联系方式" />
-        </u-form-item>
-        <u-form-item label="上报位置" prop="mapInfo" :border-bottom="false" right-icon="arrow-right" class="border">
+        <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>
+        <u-form-item label="所属网格" prop="girdName" required :border-bottom="false">
+          <AiPagePicker type="gird" @select="confirmGird" valueObj nodeKey="id" formType="2" action="/app/appgirdmemberinfo/queryMyGirdList" class="right-span">
+            <AiMore v-model="forms.girdName" placeholder="请选择所属网格"/>
+          </AiPagePicker>
+        </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-item label="姓名" prop="name" required :border-bottom="false" class="border">
+          <u-input v-model="forms.name" placeholder="请输入姓名" />
+        </u-form-item>
+        <u-form-item label="联系方式" prop="phone" required :border-bottom="false" >
+          <u-input v-model="forms.phone" placeholder="请输入联系方式" />
+        </u-form-item>
+
+        <div class="line"></div>
 
       </u-form>
     </div>
@@ -43,7 +47,7 @@
 <script>
 import {mapState} from 'vuex'
 export default {
-  name: 'Edit',
+  name: 'Add',
   data() {
     return {
       forms: {
@@ -56,68 +60,50 @@ export default {
         files: [],
         name: '',
         phone: '',
-        type: ''
+        girdMemberId: '',
+        girdMemberName: ''
       },
       flag: false,
       show: false,
-      flList: [],
-      id: '',
-      selectGird: {},
-      typeList: []
+      myList: []
     }
   },
   computed: {
     ...mapState(['user']),
   },
-  onLoad(option) {
-    this.id = option.id
-    this.getTypeList()
-    this.getDetail()
+  onLoad() {
+    this.typeList()
+    this.forms.girdId = this.user.girdId
+    this.forms.girdName = this.user.girdName
+    this.forms.girdMemberId = this.user.girdMemberId
+    this.forms.girdMemberName = this.user.name
   },
   onShow() {
-    document.title = '事件编辑'
+    document.title = '巡查添加'
+    this.forms.name = this.user.name
+    this.forms.phone = this.user.phone
     uni.$on('chooseLat', res => {
       this.forms.mapInfo = {...res}
-      this.$forceUpdate()
     })
   },
   methods: {
-    getTypeList() {
-      this.$http.post(`/app/appsessionarchivefeaturelibrary/eventTypeList`).then(res => {
+    typeList() {
+      this.$http.post(`/app/apppatrolreportgroupv2/list`, null, {
+        params: {
+          size: 9999,
+        },
+      }).then((res) => {
         if (res.code == 0) {
-          res.data.map((item) => {
-            var i = {dictName: item, dictValue: item}
-            this.typeList.push(i)
-          })
+          this.myList = res.data.records
+          this.$forceUpdate()
         }
       })
     },
-    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,
-          }
-          this.forms.typeName = res.data.type
-          // var list = this.$dict.getDict('xbotReportEventType')
-          // this.typeList.map((item) => {
-          //   if(item.dictValue == res.data.type) {
-          //     this.forms.typeName = item.dictName
-          //   }
-          // })
-          this.selectGird = { girdId: res.data.girdId|| '', girdName: res.data.girdName || ''}
-        }
-      })
-    },
-    selectFl(e) {
-      this.forms.type = e[0].value
-      this.forms.typeName = e[0].label
+    selectStatus(e) {
+      this.forms.groupName = e[0].label
+      this.forms.groupId = e[0].value
     },
     confirmGird(v) {
-      console.log(v)
       this.forms.girdId = v.id
       this.forms.girdName = v.girdName
     },
@@ -127,33 +113,29 @@ export default {
     confirm() {
       if(this.flag) return
 
+      if (!this.forms.groupName) {
+        return this.$u.toast('请选择事件类型')
+      }
       if (!this.forms.content) {
         return this.$u.toast('请输入事件描述')
       }
-      if (!this.forms.type) {
-        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('请输入手机号')
       }
-      
-      // 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.forms.girdId = this.selectGird.girdId
-      this.forms.girdName = this.selectGird.girdName
-      this.$http.post(`/app/appsessionarchivereportinfo/update`, {...this.forms, ...this.forms.mapInfo}).then((res) => {
+      this.$http.post(`/app/apppatrolreportinfov2/addByGirdMember`, {...this.forms, ...this.forms.mapInfo}).then((res) => {
         if (res.code == 0) {
-          this.$u.toast('事件编辑成功')
+          this.$u.toast('事件添加成功')
           uni.$emit('getListInit')
-          uni.$emit('updateDeatil')
           setTimeout(() => {
             uni.navigateBack()
           }, 600)
@@ -167,7 +149,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.Edit {
+.Add {
   height: 100%;
 
   .contents {
diff --git a/src/project/weiyang/AppWorkOrder/AppWorkOrder.vue b/src/project/weiyang/AppWorkOrder/AppWorkOrder.vue
index 0fd85e95..1eb17609 100644
--- a/src/project/weiyang/AppWorkOrder/AppWorkOrder.vue
+++ b/src/project/weiyang/AppWorkOrder/AppWorkOrder.vue
@@ -1,12 +1,16 @@
 <template>
-  <div class="AppWorkOrderXbot">
-    <component v-if="refresh" :is="component" @change="onChange" :params="params" :ref="component"/>
-    <div class="tabs" v-if="isTab">
+  <div class="AppWorkOrder">
+    <component v-if="refresh && isGridMember" :is="component" @change="onChange" :params="params" :ref="component" :listIndex="tabIndex" />
+    <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>
     </div>
+    <div v-if="!isGridMember" class="empty">
+      <img src="./components/img/no-admin.png" alt="">
+      <p>没有网格员权限<br/>无法查看工单管理信息哦~</p>
+    </div>
   </div>
 </template>
 
@@ -16,7 +20,7 @@ import Statistics from './Statistics.vue'
 import {mapState} from 'vuex'
 
 export default {
-  name: 'AppWorkOrderXbot',
+  name: 'AppWorkOrder',
   appName: '工单管理',
   data() {
     return {
@@ -28,7 +32,13 @@ export default {
         {
           img: require('./components/img/handle-icon.png'),
           activeImg: require('./components/img/handle-icon-active.png'),
-          text: '办理',
+          text: '待办',
+          component: 'List',
+        },
+        {
+          img: require('./components/img/handle-icon.png'),
+          activeImg: require('./components/img/handle-icon-active.png'),
+          text: '历史',
           component: 'List',
         },
         {
@@ -68,7 +78,7 @@ export default {
     }
   },
   onShow() {
-    document.title = '工单管理'
+    document.title = '巡查上报'
     uni.$on('hideTab', () => {
       this.isTab = false
     })
@@ -88,7 +98,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.AppWorkOrderXbot {
+.AppWorkOrder {
   height: 100%;
 }
 
diff --git a/src/project/weiyang/AppWorkOrder/Content.vue b/src/project/weiyang/AppWorkOrder/Content.vue
index 4f50d136..3a7dbfe8 100644
--- a/src/project/weiyang/AppWorkOrder/Content.vue
+++ b/src/project/weiyang/AppWorkOrder/Content.vue
@@ -2,17 +2,14 @@
   <div class="Transfer">
     <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">
-          <AiPagePicker type="deptUser" single :selected.sync="forms.user" nodeKey="id" @select="handleSelectUser" class="select-user">
-            <span style="margin-left: 4px" v-if="forms.user && forms.user.length">{{ forms.user[0].name }}</span>
-            <span v-else class="color-999">请选择</span>
-          </AiPagePicker>
+        <u-form-item label="转交给" prop="status" required :border-bottom="false" class="first-form" right-icon="arrow-right" v-if="status == 1">
+          <u-input v-model="forms.name" placeholder="请选择转交人员" disabled @click="toSelectUser" />
         </u-form-item>
-        <u-form-item label="事件分类" prop="typeName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 1">
+        <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="请选择事件分类"  /> -->
-          <span @click="show = true" class="right-span" :style="forms.typeName ? '' : 'color:#999;'">{{ forms.typeName || '请选择事件分类' }}</span>
+          <span @click="show = true" class="right-span" :style="forms.groupName ? '' : 'color:#999;'">{{ forms.groupName || '请选择事件分类' }}</span>
 
-          <u-select v-model="show" :list="typeList" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
+          <u-select v-model="show" :list="myList" value-name="id" label-name="groupName" @confirm="selectStatus"></u-select>
         </u-form-item>
 
         <u-form-item :label="status == 3 ? '办结意见' : status == 2 ? '拒绝受理意见' : '办理意见'" prop="content" required :border-bottom="false" label-position="top"
@@ -55,102 +52,93 @@ export default {
         groupId: '',
         content: '',
         files: [],
-        name: '',
-        handleUserId: '',
-        handleUserName: '',
-        type: '',
-        typeName: ''
+        name: ''
       },
       flag: false,
       show: false,
       status: '',  //1转交  2拒绝受理  3我已办结
+      myList: [],
       id: '',
       selectUser: {},
-      titleList: ['', '转交事件', '拒绝受理', '我已办结'],
-      typeList: []
+      titleList: ['', '转交事件', '拒绝受理', '我已办结']
     }
   },
   onLoad(option) {
-    this.getTypeList()
     this.status = option.status
     this.id = option.id
     this.forms.groupId = option.groupId
     this.forms.groupName = option.groupName
     this.typeList()
-    uni.$on('pagePicker:custom', (res) => {
+    uni.$on('goback', (res) => {
       this.selectUser = res
-      if (res.name) {
-        this.forms.name = res.name
-      } else {
-        this.forms.name = res.girdName
-      }
+      this.forms.girdId = res.girdId
+      this.forms.girdName = res.girdName
+      this.forms.girdMemberId = res.id
+      this.forms.girdMemberName = res.name
+      this.forms.name = `${res.girdName}${res.name ? '-' + res.name : ''}`
     })
   },
   onShow() {
     document.title = this.titleList[this.status]
   },
   methods: {
-    getTypeList() {
-      this.$http.post(`/app/appsessionarchivefeaturelibrary/eventTypeList`).then(res => {
+    typeList() {
+      this.$http.post(`/app/apppatrolreportgroupv2/list`, null, {
+        params: {
+          size: 9999,
+        },
+      })
+      .then((res) => {
         if (res.code == 0) {
-          res.data.map((item) => {
-            var i = {dictName: item, dictValue: item}
-            this.typeList.push(i)
-          })
+          this.myList = res.data.records
+          this.$forceUpdate()
         }
       })
     },
 
-    handleSelectUser(e) {
-      console.log(e)
-      this.forms.user = e
-      this.forms.handleUserId = e[0].id
-      this.forms.handleUserName = e[0].name
-    },
-
     confirm() {
-      if (this.status == 1 && !this.forms.handleUserName) {
+      if(this.flag) return
+      if (this.status == 1 && !this.forms.name) {
         return this.$u.toast('请选择转交对象')
       }
-      if (this.status != 1 && !this.forms.typeName) {
+      if (this.status != 1 && !this.forms.groupName) {
         return this.$u.toast('请选择分类')
       }
       if (this.status != 1 && !this.forms.content) {
         return this.$u.toast('请输入意见')
       }
+      this.flag = true
       this.submit()
     },
     submit() {  //status 1转交  2拒绝受理  3我已办结
-      if(this.flag) return
       var url = '', successText = '', params = ''
       if (this.status == 1) {
-        url = `/app/appsessionarchivereportinfo/transfer`
+        url = `/app/apppatrolreportinfov2/transfer`
         successText = '转交成功'
         params = {
           ...this.forms,
-          girdId: this.selectUser.id,
-          girdName: this.selectUser.girdName,
-        }
-        if (this.selectUser.name) { //选择的网格员
-          params.girdId = this.selectUser.girdId
-          params.girdMemberId = this.selectUser.id
-          params.girdMemberName = this.selectUser.name
+          // girdId: this.selectUser.id,
+          // girdName: this.selectUser.girdName,
         }
+        // if (this.selectUser.name) { //选择的网格员
+        //   params.girdId = this.selectUser.girdId
+        //   params.girdMemberId = this.selectUser.id
+        //   params.girdMemberName = this.selectUser.name
+        // }
       }
       if (this.status == 2) {
-        url = `/app/appsessionarchivereportinfo/finish`
+        url = `/app/apppatrolreportinfov2/finish`
         successText = '拒绝成功'
         params = {...this.forms, eventStatus: 0}
       }
       if (this.status == 3) {
-        url = `/app/appsessionarchivereportinfo/finish`
+        url = `/app/apppatrolreportinfov2/finish`
         successText = '办结成功'
         params = {...this.forms, eventStatus: 1}
       }
       params.id = this.id
       this.$http.post(url, params).then((res) => {
         if (res.code == 0) {
-          this.flag = true
           this.$u.toast(successText)
           uni.$emit('updateDeatil')
           uni.$emit('getListInit')
@@ -165,11 +153,11 @@ export default {
       })
     },
     selectStatus(e) {
-      this.forms.typeName = e[0].label
-      this.forms.type = e[0].value
+      this.forms.groupName = e[0].label
+      this.forms.groupId = e[0].value
     },
     toSelectUser() {
-      uni.navigateTo({url: './SelectDeptUser'})
+      uni.navigateTo({url: `./SelectUser?detailId=${this.id}`})
     },
   },
 }
@@ -184,7 +172,7 @@ export default {
 
     ::v-deep .u-form {
       .u-form-item {
-        padding: 0 45px !important;
+        // padding: 0 45px !important;
 
         .u-form-item__body {
           .u-form-item--right__content__slot {
@@ -251,13 +239,9 @@ export default {
     width: 100%;
     text-align: right;
   }
-  .select-user {
+  ::v-deep .AiPagePicker {
     width: 100%;
-    span {
-      display: inline-block;
-      width: 100%;
-      text-align: right;
-    }
+    text-align: right;
   }
 }
 </style>
diff --git a/src/project/weiyang/AppWorkOrder/Detail.vue b/src/project/weiyang/AppWorkOrder/Detail.vue
index ea7fd5df..7bfe8f37 100644
--- a/src/project/weiyang/AppWorkOrder/Detail.vue
+++ b/src/project/weiyang/AppWorkOrder/Detail.vue
@@ -5,9 +5,9 @@
 
       <div class="right">
         <div class="names">{{ data.name }}的上报</div>
+
         <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">
@@ -16,19 +16,18 @@
       <span class="status status0" :class="detailStatus.cls" v-if="data.eventStatus"> {{ detailStatus.label }}</span>
 
       <div class="card">
-        <span class="card-left">事件类型</span>
-        <span class="card-right">{{ data.type }}</span>
+        <span class="card-left">事件来源</span>
+        <span class="card-right">{{ $dict.getLabel('residentEventSource', data.eventSource) }}</span>
       </div>
-
       <div class="card">
-        <span class="card-left">消息来源</span>
+        <span class="card-left">事件类型</span>
         <span class="card-right">{{ data.groupName }}</span>
       </div>
 
-      <!-- <div class="card">
+      <div class="card">
         <span class="card-left">所属网格</span>
         <span class="card-right">{{ data.girdName }}</span>
-      </div> -->
+      </div>
 
       <div class="card">
         <span class="card-left">联系方式</span>
@@ -71,7 +70,7 @@
         <div class="cards" v-for="(item, index) in process" :key="index">
           <div class="cardss">
             <div class="cardss-left">
-              <span v-text="item.avatar"/>
+              <span v-text="formatName(item.systemExplain)"/>
             </div>
             <div class="cardss-right">
               <div class="cardsss-right-left">
@@ -94,35 +93,34 @@
       </div>
     </div>
 
-    <div class="fixedBtn">
+    <div class="fixedBtn" v-if="isShowBtn">
       <div class="status00" v-if="data.eventStatus == 0">
-        <div class="columns border-r" @click="toContent(1)">
+        <div class="columns border-r" v-if="data.powerTransmit" @click="toContent(1)">
           <img src="./components/img/zhuanjiao.png" alt="" />
           <span class="hint">转交事件</span>
         </div>
 
-        <div class="columns" @click="toContent(2)">
+        <div class="columns" v-if="data.powerHandle" @click="toContent(2)">
           <img src="./components/img/jujue.png" alt="" />
           <span class="hint">拒绝受理</span>
         </div>
 
-        <div class="doIt" @click="doItShow = true">我来受理</div>
+        <div class="doIt" @click="toContent(3)">我来受理</div>
       </div>
-
-      <div class="status00" v-if="data.eventStatus == 1 && data.handleUserId == user.wxUserId">
-        <div class="columns border-r" @click="toContent(1)">
+      <div class="status00" v-if="data.eventStatus == 1">
+        <div class="columns border-r" v-if="data.powerTransmit" @click="toContent(1)">
           <img src="./components/img/zhuanjiao.png" alt="" />
           <span class="hint">转交事件</span>
         </div>
-        <div class="columns" @click="toContent(2)">
+        <div class="columns" v-if="data.powerHandle"  @click="toContent(2)">
           <img src="./components/img/jujue.png" alt="" />
           <span class="hint">拒绝受理</span>
         </div>
 
-        <div class="doIt" @click="toContent(3)">前往办理</div>
+        <div class="doIt" v-if="data.powerHandle" @click="toContent(3)">前往办理</div>
       </div>
-      
-      <!-- <div class="endDoIt" v-if="data.eventStatus == 1 && data.handleUserId == user.wxUserId" @click="toContent(3)">前往办理</div> -->
+
+      <!-- <div class="endDoIt" v-if="data.eventStatus == 1 && data.rightType == 0" @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>
@@ -139,7 +137,8 @@ export default {
       data: {},
       id: '',
       doItShow: false,
-      evaluation: {}
+      evaluation: {},
+      isShowBtn: false
     }
   },
   computed: {
@@ -155,16 +154,17 @@ export default {
       const getAvatar = str => str?.substring(str?.length, str?.length - 2)
       const list = this.data.processList.map(e => ({
         ...e,
-        avatar: getAvatar(e.userName),
-        statusLabel: this.$dict.getLabel('clapDoStatus', e.doStatus)
+        avatar: getAvatar(e.girdMemberName),
+        statusLabel: this.$dict.getLabel('residentReportDoStatus', e.doStatus)
       }))
       if (this.evaluation.id) {
-        const {id, createUserName, score, createTime: doTime, content: doExplain} = this.evaluation
+        const {id, createUserName, score, files, createTime: doTime, content: doExplain} = this.evaluation
         list.splice(0, 0, {
           id, doTime, doExplain,
           statusLabel: `${score}星评价`,
           avatar: getAvatar(createUserName),
-          systemExplain: `${createUserName}完成评价`
+          systemExplain: `${createUserName}完成评价`,
+          files: files
         })
       }
       return list
@@ -172,8 +172,9 @@ export default {
   },
   watch: {},
   onLoad(o) {
+    this.isShowBtn = o.isShowBtn == 1 ? true : false
     this.id = o.id
-    this.$dict.load('realityStatus', 'clapDoStatus', 'xbotReportEventType', 'clapEventStatus').then(() => {
+    this.$dict.load('clapEventStatus','residentEventSource', 'residentReportDoStatus').then(() => {
       this.getDetail()
     })
 
@@ -182,11 +183,11 @@ export default {
     })
   },
   onShow() {
-    document.title = '工单详情'
+    document.title = '工单管理'
   },
   methods: {
     getDetail() {
-      this.$http.post(`/app/appsessionarchivereportinfo/queryDetailById?id=${this.id}`).then((res) => {
+      this.$http.post(`/app/apppatrolreportinfov2/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
           this.data = res.data
         }
@@ -198,14 +199,21 @@ export default {
     },
 
     doThings() {
-      this.$http.post(`/app/appsessionarchivereportinfo/acceptance?id=${this.id}`).then((res) => {
+      this.$http.post(`/app/appresidentreportinfov2/finivsh`, {
+        id: this.id,
+        eventStatus: 1
+      }).then((res) => {
         if (res.code == 0) {
+          this.$u.toast('受理成功')
           this.getDetail()
         }
       })
     },
 
     toContent(status) {
+      // if(status == 3 && !this.data.doRight) {
+      //   return this.$u.toast('没有办理权限')
+      // }
       uni.navigateTo({url: `./Content?status=${status}&groupId=${this.data.groupId}&groupName=${this.data.groupName}&id=${this.id}`})
     },
     previewImage(images, img) {
@@ -214,9 +222,12 @@ export default {
         current: img
       })
     },
-    toEdit() {
-      uni.navigateTo({url: `./Edit?id=${this.id}`})
-    }
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(0, 2)
+    },
   },
 }
 </script>
@@ -224,6 +235,7 @@ export default {
 <style scoped lang="scss">
 uni-page-body {
   height: 100%;
+  padding-top: 26px;
 }
 
 .Detail {
@@ -232,9 +244,8 @@ uni-page-body {
 
   .header-top {
     display: flex;
-    margin: 26px 0 14px 0;
-    padding: 0 32px;
-    position: relative;
+    margin-bottom: 14px;
+    padding: 32px 32px 0;
 
     .avatars {
       width: 80px;
@@ -261,17 +272,6 @@ 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 {
@@ -345,7 +345,7 @@ uni-page-body {
       margin-right: 8px;
     }
 
-    img:nth-child(3n) {
+    img:nth-of-type(3n) {
       margin-right: 0;
     }
   }
@@ -455,7 +455,7 @@ uni-page-body {
             margin-right: 12px;
           }
 
-          img:nth-child(4n) {
+          img:nth-of-type(3n) {
             margin-right: 0;
           }
         }
@@ -515,9 +515,6 @@ uni-page-body {
         color: #fff;
       }
 
-      .width78 {
-        width: 78%;
-      }
     }
 
     .endDoIt {
diff --git a/src/project/weiyang/AppWorkOrder/List.vue b/src/project/weiyang/AppWorkOrder/List.vue
index cb9b4c4f..9b8e0349 100644
--- a/src/project/weiyang/AppWorkOrder/List.vue
+++ b/src/project/weiyang/AppWorkOrder/List.vue
@@ -1,14 +1,17 @@
 <template>
-  <div class="AppWorkOrder">
+  <div class="list-content">
     <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>
+      <u-tabs :list="tabList" :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">
+        <div class="tab-item">
+          <AiPagePicker type="gird" valueObj nodeKey="id" formType="2" @select="handleSelectGird" action="/app/appgirdmemberinfo/queryMyGirdList">
             <AiMore v-model="searchGrid.girdName" icon="arrow-down" placeholder="所属网格"/>
+            <!-- <span :class="searchGrid.girdName ? 'grid-name' : 'grid-name color-999'">{{searchGrid.girdName || '所属网格'}}</span>
+            <u-icon name="close-circle" color="#999" size="34" style="margin-left: 4px" v-if="searchGrid.girdName" @click.stop="clearGrid" />
+            <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px" v-else /> -->
           </AiPagePicker>
-        </div> -->
+        </div>
         <div class="tab-item" @click="showType = true">
           <AiMore v-model="eventStatusText" icon="arrow-down" placeholder="办件状态"/>
         </div>
@@ -20,34 +23,38 @@
         <template #custom>
           <div class="card-top">
             <div class="titles">{{ item.content }}</div>
-
+            <div class="right-type">{{ $dict.getLabel('residentEventSource', item.eventSource) }}</div>
+            <!-- <div class="types">
+              <span>事件来源</span>
+              <span class="types-right">{{ $dict.getLabel('residentEventSource', item.eventSource) }}</span>
+            </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>
+              <span>所属网格</span>
+              <span class="gards-right">{{ item.girdName }}</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 class="left">
+              <span class="icon"></span>
+              <span>
+                {{ $dict.getLabel('clapEventStatus', item.eventStatus) }}
+              </span>
+            </div>
+            <span class="time">{{ item.createTime }}</span>
           </div>
         </template>
       </AiCard>
       <AiEmpty v-if="!datas.length"></AiEmpty>
     </template>
     <div class="pad-b120" v-if="datas.length"></div>
+    <AiAdd @add="add" v-if="isAdd"/>
   </div>
 </template>
 
@@ -55,50 +62,48 @@
 import {mapState} from 'vuex'
 
 export default {
-  props: {},
+  props: ['listIndex'],
   data() {
     return {
       datas: [],
       tabList: [
-        {
-          name: '全部待办',
-        },
-        {
-          name: '办件历史',
-        },
+        {name: '全部', value: ''},
+        {name: '巡查上报', value: '1'},
+        {name: '居民上报', value: '0'},
+        {name: '舆情上报', value: '2'},
+        {name: '敏感词上报', value: '3'},
       ],
       currentTabs: 0,
       current: 1,
       pages: 0,
-      searchGrid: {},
+      searchGrid: {girdName: ''},
       showType: false,
       eventStatus: '',
       eventStatusText: '',
+      isAdd: true
     }
   },
   computed: {
     ...mapState(['user']),
     listType() {
-      return this.$dict.getDict(this.currentTabs == 0 ? 'clapEventStatusAll' : 'clapEventStatusHistory')
+      return this.$dict.getDict(this.listIndex == 0 ? 'clapEventStatusAll' : 'clapEventStatusHistory')
     }
   },
   onLoad() {
-    uni.$on('nextList', () => {
-      this.current++
-      this.getList()
-    })
-    uni.$on('getListInit', () => {
-      this.current = 1
-      this.getList()
-    })
-
+    
   },
   onShow() {
+    console.log(this.listIndex)
     document.title = '工单管理'
+    this.searchGrid.girdId = this.user.girdId
+    this.searchGrid.girdName = this.user.girdName
+    this.current = 1
+    this.getList()
   },
   created() {
-    this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory', 'xbotReportEventType').then(() => {
+    this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory', 'residentEventSource').then(() => {
       this.getList()
+      this.getIsAdd()
     })
   },
   methods: {
@@ -110,17 +115,18 @@ export default {
       this.current++
       this.getList()
     },
-    
     getList() {
       let {current, eventStatus, searchGrid: {id: girdId}} = this
-      this.$http.post(`/app/appsessionarchivereportinfo/list`, null, {
+      this.$http.post(`/app/apppatrolreportinfov2/listByGirdMember`, null, {
         params: {
           size: 10,
-          current, searchType: this.currentTabs == 1 ? '1' : '0',
-          eventStatus, girdId
+          current, 
+          eventStatus, 
+          girdId,
+          searchType: this.listIndex,
+          eventSource: this.tabList[this.currentTabs].value
         },
-      })
-      .then((res) => {
+      }).then((res) => {
         if (res.code == 0) {
           this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
           this.pages = res.data.pages
@@ -138,8 +144,19 @@ export default {
       this.getList()
     },
 
+    handleSelectGird(v) {
+      this.searchGrid = v
+      this.current = 1
+      this.getList()
+    },
+    clearGrid() {
+      this.searchGrid = {girdName: ''}
+      this.current = 1
+      this.getList()
+    },
+
     goDetail(item) {
-      uni.navigateTo({url: `./Detail?id=${item.id}`})
+      uni.navigateTo({url: `./Detail?id=${item.id}&isShowBtn=1`})
     },
 
     change(index) {
@@ -153,12 +170,35 @@ export default {
     linkTo(url) {
       uni.navigateTo({url})
     },
+    add() {
+      uni.navigateTo({url: './Add'})
+    },
+
+    getIsAdd() {
+      this.$http.post(`/app/apppatrolreportinfov2/checkGirdMemberUser`).then((res) => {
+        if (res.code == 0) {
+          this.isAdd = res.data
+        }
+      })
+    },
+
+    getTypeList() {
+      this.typeList = []
+      this.instance.post(`/app/apppatrolreportinfov2/eventTypeList?eventSource=${this.tabs[this.currIndex].value}`).then(res => {
+        if (res.code == 0) {
+          res.data.map((item) => {
+            var i = {distName: item, dictValue: item}
+            this.typeList.push(i)
+          })
+        }
+      })
+    },
   },
 }
 </script>
 
 <style scoped lang="scss">
-.AppWorkOrder {
+.list-content {
   height: 100%;
   padding: 0;
   width: 100vw;
@@ -203,8 +243,10 @@ export default {
 
       .card-top {
         padding: 32px;
+        position: relative;
 
         .titles {
+          width: 440px;
           margin-bottom: 34px;
           font-size: 32px;
           font-weight: 500;
@@ -218,6 +260,19 @@ export default {
           -webkit-box-orient: vertical;
         }
 
+        .right-type {
+          position: absolute;
+          top: 32px;
+          right: 32px;
+          padding: 4px 10px;
+          background: #EBF3FD;
+          line-height: 34px;
+          font-family: PingFangSC-Regular;
+          font-size: 24px;
+          color: #3D88F5;
+          border-radius: 6px;
+        }
+
         .types,
         .gards {
           margin-top: 8px;
@@ -233,46 +288,60 @@ export default {
 
       .status {
         padding: 32px;
-        border-top: 1px solid #dddddd;
+        border-top: 1px solid #ddd;
+        display: flex;
+        justify-content: space-between;
 
         .icon {
           display: inline-block;
-          width: 8px;
-          height: 8px;
+          width: 16px;
+          height: 16px;
+          border-radius: 50%;
           vertical-align: middle;
-          margin-right: 8px;
+          margin-right: 16px;
+        }
+
+        .time {
+          line-height: 40px;
+          font-family: PingFangSC-Regular;
+          font-size: 28px;
+          color: #999;
         }
       }
 
       .status0 {
-        color: #ff883c;
-
-        .icon {
-          background: #ff883c;
+        .left {
+          color: #ff883c;
+          .icon {
+            background: #ff883c;
+          }
         }
       }
 
       .status1 {
-        color: #1aaaff;
-
-        .icon {
-          background: #1aaaff;
+        .left {
+          color: #1aaaff;
+          .icon {
+            background: #1aaaff;
+          }
         }
       }
 
       .status2 {
-        color: #42d784;
-
-        .icon {
-          background: #42d784;
+        .left {
+          color: #42d784;
+          .icon {
+            background: #42d784;
+          }
         }
       }
 
       .status3 {
-        color: #ff4466;
-
-        .icon {
-          background: #ff4466;
+        .left {
+          color: #ff4466;
+          .icon {
+            background: #ff4466;
+          }
         }
       }
     }
@@ -285,5 +354,10 @@ export default {
     background-color: #f3f6f9;
     padding-bottom: 120px;
   }
+  .grid-name {
+    display: inline-block;
+    font-size: 32px;
+    color: #333;
+  }
 }
 </style>
diff --git a/src/project/weiyang/AppWorkOrder/Map.vue b/src/project/weiyang/AppWorkOrder/Map.vue
index 2a76e1b4..e22678ac 100644
--- a/src/project/weiyang/AppWorkOrder/Map.vue
+++ b/src/project/weiyang/AppWorkOrder/Map.vue
@@ -152,7 +152,6 @@ export default {
         position: evt.latLng
       });
       this.latLng = evt.latLng
-
       var geocoder = new TMap.service.Geocoder();
       geocoder.getAddress({ location: this.latLng }).then((result) => {
         this.address = result.result.address;
diff --git a/src/project/weiyang/AppWorkOrder/SelectUser.vue b/src/project/weiyang/AppWorkOrder/SelectUser.vue
new file mode 100644
index 00000000..3c217612
--- /dev/null
+++ b/src/project/weiyang/AppWorkOrder/SelectUser.vue
@@ -0,0 +1,323 @@
+<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, index)">
+            <div class="imges">
+              <!-- <span>
+                <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: [],
+      detailId: ''
+    }
+  },
+  onLoad(option) {
+    this.detailId = option.detailId
+    this.getTree()
+  },
+  onShow() {
+    document.title = '选择人员'
+  },
+  methods: {
+    getTree() {
+      this.slectList = []
+      this.$http.post(`/app/apppatrolreportinfov2/listGirdInfoByTransfer?id=${this.detailId}`).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: '可选范围',
+        id: '',
+      }
+      this.slectList.push(obj)
+      this.treeList = this.allData
+    },
+
+    itemClick(row, index) {
+      if(!this.treeList[index].girdMemberList.length) {
+        return this.$u.toast('该网格下暂无网格员')
+      }
+      var obj = {
+        girdName: row.girdName,
+        id: row.id,
+      }
+      this.slectList.push(obj)
+      this.searckGird(index)
+    },
+
+    searckGird(index) {
+      this.userList = this.treeList[index].girdMemberList
+    },
+
+    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/weiyang/AppWorkOrder/Statistics.vue b/src/project/weiyang/AppWorkOrder/Statistics.vue
index 3927e6e7..9985bb2f 100644
--- a/src/project/weiyang/AppWorkOrder/Statistics.vue
+++ b/src/project/weiyang/AppWorkOrder/Statistics.vue
@@ -2,8 +2,9 @@
   <div class="statistics">
     <AiTopFixed>
       <div class="select-gird">
-        <AiPagePicker type="dept" v-model="selectDept" valueObj nodeKey="fullId" formType="2" class="right-span" @change="changeDept">
-          <AiMore v-model="selectDept.fullName"/>
+        <AiPagePicker type="gird" valueObj nodeKey="id" formType="2" @select="handleSelectGird" class="right-span"
+                      action="/app/apppatrolreportinfo/listByInfo">
+          <AiMore v-model="selectGird.girdName" icon="arrow-right" placeholder="选择网格"/>
         </AiPagePicker>
       </div>
     </AiTopFixed>
@@ -11,32 +12,33 @@
       <div class="info-content">
         <div class="title">概况总览</div>
         <div class="el-row">
-          <div class="item" v-for="(item, index) in todayList" :key="index" v-if="item.label != '累计办结'">
-            <h2>{{item.value}}</h2>
-            <p>{{item.label}}</p>
+          <div class="item" v-for="(item, index) in todayList" :key="index" @click="toList(item)">
+            <h2>{{ item.value }}</h2>
+            <p>{{ item.label }}</p>
           </div>
         </div>
       </div>
       <div class="info-content">
         <div class="title">事件办结率</div>
-        <div class="echart-content" id="finish"></div>
-        <div class="num" v-if="finishData">{{finshNum}}%</div>
+        <div class="echart-content" id="finish" v-if="showFinish"></div>
+        <div class="num" v-if="showFinish">{{ finshNum || 0 }}%</div>
         <AiEmpty v-else></AiEmpty>
       </div>
 
       <div class="info-content">
-        <div class="title">工单上报趋势图</div>
-        <div class="echart-content" id="trend"></div>
+        <div class="title">工单管理趋势图</div>
         <AiEmpty v-if="!trendData.length"></AiEmpty>
+        <div class="echart-content" id="trend" v-else></div>
       </div>
 
       <div class="info-content">
-        <div class="title">工单事件分类
-          <div class="type-select" :style="statusInfo.name ? '' : 'color:#999;'" @click="show=true">{{statusInfo.name || '请选择'}}<u-icon name="arrow-right"></u-icon></div>
-          <u-select v-model="show" :list="$dict.getDict('xbotEventStatusSearch')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
+        <div class="title">巡查事件分类
+          <!-- <div class="type-select" :style="statusInfo.name ? '' : 'color:#999;'" @click="show=true">{{statusInfo.name || '请选择'}}<u-icon name="arrow-right"></u-icon></div> -->
+          <u-select v-model="show" :list="$dict.getDict('clapEventStatusHistory')" value-name="dictValue"
+                    label-name="dictName" @confirm="selectStatus"></u-select>
         </div>
-        <div class="echart-content" id="type"></div>
         <AiEmpty v-if="!typeData.length"></AiEmpty>
+        <div class="echart-content" id="type" v-else></div>
       </div>
       <div class="pad-b120"></div>
     </div>
@@ -46,47 +48,38 @@
 <script>
 import {mapState} from 'vuex'
 import echarts from 'echarts'
+
 export default {
   props: {},
   data() {
     return {
       todayList: [],
-      selectDept: {fullId: '', fullName: ''},
+      selectGird: {id: '', girdName: ''},
       finishChart: null,
       trendChart: null,
       typeChart: null,
       show: false,
       finishData: [],
+      showFinish: false,
       finshNum: '',
       trendData: [],
       trendDataX: [],
       typeData: [],
-      statusInfo: {name: '', eventStatus: ''}
+      statusInfo: {name: '', eventStatus: ''},
     }
   },
   computed: {
     ...mapState(['user']),
   },
-  
-  mounted() {
-    // this.selectGird.girdName = this.user.girdName
-    // this.selectGird.girdId = this.user.girdId
-    this.$dict.load('xbotEventStatusSearch').then(() => {
-      this.getStatistics()
-    })
+
+  created() {
+    this.getGirdInfo()
   },
   methods: {
-    changeDept(e) {
-      this.selectDept = e[0]
-      this.getStatistics()
-    },
     getStatistics() {
-      this.todayList = [], this.finishData = [], this.trendDataX = [], this.trendData = [], this.typeData = []
-      this.$http.post(`/app/appsessionarchivereportinfo/countByDeptId?deptFullId=${this.selectDept.fullId}&eventStatus=${this.statusInfo.eventStatus}`).then((res) => {
+      this.todayList = [], this.finishData = [], this.trendDataX = [], this.trendData = [], this.typeData = [], this.showFinish = false
+      this.$http.post(`/app/apppatrolreportinfov2/countByGirdId?girdId=${this.selectGird.id}&eventStatus=${this.statusInfo.eventStatus}`).then((res) => {
         if (res.code == 0) {
-          this.$nextTick(() => {
-            this.chartInit()
-          })
 
           Object.keys(res.data.allCountMap).forEach((key) => {
             var info = {
@@ -96,20 +89,24 @@ export default {
             this.todayList.push(info)
           })
 
-          Object.keys(res.data.allCountMap).forEach((key) => {
-            if(key == '累计上报' || key == '累计办结') {
-              var info = {
-                name: key,
-                value: res.data.allCountMap[key]
-              }
-              this.finishData.push(info)
+          Object.keys(res.data.finishCountMap).forEach((key) => {
+            var info = {
+              name: key,
+              value: res.data.finishCountMap[key]
             }
+            if (res.data.finishCountMap[key] > 0) {
+              this.showFinish = true
+            }
+            this.finishData.push(info)
           })
-          
-          var num = Number(res.data.allCountMap['累计办结'])/Number(res.data.allCountMap['累计上报'])
-          this.finshNum = Number(num*100).toFixed(2)
 
-          res.data.trend.map((item) => {
+          if (this.showFinish) {
+            var num = res.data.finishCountMap['累计事件办结'] / res.data.finishCountMap['累计事件上报']
+            this.finshNum = Number(num * 100).toFixed(2)
+          }
+
+
+          res.data.dateCountList.map((item) => {
             this.trendData.push(item.ecount)
             this.trendDataX.push(item.ymd)
           })
@@ -122,16 +119,35 @@ export default {
             this.typeData.push(info)
           })
 
-          this.chartInit()
+          this.$nextTick(() => {
+            if (this.showFinish) {
+              this.finishChartInit()
+            }
+            if (this.trendData.length) {
+              this.trendChartInit()
+            }
+            if (this.typeData.length) {
+              this.typeChartInit()
+            }
+          })
         }
       })
     },
 
-    chartInit() {
-      this.finishChart = echarts.init(document.getElementById('finish'))
-      this.trendChart = echarts.init(document.getElementById('trend'))
-      this.typeChart = echarts.init(document.getElementById('type'))
+    getGirdInfo() {
+      this.$http.post(`/app/apppatrolreportinfo/getRootByGirdMember`).then((res) => {
+        if (res.code == 0) {
+          this.selectGird.girdName = res.data.girdName
+          this.selectGird.id = res.data.id
+          this.$dict.load('clapEventStatusHistory').then(() => {
+            this.getStatistics()
+          })
+        }
+      })
+    },
 
+    finishChartInit() {
+      this.finishChart = echarts.init(document.getElementById('finish'))
       var option = {
         tooltip: {
           trigger: 'item'
@@ -144,7 +160,7 @@ export default {
             itemStyle: {
               normal: {
                 color: function (colors) {
-                  var colorList = ['#83B5F7', '#7E94F6', '#85E3D5', '#2891FF'];
+                  var colorList = ['#7E94F6', '#85E3D5', '#2891FF'];
                   return colorList[colors.dataIndex];
                 }
               },
@@ -161,7 +177,10 @@ export default {
         ]
       };
       this.finishChart.setOption(option)
+    },
 
+    trendChartInit() {
+      this.trendChart = echarts.init(document.getElementById('trend'))
       var option2 = {
         grid: {
           left: '5%',
@@ -187,7 +206,7 @@ export default {
           data: this.trendDataX
         },
         yAxis: {
-          axisLine:{       //y轴
+          axisLine: {       //y轴
             show: false
           },
           axisTick: {
@@ -209,9 +228,9 @@ export default {
             data: this.trendData,
             type: 'line',
             areaStyle: {//覆盖区域的渐变色
-            	normal: {
-            		color: {
-                  type: 'linear',x: 0,y: 0,x2: 0,y2: 1,
+              normal: {
+                color: {
+                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
                   colorStops: [
                     {
                       offset: 0, color: 'rgba(58,132,255, 0.8)' // 0% 处的颜色
@@ -221,31 +240,34 @@ export default {
                     }
                   ],
                   global: false // 缺省为 false
-		       		  },
-            	}
+                },
+              }
             },
             lineStyle: {
               normal: {
                 color: '#2891FF'
               }
             },
-            itemStyle : {
-              normal : {
-                color:'#2891FF',
+            itemStyle: {
+              normal: {
+                color: '#2891FF',
               }
             }
           }
         ]
       };
       this.trendChart.setOption(option2)
+    },
 
+    typeChartInit() {
+      this.typeChart = echarts.init(document.getElementById('type'))
       var option3 = {
         tooltip: {
           trigger: 'item'
         },
         series: [
           {
-            name: '工单事件分类',
+            name: '巡查事件分类',
             type: 'pie',
             radius: ['0%', '70%'],
             itemStyle: {
@@ -275,6 +297,19 @@ export default {
       this.statusInfo.eventStatus = e[0].value
       this.getStatistics()
     },
+    handleSelectGird(v) {
+      this.selectGird = v || {}
+      this.getStatistics()
+    },
+    toList(row) {
+      var searchType = '', typeList = ['', '', '累计上报', '今日上报', '今日办结', '办理中']
+      typeList.map((item, index) => {
+        if (item == row.label) {
+          return searchType = index
+        }
+      })
+      uni.navigateTo({url: `./StatisticsList?title=${row.label}&searchType=${searchType}&girdId=${this.selectGird.id}`})
+    }
   },
 }
 </script>
@@ -282,44 +317,51 @@ export default {
 <style scoped lang="scss">
 .statistics {
   background-color: #F3F7F8;
-  
+
   .statstics-content {
     padding: 30px 30px 0;
   }
+
   ::v-deep .AiTopFixed {
     .content {
       background-color: #3975C6;
       color: #fff;
     }
-    .icon-img{
+
+    .icon-img {
       width: 48px;
       height: 48px;
     }
   }
-  ::v-deep .AiMore{
-    span{
+
+  ::v-deep .AiMore {
+    span {
       color: #fff;
     }
   }
-  .info-content{
+
+  .info-content {
     width: 100%;
     background: #FFF;
     border-radius: 16px;
     margin-bottom: 24px;
     position: relative;
     padding-bottom: 32px;
-    .title{
+
+    .title {
       font-size: 32px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       color: #333;
       line-height: 48px;
       padding: 24px 16px 24px 24px;
-      img{
+
+      img {
         float: right;
         width: 40px;
         height: 40px;
       }
+
       .type-select {
         font-size: 26px;
         position: absolute;
@@ -330,13 +372,16 @@ export default {
         line-height: 48px;
       }
     }
-    .el-row{
+
+    .el-row {
       display: flex;
       padding: 32px 0 60px 0;
-      .item{
+
+      .item {
         flex: 1;
         text-align: center;
-        h2{
+
+        h2 {
           font-size: 64px;
           font-family: DINAlternate-Bold, DINAlternate;
           font-weight: bold;
@@ -344,7 +389,8 @@ export default {
           line-height: 64px;
           margin-bottom: 8px;
         }
-        p{
+
+        p {
           font-size: 28px;
           font-family: PingFangSC-Regular, PingFang SC;
           color: #999;
@@ -352,10 +398,12 @@ export default {
         }
       }
     }
+
     .echart-content {
       width: 100%;
       height: 500px;
     }
+
     .num {
       position: absolute;
       left: 50%;
@@ -367,7 +415,8 @@ export default {
       text-align: center;
     }
   }
-  .pad-b120{
+
+  .pad-b120 {
     background-color: #F3F7F8;
     padding-bottom: 120px;
   }
diff --git a/src/project/weiyang/AppWorkOrder/StatisticsList.vue b/src/project/weiyang/AppWorkOrder/StatisticsList.vue
new file mode 100644
index 00000000..097b98e1
--- /dev/null
+++ b/src/project/weiyang/AppWorkOrder/StatisticsList.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="list-content">
+    <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">{{ item.groupName }}</span>
+            </div>
+            <div class="types">
+              <span>事件来源</span>
+              <span class="types-right">{{ $dict.getLabel('residentEventSource', item.eventSource) }}</span>
+            </div>
+
+            <div class="gards">
+              <span>所属网格</span>
+              <span class="gards-right">{{ item.girdName }}</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>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  props: {},
+  data() {
+    return {
+      datas: [],
+      current: 1,
+      pages: 0,
+      searchType: '',
+      title: '',
+      girdId: ''
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    listType() {
+      return this.$dict.getDict('clapEventStatusAll')
+    }
+  },
+  onLoad(options) {
+    console.log(options)
+    this.searchType = options.searchType
+    this.title = options.title
+    this.girdId = options.girdId
+  },
+  onShow() {
+    document.title = this.title
+    this.current = 1
+    this.getList()
+  },
+  created() {
+    this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory', 'residentEventSource').then(() => {
+      this.getList()
+    })
+  },
+  methods: {
+    getListInit() {
+      this.current = 1
+      this.getList()
+    },
+    nextPage() {
+      this.current++
+      this.getList()
+    },
+    getList() {
+      let {current, girdId, searchType} = this
+      this.$http.post(`/app/apppatrolreportinfov2/listByStatus`, null, {
+        params: {
+          size: 10,
+          current, 
+          girdId,
+          searchType
+        },
+      }).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()
+        }
+      })
+    },
+    goDetail(item) {
+      uni.navigateTo({url: `./Detail?id=${item.id}&isShowBtn=0`})
+    },
+  },
+  onReachBottom() {
+    this.nextPage()
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.list-content {
+  height: 100%;
+  padding: 0;
+  width: 100vw;
+
+  .select-top {
+    background: #fff;
+    display: flex;
+    padding: 24px 0;
+
+    .tab-item {
+      flex: 1;
+      text-align: center;
+      line-height: 48px;
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #666;
+
+      img {
+        width: 32px;
+        height: 32px;
+        margin-left: 8px;
+        vertical-align: middle;
+      }
+    }
+
+    .tab-item:nth-of-type(1) {
+      border-right: 1px solid #eee;
+    }
+  }
+
+  ::v-deep .AiTopFixed .content {
+    padding: 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;
+  }
+  .grid-name {
+    display: inline-block;
+    font-size: 32px;
+    color: #333;
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppWorkOrder/images/files.png b/src/project/weiyang/AppWorkOrder/images/files.png
deleted file mode 100644
index 10d53502..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/files.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/gird--select-icon.png b/src/project/weiyang/AppWorkOrder/images/gird--select-icon.png
deleted file mode 100644
index 205144d2..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/gird--select-icon.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/local-icon.png b/src/project/weiyang/AppWorkOrder/images/local-icon.png
deleted file mode 100644
index 3e23aff6..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/local-icon.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/pass.png b/src/project/weiyang/AppWorkOrder/images/pass.png
deleted file mode 100644
index 36f698b2..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/pass.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/refuse.png b/src/project/weiyang/AppWorkOrder/images/refuse.png
deleted file mode 100644
index af15b9e5..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/refuse.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/right-icon.png b/src/project/weiyang/AppWorkOrder/images/right-icon.png
deleted file mode 100644
index e1c626b7..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/right-icon.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/shaixuan.png b/src/project/weiyang/AppWorkOrder/images/shaixuan.png
deleted file mode 100644
index 88015ea5..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/shaixuan.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/tx@2x.png b/src/project/weiyang/AppWorkOrder/images/tx@2x.png
deleted file mode 100644
index d9620e08..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/tx@2x.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/xz.png b/src/project/weiyang/AppWorkOrder/images/xz.png
deleted file mode 100644
index 98f78cda..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/xz.png and /dev/null differ
diff --git a/src/project/weiyang/AppWorkOrder/images/xzh.png b/src/project/weiyang/AppWorkOrder/images/xzh.png
deleted file mode 100644
index 967fa399..00000000
Binary files a/src/project/weiyang/AppWorkOrder/images/xzh.png and /dev/null differ