From b206dfa77fc5b6a1d9fe906ee5610012e22ad404 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 26 Sep 2022 15:18:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppBayonetRegistration.vue                |  63 ++++
 .../components/Detail.vue                     | 279 ++++++++++++++++++
 .../components/List.vue                       | 273 +++++++++++++++++
 .../AppCommunityManagement.vue                |  65 ++++
 .../components/Detail.vue                     | 137 +++++++++
 .../components/List.vue                       | 194 ++++++++++++
 6 files changed, 1011 insertions(+)
 create mode 100644 project/pingchang/apps/AppBayonetRegistration/AppBayonetRegistration.vue
 create mode 100644 project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
 create mode 100644 project/pingchang/apps/AppBayonetRegistration/components/List.vue
 create mode 100644 project/pingchang/apps/AppCommunityManagement/AppCommunityManagement.vue
 create mode 100644 project/pingchang/apps/AppCommunityManagement/components/Detail.vue
 create mode 100644 project/pingchang/apps/AppCommunityManagement/components/List.vue

diff --git a/project/pingchang/apps/AppBayonetRegistration/AppBayonetRegistration.vue b/project/pingchang/apps/AppBayonetRegistration/AppBayonetRegistration.vue
new file mode 100644
index 00000000..c7400681
--- /dev/null
+++ b/project/pingchang/apps/AppBayonetRegistration/AppBayonetRegistration.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="doc-circulation ailist-wrapper">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppRiskArea',
+    label: 'AppBayonetRegistration',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        include: []
+      }
+    },
+
+    components: {
+      Detail,
+      List
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.params = data.params
+        }
+
+        if (data.type === 'list') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
new file mode 100644
index 00000000..974e0a64
--- /dev/null
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -0,0 +1,279 @@
+ <template>
+  <ai-detail isHasSidebar>
+    <template slot="title">
+      <ai-title title="返乡登记详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
+      <div v-show="currIndex === 0">
+        <ai-card title="基本信息" v-show="currIndex === 0">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
+              <ai-info-item label="人员类别" isLine>
+                <span :style="(info.type == 0 || info.type == 3 || info.type ==6 || info.type == 9)? 'color:#42D784;' : 'color:#f46;'">{{dict.getLabel('epidemicRecentPersonType', info.type)}}</span>
+              </ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="行程信息">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="出发时间" :value="info.startTime"></ai-info-item>
+              <ai-info-item label="出发地区" >
+                <span  :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
+              </ai-info-item>
+              <ai-info-item label="出发地址" isLine :value="info.startAddress"></ai-info-item>
+              <ai-info-item label="出行方式" :value="dict.getLabel('epidemicRecentTravel', info.travelType)"></ai-info-item>
+              <ai-info-item label="行程描述" isLine :value="info.description"></ai-info-item>
+              <ai-info-item label="到达时间" :value="info.arriveTime"></ai-info-item>
+              <ai-info-item label="到达地区" :value="info.arriveAreaName"></ai-info-item>
+              <ai-info-item label="返乡地址" isLine :value="info.arriveAddress"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="健康状况">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="当前体温">
+                <span :style="info.temperature >= 37.3 ? 'color:#f46;' : ''">{{ info.temperature + '℃' }}</span>
+              </ai-info-item>
+              <ai-info-item label="14天内是否接触新冠确诊或疑似患者">
+                <span :class="'color-'+info.touchInFourteen">{{$dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)}}</span> 
+              </ai-info-item>
+              <ai-info-item label="当前健康状况"> 
+                <span></span>
+                <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>
+              </ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="核酸检测">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="检测日期" :value="info.checkTime && info.checkTime.split(' ')[0]"></ai-info-item>
+              <ai-info-item label="检测结果">
+                <span :style="info.checkResult == 1 ? 'color:#f46;' : 'color:#42D784;'">{{$dict.getLabel('epidemicRecentTestResult', info.checkResult)}}</span>
+              </ai-info-item>
+              <ai-info-item label="本人健康码截图" isLine>
+                <ai-uploader
+                  :instance="instance"
+                  v-model="info.checkPhoto"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </div>
+      <div v-show="currIndex === 1">
+        <ai-card title="异常处理">
+          <template #right>
+            <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
+          </template>
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
+              <ai-info-item label="人员类别" isLine :value="dict.getLabel('epidemicRecentPersonType', info.type)"></ai-info-item>
+              <ai-info-item label="异常状况" isLine>
+                <span :style="{color: info.unusual ? 'red' : '#333'}">{{ info.unusual || '-' }}</span>
+              </ai-info-item>
+              <ai-info-item label="异常解除人" v-if="info.releaseName && info.status === '1'" :value="info.releaseName"></ai-info-item>
+              <ai-info-item label="异常解除时间" v-if="info.releaseTime && info.status === '1'" :value="info.releaseTime"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="异常情况记录">
+          <template #right>
+            <el-button type="primary" v-if="info.status === '0'" @click="isShow = true">添加记录</el-button>
+          </template>
+          <template #content>
+            <ai-table
+              :tableData="tableData"
+              :col-configs="colConfigs"
+              :total="total"
+              :current.sync="search.current"
+              :size.sync="search.size"
+              @getList="getList">
+              <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+                <template slot-scope="{ row }">
+                  <div class="table-options">
+                    <el-button type="text" @click="remove(row.id)">删除</el-button>
+                  </div>
+                </template>
+              </el-table-column>
+            </ai-table>
+          </template>
+        </ai-card>
+        <ai-dialog
+          :visible.sync="isShow"
+          width="800px"
+          @close="form.content = ''"
+          title="添加异常记录"
+          @onConfirm="onConfirm">
+          <el-form class="ai-form" label-width="120px" :model="form" ref="form">
+            <el-form-item label="异常记录" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入异常记录' }]">
+              <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.content" clearable placeholder="请输入异常记录" show-word-limit></el-input>
+            </el-form-item>
+          </el-form>
+        </ai-dialog>
+      </div>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        total: 0,
+        info: {},
+        id: '',
+        search: {
+          current: 1,
+          size: 10
+        },
+        form: {
+          content: ''
+        },
+        isShow: false,
+        currIndex: 0,
+        tableData: [],
+        colConfigs: [
+          {prop: 'content', label: '异常记录', align: 'center' },
+          {prop: 'createTime', label: '创建时间', align: 'center'},
+          {prop: 'createUserName', label: '记录人', align: 'center' }
+        ],
+        tabList: ['基本信息', '异常处理']
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.$dict.load(['epidemicRecentHealth', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentPersonType', 'epidemicRecentTestResult']).then(() => {
+          this.getInfo(this.params.id)
+        })
+
+        this.getList()
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.checkPhoto = res.data.checkPhoto ? JSON.parse(res.data.checkPhoto) : []
+            let healthName = ''
+            this.info.isHealth = false
+            res.data.health.split(',').forEach(v => {
+              if (v > 0) {
+                this.info.isHealth = true
+              }
+              healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
+            })
+            this.info.healthName = healthName
+            this.info.health = this.info.health.split(',')
+          }
+        })
+      },
+
+      release () {
+        this.$confirm('确定解除异常？').then(() => {
+          this.instance.post(`/app/appepidemicbackhomerecord/release?recordId=${this.params.id}`, {
+            id: this.params.id
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('解除异常成功！')
+              this.currIndex = 0
+              this.getInfo(this.params.id)
+            }
+          })
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicunusuallog/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      onConfirm() {
+        this.$refs.form.validate(v => {
+          if (v) {
+            this.instance.post('/app/appepidemicunusuallog/addOrUpdate', {
+              ...this.form,
+              recordId: this.params.id
+            }).then(res => {
+              if (res?.code == 0) {
+                this.isShow = false
+                this.getList()
+                this.$message.success('添加成功!')
+              }
+            })
+          }
+        })
+      },
+
+      getList () {
+        this.instance.post(`/app/appepidemicunusuallog/list`, null, {
+          params: {
+            ...this.search,
+            recordId: this.params.id
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      cancel () {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: true
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .color-0{
+    color: #42D784;
+  }
+  .color-1{
+    color: #f46;
+  }
+  .color-2{
+    color: #1365DD;
+  }
+</style>
diff --git a/project/pingchang/apps/AppBayonetRegistration/components/List.vue b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
new file mode 100644
index 00000000..111d3f33
--- /dev/null
+++ b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
@@ -0,0 +1,273 @@
+<template>
+  <ai-list class="list" isTabs>
+    <template slot="content">
+      <div class="statistics-top">
+        <div class="statistics-top__item">
+          <span>返乡人数</span>
+          <h2 style="color: #2266FF;">{{ info.total }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>今日新增返乡</span>
+          <h2 style="color: #22AA99;">{{ info.today }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>异常人数</span>
+          <h2 style="color: #F8B425">{{ info.unusual }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>今日异常人数</span>
+          <h2 style="color: red">{{ info.todayUnusual }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>异常处理</span>
+          <h2 style="color: red">{{ info.release }}</h2>
+        </div>
+      </div>
+      <div class="content">
+        <ai-search-bar bottomBorder>
+          <template #left>
+            <ai-select
+              v-model="search.status"
+              clearable
+              placeholder="请选择健康状态"
+              :selectList="dictList"
+              @change="search.current = 1, getList()">
+            </ai-select>
+            <ai-download :instance="instance" url="/app/appepidemicbackhomerecord/export" :params="param" fileName="返乡登记" :disabled="tableData.length == 0">
+              <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
+            </ai-download>
+          </template>
+          <template #right>
+            <el-input
+              v-model="search.name"
+              size="small"
+              placeholder="请输入姓名"
+              clearable
+              v-throttle="() => {search.current = 1, getList()}"
+              @clear="search.current = 1, search.name = '', getList()"
+              suffix-icon="iconfont iconSearch">
+            </el-input>
+          </template>
+        </ai-search-bar>
+        <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          v-loading="loading"
+          style="margin-top: 16px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
+          <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+                <el-button type="text" @click="remove(row.id)">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </div>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      areaId: String
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          name: '',
+          status: ''
+        },
+        dictList: [{
+          dictName: '异常',
+          dictValue: '0'
+        }, {
+          dictName: '正常',
+          dictValue: '1'
+        }],
+        info: {},
+        colConfigs: [
+          { prop: 'name', label: '姓名' },
+          { prop: 'phone', align: 'center', label: '手机号码' },
+          { prop: 'startTime', align: 'center', label: '出发时间', formart: v => v.substr(0, v.length - 3) },
+          {
+            prop: 'startAreaName',
+            align: 'center',
+            label: '出发地区'
+          },
+          { prop: 'arriveTime', align: 'center', label: '到达时间', formart: v => v.substr(0, v.length - 3) }, 
+          {
+            prop: 'arriveAreaName',
+            align: 'center',
+            label: '到达地区'
+          },
+          { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v.split(' ')[0] },
+          {
+            prop: 'status',
+            align: 'center',
+            label: '健康状态',
+            render: (h, {row}) => {
+              return h('span', {
+                style: {
+                  color: row.status === '0' ? 'red' : '#333'
+                }
+              }, row.status === '0' ? '异常' : '正常')
+            }
+          }
+        ],
+        ids: [],
+        tableData: [],
+        total: 0,
+        loading: false,
+        disabledLevel: 0
+      }
+    },
+
+    computed: {
+      ...mapState(['user']),
+
+      param () {
+        return this.search
+      }
+    },
+
+    created () {
+      this.disabledLevel = this.user.info.areaList.length - 1
+      this.loading = true
+      this.dict.load(['marriageType', 'marriagePersonType', 'modeType']).then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appepidemicbackhomerecord/list`, null, {
+          params: {
+            ...this.search,
+            arriveAreaId: this.areaId
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+        
+        this.getTotalInfo()
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      changeArea () {
+        this.search.current = 1
+
+        this.$nextTick(() => {
+          this.getList()
+          this.getTotalInfo()
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicbackhomerecord/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getTotalInfo()
+              this.getList()
+            }
+          })
+        })
+      },
+
+
+      getTotalInfo () {
+        this.instance.post(`/app/appepidemicbackhomerecord/statistic`, null, {
+          params: {
+            areaId: this.search.arriveAreaId
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.info = res.data
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .list {
+    ::v-deep .ai-list__content {
+      padding: 0!important;
+
+      .ai-list__content--right-wrapper {
+        background: transparent!important;
+        box-shadow: none!important;
+        margin: 0!important;
+        padding: 0 0 0!important;
+      }
+    }
+    .statistics-top {
+      display: flex;
+      align-items: center;
+      margin-bottom: 20px;
+
+      & > div {
+        flex: 1;
+        height: 96px;
+        line-height: 1;
+        margin-right: 20px;
+        padding: 16px 24px;
+        background: #FFFFFF;
+        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
+        border-radius: 4px;
+
+        &:last-child {
+          margin-right: 0;
+        }
+
+        h3 {
+          font-size: 24px;
+        }
+
+        span {
+          display: block;
+          margin-bottom: 16px;
+          color: #888888;
+          font-size: 16px;
+        }
+      }
+    }
+
+    .content {
+      padding: 16px;
+      background: #FFFFFF;
+      box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
+    }
+  }
+</style>
diff --git a/project/pingchang/apps/AppCommunityManagement/AppCommunityManagement.vue b/project/pingchang/apps/AppCommunityManagement/AppCommunityManagement.vue
new file mode 100644
index 00000000..3fb207c9
--- /dev/null
+++ b/project/pingchang/apps/AppCommunityManagement/AppCommunityManagement.vue
@@ -0,0 +1,65 @@
+<template>
+  <div class="doc-circulation ailist-wrapper">
+    <keep-alive :include="['List']">
+      <component ref="component" :moduleName="moduleName" :moduleId="moduleId" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppCommunityManagement',
+    label: '社区管理',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        moduleId: '',
+        include: [],
+        moduleName: ''
+      }
+    },
+
+    components: {
+      Detail,
+      List
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.params = data.params
+        }
+
+        if (data.type === 'List') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
new file mode 100644
index 00000000..2490fab0
--- /dev/null
+++ b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
@@ -0,0 +1,137 @@
+<template>
+  <ai-detail isHasSidebar>
+    <template slot="title">
+      <ai-title title="社区管理详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
+      <div v-show="currIndex === 0">
+        <ai-card title="基本信息" v-show="currIndex === 0">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="管理对象" :value="info.name"></ai-info-item>
+              <ai-info-item label="对象类型" :value="dict.getLabel('EP_registerInfoType', info.infoType)"></ai-info-item>
+              <ai-info-item label="身份证" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="手机号" :value="info.phone"></ai-info-item>
+              <ai-info-item label="所属地区" :value="info.areaName" isLine></ai-info-item>
+              <ai-info-item label="居家状态" :value="dict.getLabel('EP_homeStatus2', info.homeStatus)"></ai-info-item>
+              <ai-info-item label="隔离时间" :value="info.quarantineBeginTime + ' - ' + info.quarantineEndTime"></ai-info-item>
+              <ai-info-item label="隔离策略 " :value="dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)"></ai-info-item>
+              <ai-info-item label="管控人" :value="info.controllerUserName"></ai-info-item>
+              <ai-info-item label="联系方式" :value="info.controllerUserPhone"></ai-info-item>
+              <ai-info-item label="管理内容" isLine :value="info.controllerContent"></ai-info-item>
+              <ai-info-item label="图片" isLine>
+                <ai-uploader
+                  :instance="instance"
+                  :value="info.fileList"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </div>
+      <div v-show="currIndex === 1">
+        <ai-card title="核酸详情">
+          <template #content>
+            <ai-table
+              :isShowPagination="false"
+              tableSize="small"
+              border
+              :tableData="info.nucleicAcidSamplingList"
+              :col-configs="colConfigs"
+              @getList="() => {}">
+            </ai-table>
+          </template>
+        </ai-card>
+      </div>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        total: 0,
+        info: {},
+        search: {
+          current: 1,
+          size: 10
+        },
+        currIndex: 0,
+        colConfigs: [
+          { prop: 'createUserName', label: '采样人', align: 'center' },
+          { prop: 'createUserPhone', label: '联系方式', align: 'center'},
+          { prop: 'createTime', label: '采样时间', align: 'center' }
+        ],
+        tabList: ['基本信息', '核酸详情']
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.$dict.load(['EP_CM_status', 'EP_registerInfoType', 'EP_homeStatus2', 'EP_quarantineStrategy']).then(() => {
+          this.getInfo(this.params.id)
+        })
+
+        this.getList()
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+          }
+        })
+      },
+
+      getList () {
+        this.instance.post(`/app/appepidemicunusuallog/list`, null, {
+          params: {
+            ...this.search,
+            recordId: this.params.id
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      cancel () {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: true
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .color-0{
+    color: #42D784;
+  }
+  .color-1{
+    color: #f46;
+  }
+  .color-2{
+    color: #1365DD;
+  }
+</style>
diff --git a/project/pingchang/apps/AppCommunityManagement/components/List.vue b/project/pingchang/apps/AppCommunityManagement/components/List.vue
new file mode 100644
index 00000000..4b7e2164
--- /dev/null
+++ b/project/pingchang/apps/AppCommunityManagement/components/List.vue
@@ -0,0 +1,194 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="社区管理" isShowBottomBorder></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <ai-select
+            v-model="search.infoType"
+            clearable
+            placeholder="请选择对象类型"
+            :selectList="dict.getDict('EP_registerInfoType')"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <ai-select
+            v-model="search.status"
+            clearable
+            placeholder="请选择现实状态"
+            :selectList="dict.getDict('epidemicDangerousAreaLevel')"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+            <div class="userSelcet">
+              <span style="color: #606266;" v-if="search.controllerUserId">{{ name }}</span>
+              <span v-else>管控人</span>
+              <i class="el-icon-arrow-up"  v-if="!search.controllerUserId"></i>
+              <i class="el-icon-circle-close" v-if="search.controllerUserId" @click.stop="user = [], search.controllerUserId = '', name = '', search.current = 1, getList()"></i>
+            </div>
+          </ai-user-selecter>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.name"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current = 1, getList()}"
+            placeholder="标题、排查对象、排查人"
+            clearable
+            @clear="search.current = 1, search.name = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 6px;"
+        v-loading="isLoading"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="options" width="100px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toDeital(row.id)">详情</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          name: '',
+          infoType: '',
+          controllerUserId: ''
+        },
+        user: [],
+        name: '',
+        img: '',
+        isLoading: false,
+        total: 10,
+        colConfigs: [
+          { prop: 'name',  label: '管理对象', align: 'left' },
+          { prop: 'phone', label: '手机号', align: 'center' },
+          { prop: 'idNumber',  label: '身份证号', align: 'center' },
+          { prop: 'createTime', label: '排查时间', align: 'center' },
+          { prop: 'areaName',  label: '所属地区', align: 'center' },
+          { prop: 'status', label: '管理状态', align: 'center', formart: v => this.dict.getLabel('EP_CM_status', v) },
+          { prop: 'nucleicAcidSamplingCount',  label: '核酸状态', align: 'center', formart: v => v > 0 ? `核酸采集${v}次` : '待采' },
+          { prop: 'infoType', label: '对象来源', align: 'center', formart: v => this.dict.getLabel('EP_registerInfoType', v) },
+          { prop: 'controllerUserName',  label: '管控人', align: 'center' }
+        ],
+        tableData: []
+      }
+    },
+
+    created() {
+      this.$dict.load(['EP_CM_status', 'EP_registerInfoType', 'EP_registerInfoType']).then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appepidemicpreventioncommunitymanagement/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      toDeital (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id
+          }
+        })
+      },
+
+      onUserChange (e) {
+        if (e.length) {
+          this.name = e[0].name
+          this.search.controllerUserId = e[0].openId
+        } else {
+          this.search.controllerUserId = ''
+          this.name = ''
+        }
+
+        this.search.current = 1
+        this.getList()
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .notice {
+    .userSelcet {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 215px;
+      height: 32px;
+      line-height: 32px;
+      border-radius: 4px;
+      border: 1px solid #d0d4dc;
+      overflow: hidden;
+      cursor: pointer;
+      transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+
+      &:hover {
+        border-color: #26f;
+      }
+
+      i {
+        display: flex;
+        position: relative;
+        align-items: center;
+        justify-content: center;
+        width: 30px;
+        height: 100%;
+        line-height: 32px;
+        font-size: 14px;
+        text-align: center;
+        color: #d0d4dc;
+        transform: rotateZ(180deg);
+      }
+
+      .el-icon-circle-close:hover {
+        opacity: 0.6;
+      }
+
+      span {
+        flex: 1;
+        padding: 0 15px;
+        font-size: 12px;
+        color: $placeholderColor;
+      }
+    }
+  }
+</style>

From 43527038aaa743acc6cccad902a2a24b004ebf11 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 26 Sep 2022 15:21:12 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/apps/AppCommunityManagement/components/Detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
index 2490fab0..894cfae9 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
@@ -17,7 +17,7 @@
               <ai-info-item label="手机号" :value="info.phone"></ai-info-item>
               <ai-info-item label="所属地区" :value="info.areaName" isLine></ai-info-item>
               <ai-info-item label="居家状态" :value="dict.getLabel('EP_homeStatus2', info.homeStatus)"></ai-info-item>
-              <ai-info-item label="隔离时间" :value="info.quarantineBeginTime + ' - ' + info.quarantineEndTime"></ai-info-item>
+              <ai-info-item label="隔离时间" :value="info.quarantineBeginTime ? info.quarantineBeginTime.split(' ')[0] + ' - ' + info.quarantineEndTime.split(' ')[0] : ''"></ai-info-item>
               <ai-info-item label="隔离策略 " :value="dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)"></ai-info-item>
               <ai-info-item label="管控人" :value="info.controllerUserName"></ai-info-item>
               <ai-info-item label="联系方式" :value="info.controllerUserPhone"></ai-info-item>

From b6314205001e52f83cf0c0ed61a6d1b1aed26cfb Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 26 Sep 2022 17:07:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=A1=E5=8F=A3=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Announce/AppAnnounce/components/List.vue  |   2 +-
 .../AppBayonetRegistration.vue                |   8 +-
 .../components/Detail.vue                     | 205 +++++-------------
 .../components/List.vue                       | 112 +++++-----
 .../components/List.vue                       |   7 +-
 5 files changed, 124 insertions(+), 210 deletions(-)

diff --git a/packages/wxwork/Announce/AppAnnounce/components/List.vue b/packages/wxwork/Announce/AppAnnounce/components/List.vue
index 69cecabc..ee019513 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/List.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/List.vue
@@ -403,7 +403,7 @@
       transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 
       &:hover {
-        border-color: #26f;
+        border-color: $placeholderColor;
       }
 
       i {
diff --git a/project/pingchang/apps/AppBayonetRegistration/AppBayonetRegistration.vue b/project/pingchang/apps/AppBayonetRegistration/AppBayonetRegistration.vue
index c7400681..ca2985b6 100644
--- a/project/pingchang/apps/AppBayonetRegistration/AppBayonetRegistration.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/AppBayonetRegistration.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="doc-circulation ailist-wrapper">
+  <div class="doc-circulation">
     <keep-alive :include="['List']">
       <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
     </keep-alive>
@@ -11,8 +11,8 @@
   import Detail from './components/Detail'
 
   export default {
-    name: 'AppRiskArea',
-    label: 'AppBayonetRegistration',
+    name: 'AppBayonetRegistration',
+    label: '卡口登记',
 
     props: {
       instance: Function,
@@ -39,7 +39,7 @@
           this.params = data.params
         }
 
-        if (data.type === 'list') {
+        if (data.type === 'List') {
           this.component = 'List'
           this.params = data.params
 
diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
index 974e0a64..67da8f53 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -15,9 +15,9 @@
               <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
               <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
               <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
-              <ai-info-item label="人员类别" isLine>
-                <span :style="(info.type == 0 || info.type == 3 || info.type ==6 || info.type == 9)? 'color:#42D784;' : 'color:#f46;'">{{dict.getLabel('epidemicRecentPersonType', info.type)}}</span>
-              </ai-info-item>
+              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
+              <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
+              <ai-info-item label="登记卡口" isLine :value="info.gatewayName"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
@@ -30,9 +30,10 @@
                 <span  :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
               </ai-info-item>
               <ai-info-item label="出发地址" isLine :value="info.startAddress"></ai-info-item>
-              <ai-info-item label="出行方式" :value="dict.getLabel('epidemicRecentTravel', info.travelType)"></ai-info-item>
+              <ai-info-item label="出行方式" :value="info.travelTypeNames"></ai-info-item>
+              <ai-info-item label="车次/航班" isLine :value="info.trainNo"></ai-info-item>
               <ai-info-item label="行程描述" isLine :value="info.description"></ai-info-item>
-              <ai-info-item label="到达时间" :value="info.arriveTime"></ai-info-item>
+              <ai-info-item label="抵平时间" :value="info.arriveTime"></ai-info-item>
               <ai-info-item label="到达地区" :value="info.arriveAreaName"></ai-info-item>
               <ai-info-item label="返乡地址" isLine :value="info.arriveAddress"></ai-info-item>
             </ai-wrapper>
@@ -42,41 +43,27 @@
           <template #content>
             <ai-wrapper
               label-width="120px">
-              <ai-info-item label="当前体温">
-                <span :style="info.temperature >= 37.3 ? 'color:#f46;' : ''">{{ info.temperature + '℃' }}</span>
-              </ai-info-item>
-              <ai-info-item label="14天内是否接触新冠确诊或疑似患者">
-                <span :class="'color-'+info.touchInFourteen">{{$dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)}}</span> 
-              </ai-info-item>
-              <ai-info-item label="当前健康状况"> 
-                <span></span>
-                <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>
-              </ai-info-item>
+              <ai-info-item label="是否有风险旅居史" :value="dict.getLabel('yesOrNo', info.fromHighRiskArea)"></ai-info-item>
+              <ai-info-item label="7天内是否接触新冠确诊或疑似患者" :value="dict.getLabel('yesOrNo', info.contactPatients)"></ai-info-item>
+              <ai-info-item label="当前健康状况" :value="dict.getLabel('yesOrNo', info.abnormalHealth)"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="核酸检测">
+        <ai-card title="同行情况">
           <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="检测日期" :value="info.checkTime && info.checkTime.split(' ')[0]"></ai-info-item>
-              <ai-info-item label="检测结果">
-                <span :style="info.checkResult == 1 ? 'color:#f46;' : 'color:#42D784;'">{{$dict.getLabel('epidemicRecentTestResult', info.checkResult)}}</span>
-              </ai-info-item>
-              <ai-info-item label="本人健康码截图" isLine>
-                <ai-uploader
-                  :instance="instance"
-                  v-model="info.checkPhoto"
-                  disabled
-                  :limit="9">
-                </ai-uploader>
-              </ai-info-item>
-            </ai-wrapper>
+            <ai-table
+              :isShowPagination="false"
+              tableSize="small"
+              border
+              :tableData="info.companionList"
+              :col-configs="colConfigs"
+              @getList="() => {}">
+            </ai-table>
           </template>
         </ai-card>
       </div>
       <div v-show="currIndex === 1">
-        <ai-card title="异常处理">
+        <ai-card title="风险处置">
           <template #right>
             <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
           </template>
@@ -87,49 +74,38 @@
               <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
               <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
               <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
-              <ai-info-item label="人员类别" isLine :value="dict.getLabel('epidemicRecentPersonType', info.type)"></ai-info-item>
-              <ai-info-item label="异常状况" isLine>
-                <span :style="{color: info.unusual ? 'red' : '#333'}">{{ info.unusual || '-' }}</span>
-              </ai-info-item>
-              <ai-info-item label="异常解除人" v-if="info.releaseName && info.status === '1'" :value="info.releaseName"></ai-info-item>
-              <ai-info-item label="异常解除时间" v-if="info.releaseTime && info.status === '1'" :value="info.releaseTime"></ai-info-item>
+              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="异常情况记录">
-          <template #right>
-            <el-button type="primary" v-if="info.status === '0'" @click="isShow = true">添加记录</el-button>
-          </template>
+        <ai-card title="处理意见">
           <template #content>
-            <ai-table
-              :tableData="tableData"
-              :col-configs="colConfigs"
-              :total="total"
-              :current.sync="search.current"
-              :size.sync="search.size"
-              @getList="getList">
-              <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
-                <template slot-scope="{ row }">
-                  <div class="table-options">
-                    <el-button type="text" @click="remove(row.id)">删除</el-button>
-                  </div>
-                </template>
-              </el-table-column>
-            </ai-table>
+            <ai-wrapper
+              style="margin-bottom: 20px;"
+              v-for="item in info.riskDisposalList"
+              :key="item.id"
+              label-width="120px">
+              <ai-info-item label="处理意见" :value="dict.getLabel('EP_handleType', item.handleType)"></ai-info-item>
+              <ai-info-item v-if="item.handleType === '2'" label="集中隔离地" :value="dict.getLabel('EP_quarantineAddress', item.quarantineAddress)"></ai-info-item>
+              <ai-info-item v-if="item.handleType === '3'" label="居家状态" :value="dict.getLabel('EP_homeStatus', item.homeStatus)"></ai-info-item>
+              <ai-info-item v-if="item.handleType === '6'" label="移交对象" :value="dict.getLabel('EP_handoverObject', item.handoverObject)"></ai-info-item>
+              <ai-info-item v-if="item.handleType === '6'" label="移交方式" :value="dict.getLabel('EP_handoverMethod', item.handoverMethod)"></ai-info-item>
+              <ai-info-item v-if="item.handleType === '6'" label="交接人员姓名" :value="info.handoverPersonName"></ai-info-item>
+              <ai-info-item v-if="item.handleType === '6'" label="手机号" :value="info.handoverPersonPhone"></ai-info-item>
+              <ai-info-item v-if="['2', '3'].includes(item.handleType)" label="隔离时间" :value="item.quarantineBeginTime + '至' + item.quarantineEndTime"></ai-info-item>
+              <ai-info-item v-if="['2', '3'].includes(item.handleType)" label="隔离策略" :value="dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy)"></ai-info-item>
+              <ai-info-item v-if="['3'].includes(item.handleType)" label="管控方式" :value="dict.getLabel('EP_controlMethod', item.controlMethod)"></ai-info-item>
+              <ai-info-item label="图片" isLine v-if="['3', '6'].includes(item.handleType)">
+                <ai-uploader
+                  :instance="instance"
+                  :value="item.fileList"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+            </ai-wrapper>
           </template>
         </ai-card>
-        <ai-dialog
-          :visible.sync="isShow"
-          width="800px"
-          @close="form.content = ''"
-          title="添加异常记录"
-          @onConfirm="onConfirm">
-          <el-form class="ai-form" label-width="120px" :model="form" ref="form">
-            <el-form-item label="异常记录" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入异常记录' }]">
-              <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.content" clearable placeholder="请输入异常记录" show-word-limit></el-input>
-            </el-form-item>
-          </el-form>
-        </ai-dialog>
       </div>
     </template>
   </ai-detail>
@@ -147,111 +123,38 @@
 
     data () {
       return {
-        total: 0,
         info: {},
-        id: '',
-        search: {
-          current: 1,
-          size: 10
-        },
-        form: {
-          content: ''
-        },
         isShow: false,
         currIndex: 0,
         tableData: [],
         colConfigs: [
-          {prop: 'content', label: '异常记录', align: 'center' },
-          {prop: 'createTime', label: '创建时间', align: 'center'},
-          {prop: 'createUserName', label: '记录人', align: 'center' }
+          {prop: 'createUserName', label: '姓名', align: 'center' },
+          {prop: 'phone', label: '手机号', align: 'center'}
         ],
-        tabList: ['基本信息', '异常处理']
+        tabList: ['基本信息', '风险处置']
       }
     },
 
     created () {
       if (this.params && this.params.id) {
         this.id = this.params.id
-        this.$dict.load(['epidemicRecentHealth', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentPersonType', 'epidemicRecentTestResult']).then(() => {
+        this.$dict.load(['EP_riskLevel', 'EP_handleType', 'EP_registerPersonType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_handoverObject',
+        'EP_handleType', 'EP_quarantineAddress', 'EP_homeStatus', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_handoverMethod']).then(() => {
           this.getInfo(this.params.id)
         })
-
-        this.getList()
       }
     },
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
             this.info.checkPhoto = res.data.checkPhoto ? JSON.parse(res.data.checkPhoto) : []
-            let healthName = ''
-            this.info.isHealth = false
-            res.data.health.split(',').forEach(v => {
-              if (v > 0) {
-                this.info.isHealth = true
-              }
-              healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
-            })
-            this.info.healthName = healthName
-            this.info.health = this.info.health.split(',')
-          }
-        })
-      },
 
-      release () {
-        this.$confirm('确定解除异常？').then(() => {
-          this.instance.post(`/app/appepidemicbackhomerecord/release?recordId=${this.params.id}`, {
-            id: this.params.id
-          }).then(res => {
-            if (res.code == 0) {
-              this.$message.success('解除异常成功！')
-              this.currIndex = 0
-              this.getInfo(this.params.id)
-            }
-          })
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appepidemicunusuallog/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      onConfirm() {
-        this.$refs.form.validate(v => {
-          if (v) {
-            this.instance.post('/app/appepidemicunusuallog/addOrUpdate', {
-              ...this.form,
-              recordId: this.params.id
-            }).then(res => {
-              if (res?.code == 0) {
-                this.isShow = false
-                this.getList()
-                this.$message.success('添加成功!')
-              }
-            })
-          }
-        })
-      },
-
-      getList () {
-        this.instance.post(`/app/appepidemicunusuallog/list`, null, {
-          params: {
-            ...this.search,
-            recordId: this.params.id
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
+            this.info.travelTypeNames = res.data.travelType.split(',').map(v => {
+              return this.dict.getLabel('EP_travelType', v)
+            }).join('，')
           }
         })
       },
diff --git a/project/pingchang/apps/AppBayonetRegistration/components/List.vue b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
index 111d3f33..f3e22815 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/List.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
@@ -1,38 +1,51 @@
 <template>
-  <ai-list class="list" isTabs>
+  <ai-list class="list">
+    <ai-title slot="title" title="卡口登记" isShowBottomBorder></ai-title>
     <template slot="content">
       <div class="statistics-top">
         <div class="statistics-top__item">
-          <span>返乡人数</span>
-          <h2 style="color: #2266FF;">{{ info.total }}</h2>
+          <span>登记人数</span>
+          <h2 style="color: #2266FF;">{{ info['登记人数'] }}</h2>
         </div>
         <div class="statistics-top__item">
-          <span>今日新增返乡</span>
-          <h2 style="color: #22AA99;">{{ info.today }}</h2>
+          <span>今日登记</span>
+          <h2 style="color: #22AA99;">{{ info['今日登记'] }}</h2>
         </div>
         <div class="statistics-top__item">
-          <span>异常人数</span>
-          <h2 style="color: #F8B425">{{ info.unusual }}</h2>
+          <span>原路返回</span>
+          <h2 style="color: #F8B425">{{ info['原路返回'] }}</h2>
         </div>
         <div class="statistics-top__item">
-          <span>今日异常人数</span>
-          <h2 style="color: red">{{ info.todayUnusual }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>异常处理</span>
-          <h2 style="color: red">{{ info.release }}</h2>
+          <span>居家隔离</span>
+          <h2 style="color: red">{{ info['居家隔离'] }}</h2>
         </div>
       </div>
       <div class="content">
         <ai-search-bar bottomBorder>
           <template #left>
             <ai-select
-              v-model="search.status"
+              v-model="search.gatewayName"
               clearable
-              placeholder="请选择健康状态"
+              placeholder="请选择卡口"
               :selectList="dictList"
               @change="search.current = 1, getList()">
             </ai-select>
+            <el-date-picker
+              v-model="search.createTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-DD"
+              placeholder="选择开始日期"
+              @change="search.current = 1, getList()">
+            </el-date-picker>
+            <el-date-picker
+              v-model="search.createTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-DD"
+              placeholder="选择结束日期"
+              @change="search.current = 1, getList()">
+            </el-date-picker>
             <ai-download :instance="instance" url="/app/appepidemicbackhomerecord/export" :params="param" fileName="返乡登记" :disabled="tableData.length == 0">
               <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
             </ai-download>
@@ -41,7 +54,7 @@
             <el-input
               v-model="search.name"
               size="small"
-              placeholder="请输入姓名"
+              placeholder="请输入姓名、手机号"
               clearable
               v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
@@ -89,44 +102,29 @@
           current: 1,
           size: 10,
           name: '',
-          status: ''
+          gatewayName: '',
+          status: '',
+          createTime: ''
         },
-        dictList: [{
-          dictName: '异常',
-          dictValue: '0'
-        }, {
-          dictName: '正常',
-          dictValue: '1'
-        }],
+        dictList: [],
         info: {},
         colConfigs: [
           { prop: 'name', label: '姓名' },
           { prop: 'phone', align: 'center', label: '手机号码' },
-          { prop: 'startTime', align: 'center', label: '出发时间', formart: v => v.substr(0, v.length - 3) },
+          { prop: 'arriveAreaName', align: 'center', label: '返乡地区' },
           {
-            prop: 'startAreaName',
+            prop: 'arriveTime',
             align: 'center',
-            label: '出发地区'
+            label: '抵平时间'
           },
-          { prop: 'arriveTime', align: 'center', label: '到达时间', formart: v => v.substr(0, v.length - 3) }, 
+          { prop: 'companionCount', align: 'center', label: '同行人数' },
           {
-            prop: 'arriveAreaName',
+            prop: 'riskLevel',
             align: 'center',
-            label: '到达地区'
+            label: '风险等级',
+            formart: v => this.dict.getLabel('EP_riskLevel', v)
           },
-          { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v.split(' ')[0] },
-          {
-            prop: 'status',
-            align: 'center',
-            label: '健康状态',
-            render: (h, {row}) => {
-              return h('span', {
-                style: {
-                  color: row.status === '0' ? 'red' : '#333'
-                }
-              }, row.status === '0' ? '异常' : '正常')
-            }
-          }
+          { prop: 'handleType', align: 'center', label: '处理意见', formart: v => this.dict.getLabel('EP_handleType', v) }
         ],
         ids: [],
         tableData: [],
@@ -147,14 +145,30 @@
     created () {
       this.disabledLevel = this.user.info.areaList.length - 1
       this.loading = true
-      this.dict.load(['marriageType', 'marriagePersonType', 'modeType']).then(() => {
+
+      this.getTotalInfo()
+      this.getDictList()
+      this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType']).then(() => {
         this.getList()
       })
     },
 
     methods: {
+      getDictList () {
+        this.instance.post(`/app/appepidemicpreventiongateway/list?size=10000`).then(res => {
+          if (res.code == 0) {
+            this.dictList = res.data.records.map(v => {
+              return {
+                dictName: v.name,
+                dictValue: v.id
+              }
+            })
+          }
+        })
+      },
+
       getList () {
-        this.instance.post(`/app/appepidemicbackhomerecord/list`, null, {
+        this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
           params: {
             ...this.search,
             arriveAreaId: this.areaId
@@ -170,8 +184,6 @@
         }).catch(() => {
           this.loading = false
         })
-        
-        this.getTotalInfo()
       },
 
       toDetail (id) {
@@ -194,7 +206,7 @@
 
       remove(id) {
         this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appepidemicbackhomerecord/delete?ids=${id}`).then(res => {
+          this.instance.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getTotalInfo()
@@ -206,7 +218,7 @@
 
 
       getTotalInfo () {
-        this.instance.post(`/app/appepidemicbackhomerecord/statistic`, null, {
+        this.instance.post(`/app/appepidemicpreventionregisterinfo/listStatistics`, null, {
           params: {
             areaId: this.search.arriveAreaId
           }
@@ -223,8 +235,6 @@
 <style scoped lang="scss">
   .list {
     ::v-deep .ai-list__content {
-      padding: 0!important;
-
       .ai-list__content--right-wrapper {
         background: transparent!important;
         box-shadow: none!important;
diff --git a/project/pingchang/apps/AppCommunityManagement/components/List.vue b/project/pingchang/apps/AppCommunityManagement/components/List.vue
index 4b7e2164..60e41910 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/List.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/List.vue
@@ -16,8 +16,8 @@
           <ai-select
             v-model="search.status"
             clearable
-            placeholder="请选择现实状态"
-            :selectList="dict.getDict('epidemicDangerousAreaLevel')"
+            placeholder="请选择管理状态"
+            :selectList="dict.getDict('EP_CM_status')"
             @change="search.current = 1, getList()">
           </ai-select>
           <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
@@ -79,6 +79,7 @@
           size: 10,
           name: '',
           infoType: '',
+          status: '',
           controllerUserId: ''
         },
         user: [],
@@ -162,7 +163,7 @@
       transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 
       &:hover {
-        border-color: #26f;
+        border-color: $placeholderColor;
       }
 
       i {

From 6716deb0048498df73de8e9bf8fb8508f3252274 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 26 Sep 2022 17:10:55 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=A1=E5=8F=A3=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/AppBayonetRegistration/components/Detail.vue     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
index 67da8f53..30669d65 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -1,5 +1,5 @@
  <template>
-  <ai-detail isHasSidebar>
+  <ai-detail isHasSidebar v-loading="isLoading">
     <template slot="title">
       <ai-title title="返乡登记详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
@@ -126,6 +126,7 @@
         info: {},
         isShow: false,
         currIndex: 0,
+        isLoading: false,
         tableData: [],
         colConfigs: [
           {prop: 'createUserName', label: '姓名', align: 'center' },
@@ -136,6 +137,7 @@
     },
 
     created () {
+      this.isLoading = true
       if (this.params && this.params.id) {
         this.id = this.params.id
         this.$dict.load(['EP_riskLevel', 'EP_handleType', 'EP_registerPersonType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_handoverObject',
@@ -156,6 +158,10 @@
               return this.dict.getLabel('EP_travelType', v)
             }).join('，')
           }
+
+          this.isLoading = false
+        }).catch(() => {
+          this.isLoading = false
         })
       },