diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
index 92287fc4..96be59bf 100644
--- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
@@ -20,23 +20,30 @@
         <div class="item" :class="tabIndex ? 'active' : ''" @click="tabClick(1)">异常人员<span></span></div>
       </div>
       <div class="top-search">
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/手机号/身份证号" :show-action="false" bg-color="#F5F5F5" 
-          search-icon-color="#999" color="#333" height="58" @search="getListInit" @clear="getListInit">
-        </u-search>
-      </div>
-      <div class="top-select">
-        <div class="item">
+        <div class="left">
           <AiAreaPicker v-model="areaId" :areaId="cropAreaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
             <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
             <span v-else>地区选择</span>
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
+        <div class="right">
+          <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/手机号/身份证号" :show-action="false" bg-color="#F5F5F5"
+            search-icon-color="#999" color="#333" height="58" @search="getListInit" @clear="getListInit">
+          </u-search>
+        </div>
+      </div>
+      <div class="top-select">
         <div class="item gateway-type" @click="showGateSelect=true">
           <div v-if="gatewayId" class="gateway-name">{{gatewayName || '卡口选择'}}</div>
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" v-if="gatewayId" />
           <span v-else>卡口选择<u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" /></span>
         </div>
+        <div class="item gateway-type" @click="showhandleSelect=true">
+          <div v-if="handleType" class="gateway-name">{{handleName || '处置方式'}}</div>
+          <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" v-if="handleType" />
+          <span v-else>处置方式<u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" /></span>
+        </div>
       </div>
     </AiTopFixed>
     <div class="user-list" v-if="list.length">
@@ -61,6 +68,7 @@
     </div>
     <AiEmpty v-if="!list.length"></AiEmpty>
     <u-select v-model="showGateSelect" :list="gateList" label-name="name" value-name="id" @confirm="gatewayconfirm"></u-select>
+    <u-select v-model="showhandleSelect" :list="handleList" label-name="dictName" value-name="dictValue" @confirm="handleconfirm"></u-select>
   </div>
 </template>
 
@@ -86,13 +94,13 @@ export default {
       showGateSelect: false,
       gateList: [],
       statusImgList: [
-        require('./components/img/status0.png'), 
-        require('./components/img/status1.png'), 
-        require('./components/img/status2.png'), 
-        require('./components/img/status3.png'), 
-        require('./components/img/status4.png'), 
-        require('./components/img/status5.png'), 
-        require('./components/img/status6.png'), 
+        require('./components/img/status0.png'),
+        require('./components/img/status1.png'),
+        require('./components/img/status2.png'),
+        require('./components/img/status3.png'),
+        require('./components/img/status4.png'),
+        require('./components/img/status5.png'),
+        require('./components/img/status6.png'),
       ],
       options: [
         {
@@ -101,7 +109,12 @@ export default {
             backgroundColor: '#dd524d'
           }
         }
-      ]
+      ],
+
+      handleType: '',
+      handleName: '',
+      showhandleSelect: false,
+      handleList: [],
     }
   },
   computed: { ...mapState(['user']) },
@@ -111,6 +124,8 @@ export default {
     this.getCropAreaId()
     this.getGatewayList()
     this.$dict.load(['EP_handleType', 'EP_riskLevel']).then(() => {
+      this.handleList = this.$dict.getDict('EP_handleType')
+      this.handleList.unshift({dictValue: '', dictName: '全部'})
       this.getList()
       this.getTotal()
     })
@@ -136,7 +151,7 @@ export default {
       this.getList()
     },
     getList() {
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0&current=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}`)
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0&current=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}&handleType=${this.handleType}`)
       .then((res) => {
         if (res.code == 0) {
 
@@ -202,6 +217,12 @@ export default {
       this.gatewayId = e[0].value
       this.getListInit()
     },
+    handleconfirm(e) {
+      console.log(e)
+      this.handleName = e[0].label
+      this.handleType = e[0].value
+      this.getListInit()
+    },
     toUser(row) {
       uni.navigateTo({url: `./UserInfo?id=${row.id}`})
     },
@@ -304,6 +325,13 @@ export default {
   .top-search {
     padding: 20px 32px;
     background-color: #fff;
+    display: flex;
+    .left {
+      width: 240px;
+    }
+    .right {
+      width: calc(100% - 240px);
+    }
   }
   .top-select {
     display: flex;
@@ -428,7 +456,7 @@ export default {
       }
     }
   }
-  .gateway-name {  
+  .gateway-name {
     max-width: calc(100% - 48px);
     word-break: break-all;
     overflow: hidden;
diff --git a/src/project/pingchang/AppCheckpointRegistration/Edit.vue b/src/project/pingchang/AppCheckpointRegistration/Edit.vue
new file mode 100644
index 00000000..12ad274a
--- /dev/null
+++ b/src/project/pingchang/AppCheckpointRegistration/Edit.vue
@@ -0,0 +1,520 @@
+<template>
+  <div class="Edit">
+    <div class="form-info">
+      <div class="info mar-b16">
+        <div class="item">
+          <div class="label">
+            <span class="tips">*</span>出行方式
+          </div>
+        </div>
+        <div class="type-select solid">
+          <div class="type-item" :class="[travelType.includes(v.dictValue)? 'active':'']"  v-for="(v, index) in travelTypeList" :key="index" @click="travelTypeSelect(v.dictValue)">{{v.dictName}}</div>
+        </div>
+        <div class="item">
+          <div class="label" style="width:100%;">
+            <span class="tips"></span>车次/车牌/航班
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.trainNo" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="100" />
+        </div>
+      </div>
+      <div class="info mar-b16">
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>出发时间
+          </div>
+          <div class="value" @click="showDateSelect=true;dateType='startTime'">
+            <span class="color-999" v-if="!form.startTime">请选择</span>
+            <span v-else>{{form.startTime}}</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </div>
+        </div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>出发地
+          </div>
+          <div class="value">
+            <AiAreaPicker v-model="form.startAreaId" all @select="areaSelectStart" :name.sync="form.startAreaName" style="color: #666">
+              <span style="margin-left: 4px" v-if="form.startAreaName">{{ form.startAreaName }}</span>
+              <span v-else>请选择</span>
+              <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+            </AiAreaPicker>
+          </div>
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>出发地详址
+          </div>
+        </div>
+        <div class="item-textarea solid">
+          <u-input v-model="form.startAddress" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="50" />
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>行程描述
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.description" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="500" />
+        </div>
+      </div>
+      <div class="info mar-b16">
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>抵平时间
+          </div>
+          <div class="value" @click="showDateSelect=true;dateType='arriveTime'">
+            <span class="color-999" v-if="!form.arriveTime">请选择</span>
+            <span v-else>{{form.arriveTime}}</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </div>
+        </div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>目的地
+          </div>
+          <div class="value">
+            <AiAreaPicker v-model="form.arriveAreaId" :areaId="cropAreaId" @select="areaSelectArrive" :name.sync="form.arriveAreaName" style="color: #666" selectRoot>
+              <span style="margin-left: 4px" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span>
+              <span v-else>请选择</span>
+              <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+            </AiAreaPicker>
+          </div>
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>目的地详址
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.arriveAddress" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="50" />
+        </div>
+      </div>
+    </div>
+    <div class="btn-height"></div>
+    <div class="footer" @click="submit">提交</div>
+    <u-picker mode="time" :params="params" v-model="showDateSelect" @confirm="dateConfirm"></u-picker>
+    <u-select v-model="showDictSelect" :list="$dict.getDict(selectDictName)" label-name="dictName" value-name="dictValue" @confirm="dictConfirm"></u-select>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      id: '',
+      form: {},
+      showDateSelect: false,
+      showDictSelect: false,
+      selectDictName: '',
+      selectFormName: '',
+      dateType: '',
+      cropAreaId: '',
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true
+      },
+      travelTypeList: [],
+      travelType: []
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen',
+      'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_controlMethod').then(() => {
+      this.id = option.id
+      this.travelTypeList = this.$dict.getDict('EP_travelType')
+      this.getDetail()
+      this.getCropAreaId()
+    })
+
+  },
+  onShow() {
+    document.title = '编辑行程信息'
+  },
+  methods: {
+    submit() {
+      if(!this.travelType.length) {
+        return this.$u.toast('请选择出行方式')
+      }
+      if(!this.form.startTime) {
+        return this.$u.toast('请选择出发时间')
+      }
+      if(!this.form.startAreaId) {
+        return this.$u.toast('请选择出发地')
+      }
+      if(!this.form.arriveTime) {
+        return this.$u.toast('请选择抵平时间')
+      }
+      if(!this.form.arriveAreaId) {
+        return this.$u.toast('请选择目的地')
+      }
+
+      this.form.startTime = this.form.startTime + ':00',
+      this.form.arriveTime = this.form.arriveTime + ':00',
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/updateForAdmin`, this.form).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateDetail')
+          uni.$emit('updateList')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600)
+        }
+      }).catch((err) => {
+        this.$u.toast(err)
+      })
+
+    },
+    travelTypeSelect(value) {
+      const index = this.travelType.indexOf(value)
+      if (index === -1) {
+        this.travelType.push(value)
+      } else {
+        this.travelType.splice(index, 1)
+      }
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.form = res.data
+          this.travelType = res.data.travelType?.split(',')
+          this.form.startTime = res.data.startTime.substr(0, res.data.startTime.length - 3)
+          this.form.arriveTime = res.data.arriveTime.substr(0, res.data.arriveTime.length - 3)
+        }
+      })
+    },
+    getCropAreaId() {
+      this.$http.post(`/app/appdvcpconfig/getCorpArea`).then((res) => {
+        if (res.code == 0) {
+          this.cropAreaId = res.data
+        }
+      })
+    },
+    dateConfirm(e) {
+      this.form[this.dateType] = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+    },
+    dictSelectClick(dictName, formName) {
+      this.selectDictName = dictName
+      this.selectFormName = formName
+      this.showDictSelect = true
+    },
+    dictConfirm(e) {
+      this.form[this.selectFormName] = e[0].value
+    },
+    areaSelectStart(e) {
+      this.startAreaId = e
+    },
+    areaSelectArrive(e) {
+      this.arriveAreaId = e
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.Edit {
+  background-color: #F3F6F9;
+  padding-top: 16px;
+  .user-info {
+    .user-list{
+      margin-bottom: 24px;
+      .item{
+        padding: 32px 32px 24px;
+        background-color: #fff;
+        .name{
+          font-size: 36px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 50px;
+          margin-bottom: 8px;
+          .status{
+            float: right;
+            font-size: 28px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #FF4466;
+            line-height: 40px;
+          }
+        }
+        p{
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 40px;
+          margin-bottom: 8px;
+          img{
+            width: 32px;
+            height: 32px;
+            margin-right: 18px;
+            vertical-align: top;
+          }
+        }
+        .color-999{
+          margin-bottom: 24px;
+          color: #999;
+        }
+        .start-name{
+          display: inline-block;
+          width: calc(100% - 50px);
+        }
+      }
+    }
+    .info{
+      background-color: #fff;
+      padding: 0 32px;
+      .title{
+        line-height: 116px;
+        background: #FFF;
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        overflow: hidden;
+        span {
+          float: right;
+          font-family: PingFangSC-Regular;
+          font-size: 32px;
+          color: #999;
+          font-weight: 400;
+        }
+      }
+      .item-flex{
+        padding: 34px 0;
+        border-bottom: 1px solid #ddd;
+        display: flex;
+        justify-content: space-between;
+        line-height: 44px;
+        font-size: 32px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        .label{
+          width: 206px;
+          color: #999;
+        }
+        .value{
+          width: calc(100% - 206px);
+          word-break: break-all;
+          color: #333;
+          text-align: right;
+          .phone-icon{
+            width: 40px;
+            height: 40px;
+            vertical-align: middle;
+            margin-right: 8px;
+          }
+        }
+        .color-0{
+          color: #42D784;
+        }
+        .color-1{
+          color: #f46;
+        }
+        .color-2{
+          color: #1365DD;
+        }
+
+        .address-color2 {
+          color: #f46;
+        }
+        .address-color1 {
+          color: #ff6200;
+        }
+      }
+      .img-list{
+        padding-bottom: 32px;
+        img{
+          width: 320px;
+          height: 320px;
+        }
+      }
+      .item-flex:nth-last-of-type(1){
+        border-bottom: 0;
+      }
+      .error-list {
+        .item {
+          width: 100%;
+          background: #f4f7fe;
+          border-radius: 8px;
+          padding: 24px 24px 18px 24px;
+          box-sizing: border-box;
+          margin-bottom: 16px;
+          p {
+            font-size: 28px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #343d65;
+            line-height: 40px;
+            word-break: break-all;
+            margin-bottom: 12px;
+          }
+          div {
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #666;
+            line-height: 34px;
+            span {
+              display: inline-block;
+              margin-left: 32px;
+            }
+          }
+        }
+      }
+      .text-p{
+        line-height: 44px;
+        color: #333;
+        padding-bottom: 16px;
+      }
+    }
+    .table-content {
+      padding: 32px 0 48px 0;
+      .item {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        box-sizing: border-box;
+        div {
+          flex: 1;
+          padding: 16px 48px;
+          line-height: 40px;
+          font-family: PingFangSC-Regular;
+          font-size: 28px;
+          color: #333;
+          border-left: 1px solid #ccc;
+          box-sizing: border-box;
+        }
+      }
+      .table-header {
+        background: #F7F7F7;
+        border: 1px solid #ccc;
+        border-left: none;
+      }
+    }
+    .line-bg{
+      width: 100%;
+      height: 24px;
+      background-color: #F3F6F9;
+    }
+    .border-none{
+      border-bottom: 0!important;
+    }
+    .line-text {
+      line-height: 80px;
+      border-bottom: 1px solid #ddd;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      color: #333;
+    }
+  }
+  .item-textarea {
+    width: calc(100% - 32px);
+  }
+  .type-select {
+    .type-item {
+      display: inline-block;
+      width: calc(100% - 32px);
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #FFF;
+      border: 1px solid #CCC;
+      border-radius: 16px;
+      font-family: PingFangSC-Regular;
+      font-size: 28px;
+      color: #333;
+      margin: 0 16px 16px 0;
+      box-sizing: border-box;
+    }
+    .active {
+      background: #4181FF;
+      border: none;
+      color: #fff;
+    }
+  }
+
+  ::v-deep uni-textarea{
+    width: calc(100% - 32px);
+  }
+  .form-info {
+    .info {
+      padding-left: 32px;
+      background-color: #fff;
+      .item {
+        padding-left: 0;
+      }
+      .solid {
+        border-bottom: 1px solid #ddd;
+        box-sizing: border-box;
+      }
+    }
+    .item {
+      background-color: #fff;
+      display: flex;
+      padding: 40px 0 40px 32px;
+      .label {
+        width: 220px;
+        line-height: 48px;
+        font-family: PingFangSC-Medium;
+        font-weight: 500;
+        font-size: 34px;
+        color: #666;
+        .tips {
+          display: inline-block;
+          font-family: PingFangSC-Medium;
+          font-weight: 700;
+          font-size: 34px;
+          color: #F46;
+          margin-right: 8px;
+          vertical-align: text-top;
+        }
+      }
+      .value {
+        width: calc(100% - 220px);
+        padding-right: 32px;
+        text-align: right;
+        font-family: PingFangSC-Regular;
+        font-size: 34px;
+        color: #333;
+        .color-999 {
+          color: #999;
+          font-size: 30px;
+        }
+      }
+      textarea {
+        width: 100%;
+      }
+    }
+  }
+
+  .mar-b16 {
+    margin-bottom: 16px;
+  }
+  .btn-height{
+    height: 130px;
+  }
+  .footer{
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #1365DD;
+    box-shadow: inset 0px 1px 0px 0px #EEEEEE;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+    text-align: center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
index 143d3548..4f57e713 100644
--- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
@@ -36,7 +36,7 @@
     </div>
     <div class="line-bg"></div>
     <div class="info">
-      <div class="title">行程信息</div>
+      <div class="title">行程信息<span @click="toEdit()" style="color:#4181FF;">编辑</span></div>
       <div class="item-flex">
         <div class="label">出行方式</div>
         <div class="value">
@@ -221,7 +221,7 @@
         <p style="padding-bottom: 12px;" v-if="item.remarks">{{item.remarks}}</p>
       </div>
     </div>
-   
+
     <div class="line-bg" style="padding-bottom: 56px;"></div>
     <div class="footer" v-if="info.handleType == 0" @click="toContent">风险处置</div>
     <div class="footer" v-if="info.haveOnlyTransferBtn" @click="toChangeUser">移交人员</div>
@@ -286,6 +286,9 @@ export default {
       }
       uni.setStorageSync('checkPointContent', i)
       uni.navigateTo({url: './ChangeUser?delta=1'})
+    },
+    toEdit() {
+      uni.navigateTo({url: `./Edit?id=${this.info.id}`})
     }
   },
 }
diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
index 0d289e3d..692d4f72 100644
--- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
+++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
@@ -1,27 +1,54 @@
 <template>
   <div class="AppCommunityManagement">
     <AiTopFixed>
-      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" 
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6"
         inactive-color="#A1C1E8" :bar-style="barStyle" :active-item-style="activeStyle" active-color="#ffffff " @change="change">
       </u-tabs>
-      <div class="top-search">
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/手机号/身份证号" :show-action="false" bg-color="#F5F5F5" 
-          search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="getListInit">
-        </u-search>
+      <div class="header">
+        <div class="tab-item">
+          <h2 style="color:#5AAD6A;">{{totalInfo['今日登记']}}</h2>
+          <p>今日返乡</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color:#F5A319;">{{totalInfo['今日风险']}}</h2>
+          <p>今日新增</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color:#CD413A;border-right:0;">{{totalInfo['风险处理']}}</h2>
+          <p>新增风险</p>
+        </div>
       </div>
-      <div class="top-select">
-        <div class="item">
+      <div class="top-search">
+        <div class="left">
           <AiAreaPicker v-model="areaId" :areaId="cropAreaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
             <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
             <span v-else style="color:#999;">地区选择</span>
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
-        <!-- <div class="item" @click="showTypeSelect=true">
-          <span v-if="infoType === ''" style="color:#999;">数据类型</span>
-          <span v-else>{{ $dict.getLabel('EP_registerInfoType', infoType) }}</span>
+        <div class="right">
+          <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/手机号/身份证号" :show-action="false" bg-color="#F5F5F5"
+            search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="getListInit">
+          </u-search>
+        </div>
+      </div>
+      <div class="top-select">
+        <div class="item" @click="showDate=true">
+          <!-- <AiAreaPicker v-model="areaId" :areaId="cropAreaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
+            <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
+            <span v-else style="color:#999;">地区选择</span>
+            <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
+          </AiAreaPicker> -->
+          <span v-if="!dateList.length" style="color:#999;">选择日期</span>
+          <span v-else>{{ dateList[0] }}-{{dateList[1]}}</span>
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
-        </div> -->
+          <u-calendar v-model="showDate" mode="range" @change="changeDate"></u-calendar>
+        </div>
+        <div class="item" @click="showTypeSelect=true">
+          <span v-if="infoType === ''" style="color:#999;">处置意见</span>
+          <span v-else>{{ $dict.getLabel('EP_handleType', infoType) }}</span>
+          <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
+        </div>
       </div>
     </AiTopFixed>
     <div class="data-list" v-if="list && list.length">
@@ -30,7 +57,7 @@
           <div class="title">
             <div class="name">
               {{item.name}}
-              <!-- <span class="type">{{$dict.getLabel('EP_registerInfoType', item.infoType)}}</span> -->
+              <span class="type">{{$dict.getLabel('EP_registerInfoType', item.infoType)}}</span>
             </div>
             <div class="status" :class="item.nucleicAcidSamplingCount >0 ? 'status1' : 'status0'">
               <span class="cir"></span>
@@ -39,13 +66,17 @@
             </div>
           </div>
           <p> {{item.idNumberText}}</p>
-          <p> {{item.phone}}</p>
+          <p>{{item.phone}}</p>
+          <p> 出发地-目的地</p>
           <p> 处置意见：<span :class="'type-'+item.lastRiskDisposal.handleType">{{$dict.getLabel('EP_handleType', item.lastRiskDisposal.handleType)}}</span></p>
-          <div class="btn" v-if="item.status != 2" @click.stop="toEdit(item.id)">排查</div>
+          <div class="btn" v-if="item.status != 2" @click.stop="toEdit(item.id)">管理</div>
           <img src="./components/img/status-img.png" alt="" class="status-img" v-else>
         </div>
         <div class="bottom">
-          <div class="text">管控人：<span> {{item.controllerUserName}}</span> {{item.createTime}}</div>
+          <div class="text">
+            <!-- 管控人：<span> {{item.controllerUserName}}</span>  -->
+            抵平时间：{{item.createTime}}
+          </div>
         </div>
       </div>
     </div>
@@ -73,7 +104,7 @@ export default {
           name: '待管理',
         },
         {
-          name: '已管理',
+          name: '管理中',
         },
         {
           name: '已解除',
@@ -81,7 +112,7 @@ export default {
       ],
       barStyle: {
         'width': '24px',
-        'height': '2px', 
+        'height': '2px',
         'border-radius': '0',
         'bottom': '5px'
       },
@@ -90,7 +121,10 @@ export default {
       },
       list: [],
       registerTypeList: [],
-      cropAreaId: ''
+      cropAreaId: '',
+      totalInfo: {},
+      showDate: false,
+      dateList: []
     }
   },
   computed: {
@@ -100,12 +134,14 @@ export default {
     // this.areaId = this.user.areaId
     // this.areaName = this.user.areaName
     this.$dict.load('EP_CM_status', 'EP_registerInfoType', 'EP_handleType').then(() => {
-      this.registerTypeList = this.$dict.getDict('EP_registerInfoType')
+      this.registerTypeList = this.$dict.getDict('EP_handleType')
       this.registerTypeList.unshift({dictValue: '', dictName: '全部'})
       this.getListInit()
+      this.getTotal()
     })
      uni.$on('updateList', () => {
       this.getListInit()
+      this.getTotal()
     })
     this.getCropAreaId()
   },
@@ -127,8 +163,17 @@ export default {
       this.getList()
     },
     getList() {
-      this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, { 
-        params: { size: 10, current: this.current, status: this.currentTabs, areaId: this.areaId, name: this.keyword, infoType: this.infoType },
+      var startDate = this.dateList[0] + ' 00:00:00'
+      var endDate = this.dateList[1] + ' 00:00:00'
+      this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, {
+        params: {
+          size: 10,
+          current: this.current,
+          status: this.currentTabs,
+          areaId: this.areaId, name:
+          this.keyword,
+          infoType: this.infoType
+        },
       }).then((res) => {
         if (res.code == 0) {
           res.data.records.map((item) => {
@@ -156,7 +201,21 @@ export default {
     typeConfirm(e) {
       this.infoType = e[0].value
       this.getListInit()
-    }
+    },
+
+
+    getTotal() {
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}&infoType=0`).then((res) => {
+        if (res.code == 0) {
+          this.totalInfo = res.data
+        }
+      })
+    },
+    changeDate(e) {
+      console.log(e)
+      this.dateList = [e.startDate, e.endDate]
+      this.getListInit()
+    },
   },
   onReachBottom() {
     this.current++
@@ -181,8 +240,46 @@ export default {
       }
     }
   }
+  .header{
+    padding: 54px 32px 48px 32px;
+    display: flex;
+    background-color: #fff;
+    margin-bottom: 4px;
+    .tab-item{
+      flex: 1;
+      text-align: center;
+
+      h2{
+        font-size: 52px;
+        font-family: DINAlternate-Bold, DINAlternate;
+        font-weight: bold;
+        height: 80px;
+        margin-bottom: 8px;
+        letter-spacing: -4px;
+        border-right: 1px solid #ddd;
+        line-height: 44px;
+      }
+      p{
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 40px;
+        margin-top: -22px;
+      }
+    }
+    .tab-item:nth-last-of-type(1) {
+      border-right: 0;
+    }
+  }
   .top-search {
     padding: 20px 32px;
+    display: flex;
+    .left {
+      width: 240px;
+    }
+    .right {
+      width: calc(100% - 240px);
+    }
   }
   .top-select {
     display: flex;