diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
new file mode 100644
index 00000000..042c2fe3
--- /dev/null
+++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
@@ -0,0 +1,352 @@
+<template>
+  <div class="AppCheckpointRegistration">
+    <AiTopFixed>
+      <div class="header">
+        <div class="tab-item">
+          <h2 style="color: #5aad6a">{{ userList.today }}</h2>
+          <p>今日返乡</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color: #f5a319">{{ userList.unReport }}</h2>
+          <p>今日风险</p>
+        </div>
+         <div class="tab-item">
+          <h2 style="color: #2c51ce">{{ userList.total }}</h2>
+          <p>风险处理</p>
+        </div>
+      </div>
+
+      <div class="line1"></div>
+
+      <div class="middle">
+        <div class="left">
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
+            <u-icon name="map-fill" color="#3192F4" size="20px" style="vertical-align: text-bottom"></u-icon>
+            <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>
+
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/身份证号" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+      </div>
+
+      <div class="line2"></div>
+
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#fff" inactive-color="#333" bar-width="192" active-color="#135AB8 " @change="change"></u-tabs>
+
+      <div class="line3"></div>
+    </AiTopFixed>
+
+    <div class="bottoms">
+      <template v-if="data.length">
+        <div class="templates" v-for="(item, i) in data" :key="i" @click="goDetail(item)">
+          <img :src="item.avatar" alt="" v-if="item.avatar" />
+          <img src="./components/img/user-img.png" alt="" v-else />
+
+          <div class="rightCont">
+            <div class="rightContLeft">
+              <div class="nameLeft">
+                <div class="nameTop">
+                  <div class="names">{{ item.name }}</div>
+                  <div class="types" v-if="item.status == '0'">异常</div>
+                </div>
+
+                <div class="nameBottom">
+                  登记时间: 2022-05-19
+                </div>
+              </div>
+              <div style="padding-right: 8px;">
+                <div class="day-info"><span>7</span>/14</div>
+                <div class="typeRight2" v-if="item.today == '0'">今日未上报</div>
+                <div class="typeRight1" v-else>今日已上报</div>
+              </div>
+              
+            </div>
+
+            <u-icon name="arrow-right" color="#ccc"></u-icon>
+          </div>
+        </div>
+      </template>
+
+      <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+ appName: '卡口登记',
+  data() {
+    return {
+      keyword: '',
+      areaId: '',
+      areaName: '',
+      current: 1,
+      size: 10,
+      tabList: [
+        {
+          name: '返乡人员',
+        },
+        {
+          name: '异常人员',
+        },
+      ],
+      currentTabs: 0,
+      userList: [],
+      data: [{name: '123'}],
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  watch: {},
+  onLoad() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    // this.getList()
+    // this.getUserList()
+
+    uni.$on('updateLists', () => {
+      this.current = 1
+      this.getList()
+      this.getUserList()
+    })
+  },
+  onShow() {
+    document.title = '卡口登记'
+  },
+  methods: {
+    getList() {
+      this.$http
+        .post('/app/appepidemicreportmember/list', null, {
+          params: { size: this.size, current: this.current, status: this.currentTabs == 1 ? '0' : '', areaId: this.areaId, name: this.keyword },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+            this.$forceUpdate()
+          }
+        })
+        .catch(() => {
+          this.$forceUpdate()
+        })
+        .finally(() => {
+          this.$forceUpdate()
+        })
+    },
+
+    getUserList() {
+      this.$http.post(`/app/appepidemicreportmember/statistic?areaId=${this.areaId}`).then((res) => {
+        if (res.code == 0) {
+          this.userList = res.data
+        }
+      })
+    },
+
+    goDetail(item) {
+      uni.navigateTo({
+        url: `./Detail?id=${item.id}&diffNum=${item.diffNum}&today=${item.today}`,
+      })
+    },
+
+    areaSelect(e) {
+      this.areaId = e
+      this.getList()
+      this.getUserList()
+    },
+
+    change(index) {
+      this.data = []
+      // this.areaId = this.user.areaId
+      this.keyword = ''
+      this.currentTabs = index
+      this.current = 1
+      this.getList()
+    },
+
+    handerSearch(e) {
+      this.keyword = e
+      this.current = 1
+      this.getList()
+    },
+
+    handerClear() {
+      this.keyword = ''
+      this.current = 1
+      this.getList()
+    },
+  },
+  onReachBottom() {
+    this.current++
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.AppCheckpointRegistration {
+  height: 100%;
+  ::v-deep .AiTopFixed {
+    .placeholder {
+      .content {
+        padding: 0 !important;
+      }
+    }
+    .fixed {
+      margin: 0 !important;
+      .content {
+        padding: 0 !important;
+      }
+    }
+  }
+
+  .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) {
+      h2 {
+        border-right: 0;
+      }
+      
+    }
+  }
+
+  .line1 {
+    height: 4px;
+    background: #f5f5f5;
+  }
+
+  .middle {
+    display: flex;
+    padding: 24px 32px;
+    .left {
+      width: 40%;
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+    .u-search {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  .line2 {
+    height: 8px;
+    background: #f5f5f5;
+  }
+
+  .line3 {
+    height: 6px;
+    background: #f5f5f5;
+  }
+
+  .bottoms {
+    .templates {
+      display: flex;
+      align-items: center;
+      padding: 32px;
+      box-shadow: inset 0px -1px 0px 0px #dddddd;
+      background: #fff;
+      img {
+        width: 128px;
+        height: 128px;
+        // border-radius: 50%;
+        // border: 1px solid #cccccc;
+      }
+      .rightCont {
+        display: flex;
+        justify-content: space-between;
+        margin-left: 32px;
+        width: 100%;
+        .rightContLeft {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          width: 100%;
+          .nameLeft {
+            .nameTop {
+              display: flex;
+              .names {
+                font-size: 32px;
+                font-weight: 500;
+                color: #333333;
+              }
+              .types {
+                margin-left: 16px;
+                padding: 4px 16px 8px 16px;
+                background: #faeceb;
+                border-radius: 20px;
+                font-size: 24px;
+                color: #cd413a;
+              }
+            }
+            .nameBottom {
+              margin-top: 12px;
+              font-size: 28px;
+              color: #999999;
+              .num {
+                color: #135ab8;
+              }
+            }
+          }
+          .typeRight1 {
+            font-size: 28px;
+            color: #999999;
+          }
+          .typeRight2 {
+            font-size: 28px;
+            color: #f5a319;
+          }
+          .day-info{
+            font-size: 32px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            line-height: 44px;
+            margin-bottom: 12px;
+            text-align: right;
+            span{
+              color: #5AAD6A;
+            }
+          }
+        }
+      }
+    }
+
+    .emptyWrap {
+      margin-top: 0;
+      background: #f5f5f5;
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppCheckpointRegistration/Content.vue b/src/project/pingchang/AppCheckpointRegistration/Content.vue
new file mode 100644
index 00000000..7e33a96a
--- /dev/null
+++ b/src/project/pingchang/AppCheckpointRegistration/Content.vue
@@ -0,0 +1,482 @@
+<template>
+  <div class="album">
+    <div class="form-item__group">
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>个人健康状况（可多选）</h2>
+          </div>
+          <div class="form-item__right">
+            <AiCheckbox
+                style="width: 100%"
+                v-model="form.health"
+                dict="epidemicRecentHealth"
+            ></AiCheckbox>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>当前状态</h2>
+          </div>
+          <div class="form-item__right">
+            <AiSelect
+                dict="epidemicRecentTravel"
+                v-model="form.travelType"
+                class="select"
+            ></AiSelect>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-item__group">
+      <div class="form-item form-item__textarea">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i></i>
+            <h2>备注说明</h2>
+          </div>
+          <div class="form-item__right">
+            <textarea
+                auto-height
+                style="height: 180px"
+                v-model="form.description"
+                :maxlength="500"
+                placeholder="请输入备注说明"
+                placeholder-style="font-size: 16px"
+            ></textarea>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">确认</div>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  data() {
+    return {
+      isShowType: false,
+      isShowEndTime: false,
+      isShowStartTime: false,
+      isShowDate: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+      },
+      dataParams: {
+        year: true,
+        month: true,
+        day: true,
+      },
+      form: {
+        arriveAddress: "",
+        arriveAreaId: "",
+        arriveAreaName: "",
+        arriveTime: "",
+        checkPhoto: [],
+        checkResult: "",
+        checkTime: "",
+        description: "",
+        health: [],
+        idNumber: "",
+        name: "",
+        phone: "",
+        startAddress: "",
+        startAreaId: "",
+        startAreaName: "",
+        startTime: "",
+        temperature: "",
+        touchInFourteen: "",
+        travelType: "",
+        type: "",
+        unusual: "",
+        arriveGirdId: '',
+        arriveGirdName: '',
+        corpId: '',
+      },
+      dictList: [],
+      arr: [],
+      gridList: [[], [], []],
+      flag: false,
+      areaId: "",
+    };
+  },
+
+
+  computed: {
+    ...mapState(["user"]),
+  },
+
+  onLoad(option) {
+    this.areaId = this.user.areaId;
+    document.title = '返乡登记'
+    if (option.corpId) {
+      this.form.corpId = option.corpId
+    }
+    this.form.arriveGirdId = option.arriveGirdId
+    this.form.arriveGirdName = decodeURIComponent(option.arriveGirdName)
+  },
+
+  methods: {
+    onDateChange(e) {
+      this.form.checkTime = `${e.year}-${e.month}-${e.day}`;
+    },
+
+    onStartChange(e) {
+      this.form.startTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`;
+    },
+
+    onEndChange(e) {
+      this.form.arriveTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`;
+    },
+
+    submit() {
+      if (!this.form.name) {
+        return this.$u.toast("请输入返乡人员姓名");
+      }
+
+      if (!this.form.idNumber) {
+        return this.$u.toast("请输入返乡人员身份证号");
+      }
+
+      if (
+          !/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)
+      ) {
+        return this.$u.toast("请输入正确的身份证账号");
+      }
+
+      if (!this.form.phone) {
+        return this.$u.toast("请输入返乡人员手机号码");
+      }
+
+      if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
+        return this.$u.toast("请输入正确的手机号码");
+      }
+
+      if (!this.form.type) {
+        return this.$u.toast("请选择人员类别");
+      }
+
+      if (!this.form.travelType) {
+        return this.$u.toast("请选择出行方式");
+      }
+
+      if (!this.form.startTime) {
+        return this.$u.toast("请选择出发时间");
+      }
+
+      if (
+          new Date(this.form.startTime.replace(/-/g, "/")).getTime() >
+          new Date().getTime()
+      ) {
+        return this.$u.toast("出发时间不得晚于当前时间");
+      }
+
+      if (!this.form.startAreaName) {
+        return this.$u.toast("请选择出发地区");
+      }
+
+      if (
+          this.form.startAreaId.substr(this.form.startAreaId.length - 3, 3) ===
+          "000"
+      ) {
+        return this.$u.toast("出发地区必须选到村或社区");
+      }
+      if (!this.form.startAddress) {
+        return this.$u.toast("请输入出发详细地址");
+      }
+
+      if (!this.form.arriveTime) {
+        return this.$u.toast("请选择到达时间");
+      }
+
+      if (
+          new Date(this.form.startTime.replace(/-/g, "/")).getTime() >=
+          new Date(this.form.arriveTime.replace(/-/g, "/")).getTime()
+      ) {
+        return this.$u.toast("到达时间不得早于出发时间");
+      }
+
+      if (!this.form.arriveAreaName) {
+        return this.$u.toast("请选择到达地区");
+      }
+      if (
+          this.form.arriveAreaId.substr(this.form.arriveAreaId.length - 3, 3) ===
+          "000"
+      ) {
+        return this.$u.toast("到达地区必须选到村或社区");
+      }
+      if (!this.form.arriveAddress) {
+        return this.$u.toast("请输入返乡地址");
+      }
+
+      if (!this.form.description) {
+        return this.$u.toast("请输入行程描述");
+      }
+      if (!this.form.checkTime) {
+        return this.$u.toast("请选择核酸检测日期");
+      }
+      if (!this.form.checkPhoto.length) {
+        return this.$u.toast("请上传本人健康码截图或核酸检测报告");
+      }
+
+      if (!this.form.checkResult) {
+        return this.$u.toast("请选择核酸检测结果");
+      }
+      if (!this.form.temperature) {
+        return this.$u.toast("请输入当前体温");
+      }
+      if (!this.form.touchInFourteen) {
+        return this.$u.toast("请选择14天内是否接触新冠确诊或疑似患者");
+      }
+
+      if (!this.form.health.length) {
+        return this.$u.toast("请选择当前健康状况");
+      }
+      if (this.flag) return;
+      this.flag = true;
+
+      this.$loading();
+      this.$http
+      .post(`/app/appepidemicbackhomerecord/addOrUpdate`, {
+        ...this.form,
+        startTime: this.form.startTime + ":00",
+        arriveTime: this.form.arriveTime + ":00",
+        checkTime: this.form.checkTime + " 00:00:00",
+        health: this.form.health.join(","),
+        checkPhoto: JSON.stringify(this.form.checkPhoto),
+      })
+      .then((res) => {
+        this.$hideLoading();
+        this.flag = false;
+        if (res.code == 0) {
+          uni.$emit("updateBackList");
+          setTimeout(() => {
+            uni.navigateTo({url: `./Success?status=1&corpId=${this.form.corpId}`})
+          }, 400);
+        }
+      }).catch((err) => {
+        console.log(err)
+        uni.$emit("updateBackList");
+        uni.navigateTo({url: `./Success?status=1&corpId=${this.form.corpId}`})
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.album {
+  padding-bottom: 140px;
+
+  .tips {
+    line-height: 1.3;
+    padding: 32px 32px;
+    color: #ff883c;
+    font-size: 30px;
+    text-align: justify;
+    background: #fff8f3;
+  }
+
+  .form-item__group {
+    margin-bottom: 24px;
+    background: #fff;
+  }
+
+  .form-item {
+    padding-left: 32px;
+
+    .form-item__checkbox {
+      width: 100%;
+
+      div {
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        margin-bottom: 24px;
+        text-align: center;
+        background: #ffffff;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #cccccc;
+
+        &.active {
+          background: #4181ff;
+          color: #fff;
+          border-color: #4181ff;
+        }
+      }
+    }
+
+    .form-item__radio {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      div {
+        width: 212px;
+        height: 80px;
+        line-height: 80px;
+        margin-right: 16px;
+        margin-bottom: 8px;
+        text-align: center;
+        background: #ffffff;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #cccccc;
+
+        &:nth-of-type(3n) {
+          margin-right: 0;
+        }
+
+        &.active {
+          background: #4181ff;
+          color: #fff;
+          border-color: #4181ff;
+        }
+      }
+    }
+
+    .ai-area__wrapper {
+      display: flex;
+      align-items: center;
+      padding-left: 100px;
+
+      span {
+        color: #333;
+        font-size: 30px;
+      }
+
+      i {
+        color: #999;
+        font-size: 30px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        color: #333;
+        padding-right: 10px;
+      }
+
+      .form-item__right {
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+
+        .select {
+          ._i {
+            padding-left: 100px;
+          }
+        }
+
+        span {
+          max-width: 400px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        i {
+          margin-right: 8px;
+          color: #999999;
+        }
+      }
+    }
+
+    &:last-child {
+      .form-item__wrapper {
+        border-bottom: none;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+
+      i {
+        font-size: 32px;
+        color: #ff4466;
+      }
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+    &.form-item__imgs,
+    &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 90px;
+      }
+
+      .form-item__title {
+        padding: 32px 0;
+      }
+
+      .form-item__right {
+        padding-left: 18px;
+      }
+    }
+  }
+
+  .footer{
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    box-shadow: inset 0px 1px 0px 0px #EEEEEE;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    text-align: center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background: #1365DD;
+    color: #FFF;
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppCheckpointRegistration/Detail.vue b/src/project/pingchang/AppCheckpointRegistration/Detail.vue
new file mode 100644
index 00000000..ec8b46e5
--- /dev/null
+++ b/src/project/pingchang/AppCheckpointRegistration/Detail.vue
@@ -0,0 +1,313 @@
+<template>
+  <div class="Detail">
+    <div class="header">
+      <h2 class="name">{{info.name}}
+        <span @click="callPhone(info.phone)">{{info.phone}}</span><img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(info.phone)" class="phone-icon" />
+      </h2>
+      <p><img src="./components/img/idnumber-icon.png" alt=""><span class="start-name">{{info.idNumber}}</span></p>
+      <p><img src="./components/img/address-icon.png" alt=""><span class="start-name">{{info.startAreaName}}</span></p>
+    </div>
+    <div class="info">
+      <div class="title">上报记录<span class="day-text"><span>7</span>/14</span></div>
+      <p class="mini-title">个人连续无异常上报7天后自动解除风险</p>
+      <div class="error-list">
+        <div class="item" v-for="(item, index) in 10" :key="index">
+          <p class="time">2022-05-16(自主上报）<span>有异常</span></p>
+          <div class="text">
+            <span class="label">健康状况</span>
+            <span class="value">发烧、乏力、咳嗽</span>
+          </div>
+          <div class="text">
+            <span class="label">当前情况</span>
+            <span class="value">发烧、乏力、咳嗽</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bg-line"></div>
+    <div class="footer">
+      <div class="add" @click="toContent">新增记录</div>
+      <div class="confirm" @click="cancel()">解除风险</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      show: false,
+      value: '',
+      id: '',
+      list: [],
+      info: {}
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onShow() {
+    document.title = '异常情况处理'
+  },
+  onLoad(option) {
+    // this.id = option.id
+    this.id = '5173745c3c00452a9346d1c559266982'
+    this.$dict.load('epidemicRecentHealth').then(() => {
+      this.getDetail()
+    })
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          res.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          this.info = res.data
+          this.info.health = this.info.health.split(',')
+        }
+      })
+    },
+    cancel() {
+      this.$confirm(`是否解除该条异常信息？`).then(() => {
+        this.$http.post("/app/appepidemicbackhomerecord/release", {id: this.id}).then(res => {
+          if (res.code == 0) {
+            this.$u.toast("解除成功!")
+            uni.$emit('updateDetail')
+            uni.$emit('updateList')
+            setTimeout(() => {
+              uni.navigateBack()
+            }, 600);
+          }
+        })
+      })
+    },
+    confirm() {
+      if(!this.value) {
+        return this.$u.toast('请输入异常情况')
+      }
+
+      var params = {
+        "content": this.value,
+        "createUserId": this.user.id,
+        "createUserName": this.user.name,
+        "recordId": this.id
+      }
+      this.$http.post("/app/appepidemicunusuallog/addOrUpdate", params).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("新增成功!")
+          this.show = false
+          this.value = ''
+          this.getList()
+        }
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+    toContent() {
+      uni.navigateTo({url: './Content'})
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.Detail {
+  height: 100%;
+  background-color: #f3f6f9;
+  .header {
+    padding: 32px 64px 24px;
+    background-color: #fff;
+    .name{
+      font-size: 36px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 50px;
+      margin-bottom: 36px;
+      span {
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #4181ff;
+        line-height: 44px;
+        margin: 0 20px 0 32px;
+      }
+      img {
+        width: 32px;
+        height: 32px;
+        vertical-align: middle;
+      }
+    }
+    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 {
+    padding: 32px;
+    background-color: #fff;
+    margin-top: 24px;
+    .title {
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      line-height: 52px;
+      overflow: hidden;
+      .day-text{
+        float: right;
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        span{
+          color: #5AAD6A;
+        }
+      }
+    }
+    .mini-title{
+      font-size: 30px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 42px;
+      margin: 18px 0 24px 0;
+    }
+    .error-list {
+      .item {
+        width: 100%;
+        background: #f4f7fe;
+        border-radius: 8px;
+        padding: 32px 32px 24px;
+        box-sizing: border-box;
+        margin-bottom: 16px;
+        .time{
+          font-size: 32px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 44px;
+          overflow: hidden;
+          margin-bottom: 24px;
+          span{
+            float: right;
+            font-size: 28px;
+            font-family: PingFangSC-Regular, PingFang SC;
+          }
+          .color-f46{
+            color: #f46;
+          }
+          .color-2EA222{
+            color: #2EA222;
+          }
+        }
+        .text{
+          font-size: 26px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          line-height: 36px;
+          margin-bottom: 8px;
+          .label{
+            display: inline-block;
+            width: 136px;
+            color: #999;
+          }
+          .value{
+            width: calc(100% - 136px);
+            color: #333;
+          }
+        }
+      }
+    }
+  }
+  .footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #fff;
+    display: flex;
+    font-size: 36px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    .add {
+      flex: 1;
+      color: #333;
+    }
+    .confirm {
+      flex: 2;
+      color: #fff;
+      background: #1365dd;
+    }
+    div {
+      text-align: center;
+    }
+  }
+  .bg-line {
+    width: 100%;
+    height: 130px;
+  }
+  .textarea {
+    margin: 32px 32px 24px;
+    width: calc(100% - 64px);
+    padding: 16px;
+    box-sizing: border-box;
+    background: #f7f7f7;
+    border-radius: 8px;
+    p {
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 36px;
+      text-align: right;
+    }
+  }
+  .btn {
+    padding: 0 32px 24px;
+    height: 64px;
+    display: flex;
+    justify-content: space-between;
+    span {
+      display: inline-block;
+      line-height: 64px;
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #666;
+    }
+    .confirm {
+      width: 144px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 32px;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #fff;
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/address-icon.png b/src/project/pingchang/AppCheckpointRegistration/components/img/address-icon.png
new file mode 100644
index 00000000..1994dc16
Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/address-icon.png differ
diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/idnumber-icon.png b/src/project/pingchang/AppCheckpointRegistration/components/img/idnumber-icon.png
new file mode 100644
index 00000000..06ab7d26
Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/idnumber-icon.png differ
diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/user-img.png b/src/project/pingchang/AppCheckpointRegistration/components/img/user-img.png
new file mode 100644
index 00000000..ae49d85f
Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/user-img.png differ
diff --git a/src/project/pingchang/AppHealthReport/AppHealthReport.vue b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
new file mode 100644
index 00000000..6e9dd796
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
@@ -0,0 +1,353 @@
+<template>
+  <div class="AppHealthReport">
+    <AiTopFixed>
+      <div class="header">
+        <div class="tab-item">
+          <h2 style="color: #5aad6a">{{ userList.today }}</h2>
+          <p>今日上报</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color: #f5a319">{{ userList.unReport }}</h2>
+          <p>今日未报</p>
+        </div>
+         <div class="tab-item">
+          <h2 style="color: #2c51ce">{{ userList.total }}</h2>
+          <p>当前正常</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color: #cd413a; border-right: 0">{{ userList.unusual }}</h2>
+          <p>当前异常</p>
+        </div>
+      </div>
+
+      <div class="line1"></div>
+
+      <div class="middle">
+        <div class="left">
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
+            <u-icon name="map-fill" color="#3192F4" size="20px" style="vertical-align: text-bottom"></u-icon>
+            <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>
+
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/身份证号" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+      </div>
+
+      <div class="line2"></div>
+
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#fff" inactive-color="#333" bar-width="192" active-color="#135AB8 " @change="change"></u-tabs>
+
+      <div class="line3"></div>
+    </AiTopFixed>
+
+    <div class="bottoms">
+      <template v-if="data.length">
+        <div class="templates" v-for="(item, i) in data" :key="i" @click="goDetail(item)">
+          <img :src="item.avatar" alt="" v-if="item.avatar" />
+          <img src="./components/img/user-img.png" alt="" v-else />
+
+          <div class="rightCont">
+            <div class="rightContLeft">
+              <div class="nameLeft">
+                <div class="nameTop">
+                  <div class="names">{{ item.name }}</div>
+                  <div class="types" v-if="item.status == '0'">异常</div>
+                </div>
+
+                <div class="nameBottom">
+                  登记时间: 2022-05-19
+                </div>
+              </div>
+              <div style="padding-right: 8px;">
+                <div class="day-info"><span>7</span>/14</div>
+                <div class="typeRight2" v-if="item.today == '0'">今日未上报</div>
+                <div class="typeRight1" v-else>今日已上报</div>
+              </div>
+              
+            </div>
+
+            <u-icon name="arrow-right" color="#ccc"></u-icon>
+          </div>
+        </div>
+      </template>
+
+      <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+ appName: '健康上报',
+  data() {
+    return {
+      keyword: '',
+      areaId: '',
+      areaName: '',
+      current: 1,
+      size: 10,
+      tabList: [
+        {
+          name: '上报记录',
+        },
+        {
+          name: '历史数据',
+        },
+      ],
+      currentTabs: 0,
+      userList: [],
+      data: [{name: '123'}],
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  watch: {},
+  onLoad() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    // this.getList()
+    // this.getUserList()
+
+    uni.$on('updateLists', () => {
+      this.current = 1
+      this.getList()
+      this.getUserList()
+    })
+  },
+  onShow() {
+    document.title = '健康上报'
+  },
+  methods: {
+    getList() {
+      this.$http
+        .post('/app/appepidemicreportmember/list', null, {
+          params: { size: this.size, current: this.current, status: this.currentTabs == 1 ? '0' : '', areaId: this.areaId, name: this.keyword },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+            this.$forceUpdate()
+          }
+        })
+        .catch(() => {
+          this.$forceUpdate()
+        })
+        .finally(() => {
+          this.$forceUpdate()
+        })
+    },
+
+    getUserList() {
+      this.$http.post(`/app/appepidemicreportmember/statistic?areaId=${this.areaId}`).then((res) => {
+        if (res.code == 0) {
+          this.userList = res.data
+        }
+      })
+    },
+
+    goDetail(item) {
+      uni.navigateTo({
+        url: `./Detail?id=${item.id}&diffNum=${item.diffNum}&today=${item.today}`,
+      })
+    },
+
+    areaSelect(e) {
+      this.areaId = e
+      this.getList()
+      this.getUserList()
+    },
+
+    change(index) {
+      this.data = []
+      // this.areaId = this.user.areaId
+      this.keyword = ''
+      this.currentTabs = index
+      this.current = 1
+      this.getList()
+    },
+
+    handerSearch(e) {
+      this.keyword = e
+      this.current = 1
+      this.getList()
+    },
+
+    handerClear() {
+      this.keyword = ''
+      this.current = 1
+      this.getList()
+    },
+  },
+  onReachBottom() {
+    this.current++
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.AppHealthReport {
+  height: 100%;
+  ::v-deep .AiTopFixed {
+    .placeholder {
+      .content {
+        padding: 0 !important;
+      }
+    }
+    .fixed {
+      margin: 0 !important;
+      .content {
+        padding: 0 !important;
+      }
+    }
+  }
+
+  .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;
+    }
+  }
+
+  .line1 {
+    height: 4px;
+    background: #f5f5f5;
+  }
+
+  .middle {
+    display: flex;
+    padding: 24px 32px;
+    .left {
+      width: 40%;
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+    .u-search {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  .line2 {
+    height: 8px;
+    background: #f5f5f5;
+  }
+
+  .line3 {
+    height: 6px;
+    background: #f5f5f5;
+  }
+
+  .bottoms {
+    .templates {
+      display: flex;
+      align-items: center;
+      padding: 32px;
+      box-shadow: inset 0px -1px 0px 0px #dddddd;
+      background: #fff;
+      img {
+        width: 128px;
+        height: 128px;
+        // border-radius: 50%;
+        // border: 1px solid #cccccc;
+      }
+      .rightCont {
+        display: flex;
+        justify-content: space-between;
+        margin-left: 32px;
+        width: 100%;
+        .rightContLeft {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          width: 100%;
+          .nameLeft {
+            .nameTop {
+              display: flex;
+              .names {
+                font-size: 32px;
+                font-weight: 500;
+                color: #333333;
+              }
+              .types {
+                margin-left: 16px;
+                padding: 4px 16px 8px 16px;
+                background: #faeceb;
+                border-radius: 20px;
+                font-size: 24px;
+                color: #cd413a;
+              }
+            }
+            .nameBottom {
+              margin-top: 12px;
+              font-size: 28px;
+              color: #999999;
+              .num {
+                color: #135ab8;
+              }
+            }
+          }
+          .typeRight1 {
+            font-size: 28px;
+            color: #999999;
+          }
+          .typeRight2 {
+            font-size: 28px;
+            color: #f5a319;
+          }
+          .day-info{
+            font-size: 32px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            line-height: 44px;
+            margin-bottom: 12px;
+            text-align: right;
+            span{
+              color: #5AAD6A;
+            }
+          }
+        }
+      }
+    }
+
+    .emptyWrap {
+      margin-top: 0;
+      background: #f5f5f5;
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppHealthReport/Content.vue b/src/project/pingchang/AppHealthReport/Content.vue
new file mode 100644
index 00000000..7e33a96a
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/Content.vue
@@ -0,0 +1,482 @@
+<template>
+  <div class="album">
+    <div class="form-item__group">
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>个人健康状况（可多选）</h2>
+          </div>
+          <div class="form-item__right">
+            <AiCheckbox
+                style="width: 100%"
+                v-model="form.health"
+                dict="epidemicRecentHealth"
+            ></AiCheckbox>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>当前状态</h2>
+          </div>
+          <div class="form-item__right">
+            <AiSelect
+                dict="epidemicRecentTravel"
+                v-model="form.travelType"
+                class="select"
+            ></AiSelect>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-item__group">
+      <div class="form-item form-item__textarea">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i></i>
+            <h2>备注说明</h2>
+          </div>
+          <div class="form-item__right">
+            <textarea
+                auto-height
+                style="height: 180px"
+                v-model="form.description"
+                :maxlength="500"
+                placeholder="请输入备注说明"
+                placeholder-style="font-size: 16px"
+            ></textarea>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">确认</div>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  data() {
+    return {
+      isShowType: false,
+      isShowEndTime: false,
+      isShowStartTime: false,
+      isShowDate: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+      },
+      dataParams: {
+        year: true,
+        month: true,
+        day: true,
+      },
+      form: {
+        arriveAddress: "",
+        arriveAreaId: "",
+        arriveAreaName: "",
+        arriveTime: "",
+        checkPhoto: [],
+        checkResult: "",
+        checkTime: "",
+        description: "",
+        health: [],
+        idNumber: "",
+        name: "",
+        phone: "",
+        startAddress: "",
+        startAreaId: "",
+        startAreaName: "",
+        startTime: "",
+        temperature: "",
+        touchInFourteen: "",
+        travelType: "",
+        type: "",
+        unusual: "",
+        arriveGirdId: '',
+        arriveGirdName: '',
+        corpId: '',
+      },
+      dictList: [],
+      arr: [],
+      gridList: [[], [], []],
+      flag: false,
+      areaId: "",
+    };
+  },
+
+
+  computed: {
+    ...mapState(["user"]),
+  },
+
+  onLoad(option) {
+    this.areaId = this.user.areaId;
+    document.title = '返乡登记'
+    if (option.corpId) {
+      this.form.corpId = option.corpId
+    }
+    this.form.arriveGirdId = option.arriveGirdId
+    this.form.arriveGirdName = decodeURIComponent(option.arriveGirdName)
+  },
+
+  methods: {
+    onDateChange(e) {
+      this.form.checkTime = `${e.year}-${e.month}-${e.day}`;
+    },
+
+    onStartChange(e) {
+      this.form.startTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`;
+    },
+
+    onEndChange(e) {
+      this.form.arriveTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`;
+    },
+
+    submit() {
+      if (!this.form.name) {
+        return this.$u.toast("请输入返乡人员姓名");
+      }
+
+      if (!this.form.idNumber) {
+        return this.$u.toast("请输入返乡人员身份证号");
+      }
+
+      if (
+          !/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)
+      ) {
+        return this.$u.toast("请输入正确的身份证账号");
+      }
+
+      if (!this.form.phone) {
+        return this.$u.toast("请输入返乡人员手机号码");
+      }
+
+      if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
+        return this.$u.toast("请输入正确的手机号码");
+      }
+
+      if (!this.form.type) {
+        return this.$u.toast("请选择人员类别");
+      }
+
+      if (!this.form.travelType) {
+        return this.$u.toast("请选择出行方式");
+      }
+
+      if (!this.form.startTime) {
+        return this.$u.toast("请选择出发时间");
+      }
+
+      if (
+          new Date(this.form.startTime.replace(/-/g, "/")).getTime() >
+          new Date().getTime()
+      ) {
+        return this.$u.toast("出发时间不得晚于当前时间");
+      }
+
+      if (!this.form.startAreaName) {
+        return this.$u.toast("请选择出发地区");
+      }
+
+      if (
+          this.form.startAreaId.substr(this.form.startAreaId.length - 3, 3) ===
+          "000"
+      ) {
+        return this.$u.toast("出发地区必须选到村或社区");
+      }
+      if (!this.form.startAddress) {
+        return this.$u.toast("请输入出发详细地址");
+      }
+
+      if (!this.form.arriveTime) {
+        return this.$u.toast("请选择到达时间");
+      }
+
+      if (
+          new Date(this.form.startTime.replace(/-/g, "/")).getTime() >=
+          new Date(this.form.arriveTime.replace(/-/g, "/")).getTime()
+      ) {
+        return this.$u.toast("到达时间不得早于出发时间");
+      }
+
+      if (!this.form.arriveAreaName) {
+        return this.$u.toast("请选择到达地区");
+      }
+      if (
+          this.form.arriveAreaId.substr(this.form.arriveAreaId.length - 3, 3) ===
+          "000"
+      ) {
+        return this.$u.toast("到达地区必须选到村或社区");
+      }
+      if (!this.form.arriveAddress) {
+        return this.$u.toast("请输入返乡地址");
+      }
+
+      if (!this.form.description) {
+        return this.$u.toast("请输入行程描述");
+      }
+      if (!this.form.checkTime) {
+        return this.$u.toast("请选择核酸检测日期");
+      }
+      if (!this.form.checkPhoto.length) {
+        return this.$u.toast("请上传本人健康码截图或核酸检测报告");
+      }
+
+      if (!this.form.checkResult) {
+        return this.$u.toast("请选择核酸检测结果");
+      }
+      if (!this.form.temperature) {
+        return this.$u.toast("请输入当前体温");
+      }
+      if (!this.form.touchInFourteen) {
+        return this.$u.toast("请选择14天内是否接触新冠确诊或疑似患者");
+      }
+
+      if (!this.form.health.length) {
+        return this.$u.toast("请选择当前健康状况");
+      }
+      if (this.flag) return;
+      this.flag = true;
+
+      this.$loading();
+      this.$http
+      .post(`/app/appepidemicbackhomerecord/addOrUpdate`, {
+        ...this.form,
+        startTime: this.form.startTime + ":00",
+        arriveTime: this.form.arriveTime + ":00",
+        checkTime: this.form.checkTime + " 00:00:00",
+        health: this.form.health.join(","),
+        checkPhoto: JSON.stringify(this.form.checkPhoto),
+      })
+      .then((res) => {
+        this.$hideLoading();
+        this.flag = false;
+        if (res.code == 0) {
+          uni.$emit("updateBackList");
+          setTimeout(() => {
+            uni.navigateTo({url: `./Success?status=1&corpId=${this.form.corpId}`})
+          }, 400);
+        }
+      }).catch((err) => {
+        console.log(err)
+        uni.$emit("updateBackList");
+        uni.navigateTo({url: `./Success?status=1&corpId=${this.form.corpId}`})
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.album {
+  padding-bottom: 140px;
+
+  .tips {
+    line-height: 1.3;
+    padding: 32px 32px;
+    color: #ff883c;
+    font-size: 30px;
+    text-align: justify;
+    background: #fff8f3;
+  }
+
+  .form-item__group {
+    margin-bottom: 24px;
+    background: #fff;
+  }
+
+  .form-item {
+    padding-left: 32px;
+
+    .form-item__checkbox {
+      width: 100%;
+
+      div {
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        margin-bottom: 24px;
+        text-align: center;
+        background: #ffffff;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #cccccc;
+
+        &.active {
+          background: #4181ff;
+          color: #fff;
+          border-color: #4181ff;
+        }
+      }
+    }
+
+    .form-item__radio {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      div {
+        width: 212px;
+        height: 80px;
+        line-height: 80px;
+        margin-right: 16px;
+        margin-bottom: 8px;
+        text-align: center;
+        background: #ffffff;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #cccccc;
+
+        &:nth-of-type(3n) {
+          margin-right: 0;
+        }
+
+        &.active {
+          background: #4181ff;
+          color: #fff;
+          border-color: #4181ff;
+        }
+      }
+    }
+
+    .ai-area__wrapper {
+      display: flex;
+      align-items: center;
+      padding-left: 100px;
+
+      span {
+        color: #333;
+        font-size: 30px;
+      }
+
+      i {
+        color: #999;
+        font-size: 30px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        color: #333;
+        padding-right: 10px;
+      }
+
+      .form-item__right {
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+
+        .select {
+          ._i {
+            padding-left: 100px;
+          }
+        }
+
+        span {
+          max-width: 400px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        i {
+          margin-right: 8px;
+          color: #999999;
+        }
+      }
+    }
+
+    &:last-child {
+      .form-item__wrapper {
+        border-bottom: none;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+
+      i {
+        font-size: 32px;
+        color: #ff4466;
+      }
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+    &.form-item__imgs,
+    &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 90px;
+      }
+
+      .form-item__title {
+        padding: 32px 0;
+      }
+
+      .form-item__right {
+        padding-left: 18px;
+      }
+    }
+  }
+
+  .footer{
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    box-shadow: inset 0px 1px 0px 0px #EEEEEE;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    text-align: center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background: #1365DD;
+    color: #FFF;
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppHealthReport/Detail.vue b/src/project/pingchang/AppHealthReport/Detail.vue
new file mode 100644
index 00000000..ec8b46e5
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/Detail.vue
@@ -0,0 +1,313 @@
+<template>
+  <div class="Detail">
+    <div class="header">
+      <h2 class="name">{{info.name}}
+        <span @click="callPhone(info.phone)">{{info.phone}}</span><img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(info.phone)" class="phone-icon" />
+      </h2>
+      <p><img src="./components/img/idnumber-icon.png" alt=""><span class="start-name">{{info.idNumber}}</span></p>
+      <p><img src="./components/img/address-icon.png" alt=""><span class="start-name">{{info.startAreaName}}</span></p>
+    </div>
+    <div class="info">
+      <div class="title">上报记录<span class="day-text"><span>7</span>/14</span></div>
+      <p class="mini-title">个人连续无异常上报7天后自动解除风险</p>
+      <div class="error-list">
+        <div class="item" v-for="(item, index) in 10" :key="index">
+          <p class="time">2022-05-16(自主上报）<span>有异常</span></p>
+          <div class="text">
+            <span class="label">健康状况</span>
+            <span class="value">发烧、乏力、咳嗽</span>
+          </div>
+          <div class="text">
+            <span class="label">当前情况</span>
+            <span class="value">发烧、乏力、咳嗽</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bg-line"></div>
+    <div class="footer">
+      <div class="add" @click="toContent">新增记录</div>
+      <div class="confirm" @click="cancel()">解除风险</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      show: false,
+      value: '',
+      id: '',
+      list: [],
+      info: {}
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onShow() {
+    document.title = '异常情况处理'
+  },
+  onLoad(option) {
+    // this.id = option.id
+    this.id = '5173745c3c00452a9346d1c559266982'
+    this.$dict.load('epidemicRecentHealth').then(() => {
+      this.getDetail()
+    })
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          res.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          this.info = res.data
+          this.info.health = this.info.health.split(',')
+        }
+      })
+    },
+    cancel() {
+      this.$confirm(`是否解除该条异常信息？`).then(() => {
+        this.$http.post("/app/appepidemicbackhomerecord/release", {id: this.id}).then(res => {
+          if (res.code == 0) {
+            this.$u.toast("解除成功!")
+            uni.$emit('updateDetail')
+            uni.$emit('updateList')
+            setTimeout(() => {
+              uni.navigateBack()
+            }, 600);
+          }
+        })
+      })
+    },
+    confirm() {
+      if(!this.value) {
+        return this.$u.toast('请输入异常情况')
+      }
+
+      var params = {
+        "content": this.value,
+        "createUserId": this.user.id,
+        "createUserName": this.user.name,
+        "recordId": this.id
+      }
+      this.$http.post("/app/appepidemicunusuallog/addOrUpdate", params).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("新增成功!")
+          this.show = false
+          this.value = ''
+          this.getList()
+        }
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+    toContent() {
+      uni.navigateTo({url: './Content'})
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.Detail {
+  height: 100%;
+  background-color: #f3f6f9;
+  .header {
+    padding: 32px 64px 24px;
+    background-color: #fff;
+    .name{
+      font-size: 36px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 50px;
+      margin-bottom: 36px;
+      span {
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #4181ff;
+        line-height: 44px;
+        margin: 0 20px 0 32px;
+      }
+      img {
+        width: 32px;
+        height: 32px;
+        vertical-align: middle;
+      }
+    }
+    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 {
+    padding: 32px;
+    background-color: #fff;
+    margin-top: 24px;
+    .title {
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      line-height: 52px;
+      overflow: hidden;
+      .day-text{
+        float: right;
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        span{
+          color: #5AAD6A;
+        }
+      }
+    }
+    .mini-title{
+      font-size: 30px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 42px;
+      margin: 18px 0 24px 0;
+    }
+    .error-list {
+      .item {
+        width: 100%;
+        background: #f4f7fe;
+        border-radius: 8px;
+        padding: 32px 32px 24px;
+        box-sizing: border-box;
+        margin-bottom: 16px;
+        .time{
+          font-size: 32px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 44px;
+          overflow: hidden;
+          margin-bottom: 24px;
+          span{
+            float: right;
+            font-size: 28px;
+            font-family: PingFangSC-Regular, PingFang SC;
+          }
+          .color-f46{
+            color: #f46;
+          }
+          .color-2EA222{
+            color: #2EA222;
+          }
+        }
+        .text{
+          font-size: 26px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          line-height: 36px;
+          margin-bottom: 8px;
+          .label{
+            display: inline-block;
+            width: 136px;
+            color: #999;
+          }
+          .value{
+            width: calc(100% - 136px);
+            color: #333;
+          }
+        }
+      }
+    }
+  }
+  .footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #fff;
+    display: flex;
+    font-size: 36px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    .add {
+      flex: 1;
+      color: #333;
+    }
+    .confirm {
+      flex: 2;
+      color: #fff;
+      background: #1365dd;
+    }
+    div {
+      text-align: center;
+    }
+  }
+  .bg-line {
+    width: 100%;
+    height: 130px;
+  }
+  .textarea {
+    margin: 32px 32px 24px;
+    width: calc(100% - 64px);
+    padding: 16px;
+    box-sizing: border-box;
+    background: #f7f7f7;
+    border-radius: 8px;
+    p {
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 36px;
+      text-align: right;
+    }
+  }
+  .btn {
+    padding: 0 32px 24px;
+    height: 64px;
+    display: flex;
+    justify-content: space-between;
+    span {
+      display: inline-block;
+      line-height: 64px;
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #666;
+    }
+    .confirm {
+      width: 144px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 32px;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #fff;
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppHealthReport/components/img/address-icon.png b/src/project/pingchang/AppHealthReport/components/img/address-icon.png
new file mode 100644
index 00000000..1994dc16
Binary files /dev/null and b/src/project/pingchang/AppHealthReport/components/img/address-icon.png differ
diff --git a/src/project/pingchang/AppHealthReport/components/img/idnumber-icon.png b/src/project/pingchang/AppHealthReport/components/img/idnumber-icon.png
new file mode 100644
index 00000000..06ab7d26
Binary files /dev/null and b/src/project/pingchang/AppHealthReport/components/img/idnumber-icon.png differ
diff --git a/src/project/pingchang/AppHealthReport/components/img/user-img.png b/src/project/pingchang/AppHealthReport/components/img/user-img.png
new file mode 100644
index 00000000..ae49d85f
Binary files /dev/null and b/src/project/pingchang/AppHealthReport/components/img/user-img.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue b/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue
new file mode 100644
index 00000000..43534573
--- /dev/null
+++ b/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue
@@ -0,0 +1,263 @@
+<template>
+  <div class="AppReturnHomeReporting">
+    <AiTopFixed>
+      <div class="header">
+        <div class="tab-item">
+          <h2 style="color:#2C51CE;">{{totalInfo.total}}</h2>
+          <p>返乡人员</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color:#5AAD6A;">{{totalInfo.today}}</h2>
+          <p>今日返乡</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color:#F5A319;">{{totalInfo.todayUnusual}}</h2>
+          <p>今日异常</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color:#CD413A;border-right:0;">{{totalInfo.release}}</h2>
+          <p>异常处理</p>
+        </div>
+      </div>
+      <div class="search">
+        <div class="left">
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
+            <u-icon name="map-fill" color="#3192F4" size="20px" style="vertical-align: text-bottom"></u-icon>
+            <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>
+        <u-search v-model="name" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="name='',getListInit"></u-search>
+      </div>
+      <div class="tab-select">
+        <div class="item" :class="!tabIndex ? 'active' : ''" @click="tabClick(0)">返乡人员<span></span></div>
+        <div class="item" :class="tabIndex ? 'active' : ''" @click="tabClick(1)">异常人员<span></span></div>
+      </div>
+    </AiTopFixed>
+    <div class="user-list">
+      <div class="item" @click="toUser(item)" v-for="(item,index) in list" :key="index">
+        <h2 class="name">{{item.name}}<span class="status" v-if="item.status == 0">有异常</span></h2>
+        <p class="color-999">{{item.idNumber}}</p>
+        <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{item.startAreaName}}</span></p>
+        <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{item.arriveAreaName}}</span></p>
+        <p><img src="./components/img/time-icon.png" alt="">{{item.arriveTime}}</p>
+      </div>
+    </div>
+    <AiEmpty v-if="!list.length"></AiEmpty>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'AppReturnHomeReporting',
+  appName: '返乡报备',
+  data() {
+    return {
+      areaId: '',
+      areaName: '',
+      tabIndex: 0,
+      current: 1,
+      list: [],
+      name: '',
+      totalInfo: {}
+    }
+  },
+  computed: { ...mapState(['user']) },
+  created() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+  },
+  onShow() {
+    document.title = '返乡报备'
+    this.getList()
+    this.getTotal()
+    uni.$on('updateList', () => {
+      this.getListInit()
+    })
+  },
+  methods: {
+    areaSelect(e) {
+      this.areaId =e
+      this.$nextTick(() => {
+        this.getListInit()
+      })
+      this.getTotal()
+    },
+    tabClick(index) {
+      this.tabIndex = index
+      this.getListInit()
+    },
+    getListInit() {
+      this.current = 1
+      this.list = []
+      this.getList()
+    },
+    getList() {
+      var status = ''
+      if(this.tabIndex == 1) {
+        status = 0
+      }
+      this.$http.post(`/app/appepidemicbackhomerecord/list?current=${this.current}&size=10&status=${status}&name=${this.name}&arriveAreaId=${this.areaId}`)
+      .then((res) => {
+        if (res.code == 0) {
+          res.data.records.map((item) => {
+            item.idNumber = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          })
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+    getTotal() {
+      this.$http.post(`/app/appepidemicbackhomerecord/statistic?areaId=${this.areaId}`).then((res) => {
+        if (res.code == 0) {
+          this.totalInfo = res.data
+        }
+      })
+    },
+    toUser(row) {
+      uni.navigateTo({url: `./UserInfo?id=${row.id}`})
+    }
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppReturnHomeReporting {
+  .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;
+    }
+  }
+  .search{
+    width: 100%;
+    height: 112px;
+    padding: 32px;
+    box-sizing: border-box;
+    background: #FFF;
+    display: flex;
+    margin-bottom: 8px;
+    .left{
+      width: calc(100% - 402px);
+    }
+  }
+  .tab-select{
+    width: 100%;
+    height: 96px;
+    background: #FFF;
+    display: flex;
+    margin-bottom: 4px;
+    .item{
+      flex: 1;
+      font-size: 32px;
+      line-height: 96px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #333;
+      text-align: center;
+    }
+    .active{
+      color: #135AB8;
+      position: relative;
+      span{
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        width: 192px;
+        margin-left: -96px;
+        border-bottom: 4px solid #135AB8;
+      }
+    }
+  }
+  .user-list{
+    background-color: #f5f5f5;
+    .item{
+      padding: 32px 64px 24px;
+      background-color: #fff;
+      margin-bottom: 8px;
+      .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;
+        }
+      }
+      .start-name{
+        display: inline-block;
+        width: calc(100% - 50px);
+      }
+      .color-999{
+        margin-bottom: 24px;
+        color: #999;
+      }
+    }
+  }
+  ::v-deep .AiTopFixed {
+    .placeholder {
+      .content {
+        padding: 0 !important;
+
+      }
+    }
+    .fixed {
+      margin: 0 !important;
+      background-color: #f5f5f5!important;
+      .content {
+        padding: 0 !important;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
new file mode 100644
index 00000000..c094efe0
--- /dev/null
+++ b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
@@ -0,0 +1,272 @@
+<template>
+  <div class="ErrorInfo">
+    <div class="header">
+      <div class="name">{{info.name}}<span @click="callPhone(info.phone)">{{info.phone}}</span><img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(info.phone)" class="phone-icon" /></div>
+      <p>身份证号：</p>
+      <p class="mar-b8" style="color: #333">{{info.idNumber}}</p>
+      <p>异常情况：</p>
+      <p style="color: #ff4466">
+        <span>{{info.unusual}}</span>
+      </p>
+    </div>
+    <div class="info" v-if="list.length">
+      <div class="title">异常情况记录</div>
+      <div class="error-list">
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <p>{{item.content}}</p>
+          <div>{{item.createTime}}
+            <span>{{item.createUserName}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bg-line"></div>
+    <div class="footer">
+      <div class="add" @click="show = true">新增记录</div>
+      <div class="confirm" @click="cancel()">解除异常</div>
+    </div>
+    <u-popup v-model="show" mode="bottom">
+      <div class="textarea">
+        <u-input v-model="value" type="textarea" :height="120" :auto-height="true" placeholder="异常情况记录" :clearable="false" maxlength="1000" />
+        <p>字数{{value.length}}/1000</p>
+      </div>
+      <div class="btn">
+        <span @click="value=''">清空内容</span>
+        <span class="confirm" @click="confirm">保存</span>
+      </div>
+    </u-popup>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  components: {},
+  props: {},
+  data() {
+    return {
+      show: false,
+      value: '',
+      id: '',
+      list: [],
+      info: {}
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onShow() {
+    document.title = '异常情况处理'
+  },
+  onLoad(option) {
+    this.id = option.id
+    this.$dict.load('epidemicRecentHealth').then(() => {
+      this.getDetail()
+    })
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          res.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          this.info = res.data
+          this.info.health = this.info.health.split(',')
+        }
+      })
+    },
+    cancel() {
+      this.$confirm(`是否解除该条异常信息？`).then(() => {
+        this.$http.post("/app/appepidemicbackhomerecord/release", {id: this.id}).then(res => {
+          if (res.code == 0) {
+            this.$u.toast("解除成功!")
+            uni.$emit('updateDetail')
+            uni.$emit('updateList')
+            setTimeout(() => {
+              uni.navigateBack()
+            }, 600);
+          }
+        })
+      })
+    },
+    confirm() {
+      if(!this.value) {
+        return this.$u.toast('请输入异常情况')
+      }
+
+      var params = {
+        "content": this.value,
+        "createUserId": this.user.id,
+        "createUserName": this.user.name,
+        "recordId": this.id
+      }
+      this.$http.post("/app/appepidemicunusuallog/addOrUpdate", params).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("新增成功!")
+          this.show = false
+          this.value = ''
+          this.getList()
+        }
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.ErrorInfo {
+  height: 100%;
+  .header {
+    padding: 32px 48px;
+    box-sizing: border-box;
+    background-color: #fff;
+    margin-bottom: 24px;
+    .name {
+      font-size: 36px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 50px;
+      margin-bottom: 16px;
+      span {
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #4181ff;
+        line-height: 44px;
+        margin: 0 20px 0 32px;
+      }
+      img {
+        width: 32px;
+        height: 32px;
+        vertical-align: middle;
+      }
+    }
+    p {
+      font-size: 30px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 42px;
+      color: #999;
+    }
+    .mar-b8 {
+      margin-bottom: 8px;
+    }
+  }
+  .info {
+    padding: 0 32px 32px;
+    background-color: #fff;
+    .title {
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      line-height: 116px;
+    }
+    .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;
+          }
+        }
+      }
+    }
+  }
+  .footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #fff;
+    display: flex;
+    font-size: 36px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    .add {
+      flex: 1;
+      color: #333;
+    }
+    .confirm {
+      flex: 2;
+      color: #fff;
+      background: #1365dd;
+    }
+    div {
+      text-align: center;
+    }
+  }
+  .bg-line {
+    width: 100%;
+    height: 130px;
+  }
+  .textarea {
+    margin: 32px 32px 24px;
+    width: calc(100% - 64px);
+    padding: 16px;
+    box-sizing: border-box;
+    background: #f7f7f7;
+    border-radius: 8px;
+    p {
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 36px;
+      text-align: right;
+    }
+  }
+  .btn {
+    padding: 0 32px 24px;
+    height: 64px;
+    display: flex;
+    justify-content: space-between;
+    span {
+      display: inline-block;
+      line-height: 64px;
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #666;
+    }
+    .confirm {
+      width: 144px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 32px;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #fff;
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
new file mode 100644
index 00000000..1c99f9d6
--- /dev/null
+++ b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
@@ -0,0 +1,351 @@
+<template>
+  <div class="BackUserList">
+    <div class="user-list">
+      <div class="item">
+        <h2 class="name">{{info.name}}的返乡登记信息</h2>
+        <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{info.startAreaName}}</span></p>
+        <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{info.arriveAreaName}}</span></p>
+        <p><img src="./components/img/time-icon.png" alt="">{{info.arriveTime}}</p>
+      </div>
+    </div>
+    <div class="info">
+      <div class="title">基本信息</div>
+      <div class="item-flex">
+        <div class="label">姓名</div>
+        <div class="value">{{info.name}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">身份证号</div>
+        <div class="value">{{info.idNumber}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">联系方式</div>
+        <div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
+          <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
+          {{info.phone}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">人员类别</div>
+        <div class="value" :style="(info.type == 0 || info.type == 3 || info.type == 9) ? 'color:#42D784;' : 'color:#f46;'">{{$dict.getLabel('epidemicRecentPersonType', info.type)}}</div>
+      </div>
+    </div>
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="title">行程信息</div>
+      <div class="item-flex">
+        <div class="label">出行方式</div>
+        <div class="value">{{$dict.getLabel('epidemicRecentTravel', info.travelType)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">出发时间</div>
+        <div class="value">{{info.startTime.substring(0, 16)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">出发地区</div>
+        <div class="value" :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">出发地址</div>
+        <div class="value">{{info.startAddress}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">到达时间</div>
+        <div class="value">{{info.arriveTime.substring(0, 16)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">返乡地区</div>
+        <div class="value">{{info.arriveAreaName}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">返乡地址</div>
+        <div class="value">{{info.arriveAddress}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">行程描述</div>
+        <div class="value">{{info.description}}</div>
+      </div>
+    </div>
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="title">核酸检测信息</div>
+      <div class="item-flex">
+        <div class="label">核酸检测日期</div>
+        <div class="value">{{info.checkTime}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">核酸检测结果</div>
+        <div class="value" :style="info.checkResult == 1 ? 'color:#f46;' : 'color:#42D784;'">{{$dict.getLabel('epidemicRecentTestResult', info.checkResult)}}</div>
+      </div>
+      <div class="item-flex border-none">
+        <div style="color:#999;">本人健康码截图或核酸检测报告</div>
+      </div>
+      <div class="img-list">
+        <img :src="item.url" alt="" v-for="(item, index) in info.checkPhoto" :key="index" @click="previewImage(info.checkPhoto, item.url)">
+      </div>
+    </div>
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="title">健康状况</div>
+      <div class="item-flex">
+        <div class="label">当前体温</div>
+        <div class="value" :style="info.temperature >= 37.3 ? 'color:#f46;' : ''">{{info.temperature}}℃</div>
+      </div>
+      <div class="item-flex">
+        <div class="label" style="width:360px;">14天内是否接触新冠确诊或疑似患者</div>
+        <div class="value" :class="'color-'+info.touchInFourteen">{{$dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">当前健康状况</div>
+        <div class="value" >
+          <span v-for="(item, index) in info.health" :key="index" :style="item != 0 ? 'color:#FF4466;' : ''"><span v-if="index>0">;</span>{{$dict.getLabel('epidemicRecentHealth', item)}}</span>
+        </div>
+      </div>
+    </div>
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="title">异常处理情况</div>
+      <div class="error-list" v-if="list.length">
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <p>{{item.content}}</p>
+          <div>{{item.createTime}}
+            <span>{{item.createUserName}}</span>
+          </div>
+        </div>
+      </div>
+      <div class="item-flex" v-if="info.releaseName">
+        <div class="label">异常解除人</div>
+        <div class="value">{{info.releaseName}}</div>
+      </div>
+      <div class="item-flex" v-if="info.releaseName">
+        <div class="label">异常解除时间</div>
+        <div class="value">{{info.releaseTime}}</div>
+      </div>
+      
+    </div>
+    <div class="line-bg" style="padding-bottom: 56px;"></div>
+    <div class="footer" @click="toError" v-if="info.status != 1">异常情况处理</div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      id: '',
+      info: {},
+      list: []
+    }
+  },
+  computed: { ...mapState(['user']) },
+  onShow() {
+    document.title = '返乡人员信息'
+  },
+  onLoad(option) {
+    this.$dict.load('epidemicRecentPersonType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
+      this.id = option.id
+      this.getDetail()
+      this.getList()
+    })
+    uni.$on('updateDetail', () => {
+      this.getList()
+      this.getDetail()
+    })
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data.checkTime) {
+            res.data.checkTime = res.data.checkTime.substring(0, 10)
+          }
+          this.info = res.data
+          this.info.checkPhoto = JSON.parse(this.info.checkPhoto)
+          this.info.health = this.info.health.split(',')
+          this.info.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+        }
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
+    toError() {
+      uni.navigateTo({url: `./ErrorInfo?id=${this.id}`})
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.BackUserList {
+  .user-list{
+    margin-bottom: 24px;
+    .item{
+      padding: 32px 64px 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;
+    }
+    .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;
+      }
+    }
+    .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;
+    }
+  }
+  .line-bg{
+    width: 100%;
+    height: 24px;
+    background-color: #F3F6F9;
+  }
+  .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;
+  }
+  .border-none{
+    border-bottom: 0!important;
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/blue-icon.png b/src/project/pingchang/AppReturnHomeReporting/components/img/blue-icon.png
new file mode 100644
index 00000000..db08e4d0
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/blue-icon.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/fxry.png b/src/project/pingchang/AppReturnHomeReporting/components/img/fxry.png
new file mode 100644
index 00000000..16c7e3c8
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/fxry.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/header.png b/src/project/pingchang/AppReturnHomeReporting/components/img/header.png
new file mode 100644
index 00000000..56cdd003
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/header.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/jkjc.png b/src/project/pingchang/AppReturnHomeReporting/components/img/jkjc.png
new file mode 100644
index 00000000..36c789cd
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/jkjc.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/org-icon.png b/src/project/pingchang/AppReturnHomeReporting/components/img/org-icon.png
new file mode 100644
index 00000000..93c85c58
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/org-icon.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/phone-icon.png b/src/project/pingchang/AppReturnHomeReporting/components/img/phone-icon.png
new file mode 100644
index 00000000..3f374d30
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/phone-icon.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/phone2@.png b/src/project/pingchang/AppReturnHomeReporting/components/img/phone2@.png
new file mode 100644
index 00000000..0cc0c1ca
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/phone2@.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/time-icon.png b/src/project/pingchang/AppReturnHomeReporting/components/img/time-icon.png
new file mode 100644
index 00000000..d7b3df68
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/time-icon.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/user-img.png b/src/project/pingchang/AppReturnHomeReporting/components/img/user-img.png
new file mode 100644
index 00000000..ae49d85f
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/user-img.png differ