-
{{totalInfo.total}}
+{{totalInfo['登记人数']}}
返乡人员
-
{{totalInfo.today}}
+{{totalInfo['今日新增返乡']}}
今日返乡
-
{{totalInfo.todayUnusual}}
-今日异常
+{{totalInfo['今日风险人数']}}
+今日风险
-
{{totalInfo.release}}
-异常处理
+{{totalInfo['风险处理']}}
+风险处理
+
返乡人员
+ 风险人员
+
-
+
-
-
返乡人员
- 异常人员
+
-
-
@@ -56,29 +68,111 @@ export default {
appName: '返乡报备',
data() {
return {
+ cropAreaId: '',
areaId: '',
areaName: '',
tabIndex: 0,
current: 1,
+ pages: 2,
list: [],
- name: '',
- totalInfo: {}
+ totalInfo: {},
+ keyword: '',
+ gatewayId: '',
+ gatewayName: '',
+ showGateSelect: false,
+ gateList: [],
+ statusImgList: [
+ require('./components/img/status0.png'),
+ require('./components/img/status1.png'),
+ require('./components/img/status2.png'),
+ require('./components/img/status3.png'),
+ require('./components/img/status4.png'),
+ require('./components/img/status5.png'),
+ require('./components/img/status6.png'),
+ ],
+ options: [
+ {
+ text: '删除',
+ style: {
+ backgroundColor: '#dd524d'
+ }
+ }
+ ]
}
},
computed: { ...mapState(['user']) },
created() {
- this.areaId = this.user.areaId
- this.areaName = this.user.areaName
+ // this.areaId = this.user.areaId
+ // this.areaName = this.user.areaName
+ this.getCropAreaId()
+ this.$dict.load(['EP_handleType', 'EP_riskLevel']).then(() => {
+ this.getList()
+ this.getTotal()
+ })
},
onShow() {
document.title = '返乡报备'
- this.getList()
- this.getTotal()
uni.$on('updateList', () => {
this.getListInit()
})
},
methods: {
+ getCropAreaId() {
+ this.$http.post(`/app/appdvcpconfig/getCorpArea`).then((res) => {
+ if (res.code == 0) {
+ this.areaId = res.data
+ this.cropAreaId = res.data
+ }
+ })
+ },
+ getListInit() {
+ this.current = 1
+ this.list = []
+ this.getList()
+ },
+ getList() {
+ this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=1¤t=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}`)
+ .then((res) => {
+ if (res.code == 0) {
+
+ this.list = this.current > 1 ? [...this.list, ...res.data.records.map(v => {
+ return {
+ ...v,
+ show: false,
+ idNumber: v.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+ }
+ })] : res.data.records.map(v => {
+ return {
+ ...v,
+ show: false,
+ idNumber: v.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+ }
+ })
+ this.pages = res.data.pages
+ }
+ })
+ },
+ del(id) {
+ this.$confirm(`确认删除该数据`).then(() => {
+ this.$http.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then((res) => {
+ if (res.code == 0) {
+ this.$u.toast('删除成功')
+ this.getListInit()
+ }else {
+ this.$u.toast(res.msg)
+ }
+ }).catch((err) => {
+ this.$u.toast(err)
+ })
+ })
+ },
+ getTotal() {
+ this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}&infoType=1`).then((res) => {
+ if (res.code == 0) {
+ this.totalInfo = res.data
+ }
+ })
+ },
areaSelect(e) {
this.areaId =e
this.$nextTick(() => {
@@ -90,36 +184,12 @@ export default {
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}`})
- }
+ },
+ onClick(index) {
+ this.del(this.list[index].id)
+ },
},
onReachBottom() {
this.current ++
@@ -200,47 +270,115 @@ export default {
}
}
}
- .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;
+ .top-search {
+ padding: 20px 32px;
+ background-color: #fff;
+ }
+ .top-select {
+ display: flex;
+ padding: 28px 0;
+ background-color: #fff;
+ .item {
+ flex: 1;
+ padding: 0 8px;
+ text-align: center;
+ span {
+ display: inline-block;
+ font-family: PingFangSC-Medium;
font-weight: 500;
- color: #333;
- line-height: 50px;
- margin-bottom: 8px;
- .status{
- float: right;
+ font-size: 28px;
+ color: #666;
+ line-height: 40px;
+ }
+ }
+ }
+ .user-list{
+ background-color: #F3F6F9;
+ padding: 32px 32px 0;
+ .item{
+ background-color: #fff;
+ border-radius: 16px;
+ margin-bottom: 24px;
+ .top {
+ padding: 32px 32px 24px;
+ position: relative;
+ .status-img{
+ width: 200px;
+ height: 200px;
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ }
+ .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;
+ line-height: 40px;
+ }
+ .status0 {
+ color: #00D25D;
+ }
+ .status1 {
+ color: #FF6300;
+ }
+ .status2 {
+ color: #f46;
+ }
+ }
+ p{
+ width: calc(100% - 200px);
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
- color: #FF4466;
+ color: #333;
line-height: 40px;
+ margin-bottom: 8px;
+ img{
+ width: 32px;
+ height: 32px;
+ margin-right: 18px;
+ vertical-align: top;
+ }
+ }
+ .idnumber-flex {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ .del-btn {
+ display: inline-block;
+ padding: 8px;
+ }
+ }
+ .start-name{
+ display: inline-block;
+ width: calc(100% - 50px);
+ }
+ .color-999{
+ margin-bottom: 24px;
+ color: #999;
}
}
- 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;
+ .bottom {
+ border-top: 2px solid #D8DDE6;
+ padding: 32px;
+ .text {
+ line-height: 40px;
+ font-family: PingFangSC-Regular;
+ font-size: 28px;
+ color: #666;
+ letter-spacing: 0.58px;
+ }
+ span {
+ display: inline-block;
+ color: #3975C6;
+ margin-right: 32px;
}
- }
- .start-name{
- display: inline-block;
- width: calc(100% - 50px);
- }
- .color-999{
- margin-bottom: 24px;
- color: #999;
}
}
}
@@ -259,5 +397,23 @@ export default {
}
}
}
+ .gateway-name {
+ max-width: calc(100% - 48px);
+ word-break: break-all;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ font-family: PingFangSC-Medium;
+ font-weight: 500;
+ font-size: 28px;
+ color: #666;
+ line-height: 40px;
+ }
+ .gateway-type {
+ display: flex;
+ justify-content: center;
+ }
}
diff --git a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
index c094efe0..950df7bf 100644
--- a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
@@ -1,18 +1,30 @@
{{item.name}}有异常
-{{item.idNumber}}
-
{{item.startAreaName}}
{{item.arriveAreaName}}
{{item.arriveTime}}
+
+
+ {{item.name}}
+
+ ![]()
+
+ {{item.name}}
+ {{ $dict.getLabel('EP_riskLevel', item.riskLevel) }}
+
+
+ {{item.idNumber}}
+
{{item.startAreaName}}
{{item.arriveAreaName}}
{{item.arriveTime}}
+
处置人：{{item.handleUserName}}
+
-
-
{{info.name}}{{info.phone}}![]()
- 身份证号：
-{{info.idNumber}}
-异常情况：
-- {{info.unusual}} -
+
+
- 基本信息新增风险记录
+
+
+ 姓名
+ {{info.name}}
+
+
+ 身份证号
+ {{info.idNumberText}}
+
+
+ 联系方式
+
+ ![]()
+ {{info.phone}}
+
+
风险状况
+ {{$dict.getLabel('EP_registerPersonType', info.type)}}
+
+
异常情况记录
-
+
{{item.content}}
{{item.createTime}}
{{item.createUserName}}
@@ -22,12 +34,12 @@
-
字数{{value.length}}/1000
@@ -49,7 +61,6 @@ export default {
show: false,
value: '',
id: '',
- list: [],
info: {}
}
},
@@ -64,22 +75,14 @@ export default {
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) => {
+ this.$http.post(`/app/appepidemicpreventionregisterinfo/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(',')
+ this.info.travelTypeList = this.info.travelType.split(',')
+ this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
}
})
},
@@ -99,27 +102,29 @@ export default {
},
confirm() {
if(!this.value) {
- return this.$u.toast('请输入异常情况')
+ return this.$u.toast('请输入风险情况')
}
var params = {
- "content": this.value,
- "createUserId": this.user.id,
- "createUserName": this.user.name,
- "recordId": this.id
+ "remarks": this.value,
+ "registerId": this.id,
+ "registerIdNumber": this.info.idNumber,
}
- this.$http.post("/app/appepidemicunusuallog/addOrUpdate", params).then(res => {
+ this.$http.post("/app/appepidemicpreventionregisterinfo/riskDisposal", params).then(res => {
if (res.code == 0) {
+ this.getDetail()
this.$u.toast("新增成功!")
this.show = false
this.value = ''
- this.getList()
}
})
},
callPhone(phone) {
uni.makePhoneCall({phoneNumber: phone})
},
+ toContent() {
+ uni.navigateTo({url: `./RiskContent?id=${this.id}`})
+ }
},
}
@@ -127,52 +132,68 @@ export default {
\ No newline at end of file
diff --git a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
index 1c99f9d6..8dc33d2f 100644
--- a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
@@ -1,5 +1,5 @@
-
+
+
@@ -34,96 +38,181 @@
+
-
-
-
{{info.name}}的返乡登记信息
@@ -16,7 +16,7 @@身份证号
- {{info.idNumber}}
+ {{info.idNumberText}}
联系方式
@@ -26,7 +26,11 @@
人员类别
- {{$dict.getLabel('epidemicRecentPersonType', info.type)}}
+ {{$dict.getLabel('EP_registerPersonType', info.type)}}
+
+
高危行业
+ {{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}
行程信息
出行方式
- {{$dict.getLabel('epidemicRecentTravel', info.travelType)}}
+
+ ;{{$dict.getLabel('EP_travelType',item)}}
+
+
+ 车次/车牌/航班
+ {{info.trainNo}}
出发时间
- {{info.startTime.substring(0, 16)}}
+ {{info.startTime.substring(0, 16)}}
-
出发地区
- {{info.startAreaName}}
+ 出发地
+ {{info.startAreaName}}
-
- 出发地址
+ 出发地详址
{{info.startAddress}}
-
- 到达时间
- {{info.arriveTime.substring(0, 16)}}
-
-
- 返乡地区
- {{info.arriveAreaName}}
-
-
返乡地址
- {{info.arriveAddress}}
- 行程描述
{{info.description}}
-
-
核酸检测信息
-
核酸检测日期
- {{info.checkTime}}
+ 抵平时间
+ {{info.arriveTime.substring(0, 16)}}
-
- 核酸检测结果
- {{$dict.getLabel('epidemicRecentTestResult', info.checkResult)}}
+ 目的地
+ {{info.arriveAreaName}}
-
- 本人健康码截图或核酸检测报告
-
- ![]()
+
+
目的地详址
+ {{info.arriveAddress}}
健康状况
-
当前体温
- {{info.temperature}}℃
+ 是否有风险旅居史
+ 否
+ {{info.highRiskAreaName}}
-
14天内是否接触新冠确诊或疑似患者
- {{$dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)}}
+ 7天内是否接触新冠确诊或疑似患者
+ {{$dict.getLabel('epidemicTouchInFourteen', info.contactPatients)}}
当前健康状况
- ;{{$dict.getLabel('epidemicRecentHealth', item)}}
+ 没有异常
+ {{$dict.getLabel('EP_abnormalType', info.abnormalType)}}
-
异常处理情况
-
-
-
@@ -135,42 +224,32 @@ export default {
return {
id: '',
info: {},
- list: []
+ // haveHomeQuarantineBtn: false, // 是否重新处置 true屏蔽居家两种隔离
}
},
computed: { ...mapState(['user']) },
onShow() {
- document.title = '返乡人员信息'
+ document.title = '返乡登记详情'
},
onLoad(option) {
- this.$dict.load('epidemicRecentPersonType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
+ this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 'EP_highRiskIndustries', 'EP_handleType',
+ 'EP_quarantineAddress', 'EP_homeStatus', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod').then(() => {
this.id = option.id
+ // this.haveHomeQuarantineBtn = option.operation == 'reDisposal' ? true : false
this.getDetail()
- this.getList()
})
uni.$on('updateDetail', () => {
- this.getList()
this.getDetail()
})
+ uni.$emit('updateList')
},
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) => {
+ this.$http.post(`/app/appepidemicpreventionregisterinfo/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")
+ this.info.travelTypeList = this.info.travelType.split(',')
+ this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
}
})
},
@@ -191,11 +270,11 @@ export default {
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/status0.png b/src/project/pingchang/AppReturnHomeReporting/components/img/status0.png
new file mode 100644
index 00000000..29a2c7c3
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/status0.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/status1.png b/src/project/pingchang/AppReturnHomeReporting/components/img/status1.png
new file mode 100644
index 00000000..5f3ae938
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/status1.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/status2.png b/src/project/pingchang/AppReturnHomeReporting/components/img/status2.png
new file mode 100644
index 00000000..c4e99d04
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/status2.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/status3.png b/src/project/pingchang/AppReturnHomeReporting/components/img/status3.png
new file mode 100644
index 00000000..6ebc8e14
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/status3.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/status4.png b/src/project/pingchang/AppReturnHomeReporting/components/img/status4.png
new file mode 100644
index 00000000..3744fc15
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/status4.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/status5.png b/src/project/pingchang/AppReturnHomeReporting/components/img/status5.png
new file mode 100644
index 00000000..e28e4976
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/status5.png differ
diff --git a/src/project/pingchang/AppReturnHomeReporting/components/img/status6.png b/src/project/pingchang/AppReturnHomeReporting/components/img/status6.png
new file mode 100644
index 00000000..3e9c12a0
Binary files /dev/null and b/src/project/pingchang/AppReturnHomeReporting/components/img/status6.png differ
{{item.content}}
-{{item.createTime}}
- {{item.createUserName}}
-
+
+
+
+ 同行情况共{{info.companionCount}}人同行
+
+
-
+
+ 姓名
+ 手机号码
+
+
{{item.name}}
+ {{item.phone}}
-
- 异常解除人
- {{info.releaseName}}
-
-
-
异常解除时间
- {{info.releaseTime}}
-
+
+
-
+
处置意见
+
+
+
+
+ 处置意见
+ {{ $dict.getLabel('EP_handleType', item.handleType) }}
+
+
+
+
+
+ 集中隔离地
+ {{ $dict.getLabel('EP_quarantineAddress', item.quarantineAddress) }}
+
+
+ 隔离时间
+ {{item.quarantineBeginTime}}至{{item.quarantineEndTime}}
+
+
+ 隔离策略
+ {{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}
+
+
+
+
+
+
+ 图片
+
+ ![]()
+
+
+
+
+
+
+ 移交对象
+ {{ $dict.getLabel('EP_handoverObject', item.handoverObject) }}
+
+
+ 移交方式
+ {{ $dict.getLabel('EP_handoverMethod', item.handoverMethod) }}
+
+
+ 交接人姓名
+ {{item.handoverPersonName}}
+
+
+ 手机号
+
+ ![]()
+ {{item.handoverPersonPhone}}
+
+
+ 交接图片
+
+ ![]()
+
+
+
+ 居家状态
+ {{ $dict.getLabel('EP_homeStatus', item.homeStatus) }}
+
+
+ 隔离时间
+ {{item.quarantineBeginTime}}至{{item.quarantineEndTime}}
+
+
+ 隔离策略
+ {{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}
+
+
+ 管控方式
+ {{ $dict.getLabel('EP_controlMethod', item.controlMethod) }}
+
+
+ 备注
+ {{item.remarks}}
+