-
+
-
{{info.controllerContent}}
+
{{info.controllerContent}}
+
-
+
@@ -71,13 +75,16 @@ export default {
name: 'Statistics',
data() {
return {
- toadyText: '',
- totalInfo: {},
+ info: {},
echartData: null,
echartDataClrcle: null,
areaId: '',
areaName: '',
-
+ beginDate: '',
+ endDate: '',
+ showDateSelect: false,
+ backVal: 0,
+ pointVal: 0
}
},
computed: { ...mapState(['user']) },
@@ -85,33 +92,49 @@ export default {
document.title = '排查统计'
},
onLoad() {
- var date = new Date();
- this.toadyText = date.getFullYear() + '-' + date.getMonth()+1 + '-' + date.getDate()
- this.getTotal()
+ this.areaId = this.user.areaId
+ this.areaName = this.user.areaName
+ this.getData()
},
methods: {
areaSelect(e) {
this.areaId = e
+ this.getData()
},
- getTotal() {
- this.$http.post(`/app/appepidemicbackhomerecord/statisticForQW`).then((res) => {
+ dateConfirm(e) {
+ console.log(11)
+ this.beginDate = e.startDate
+ this.endDate = e.endDate
+ this.getData()
+ },
+ clearDate() {
+ this.beginDate = ''
+ this.endDate = ''
+ this.getData()
+ },
+ getData() {
+ this.$http.post(`/app/appepidemicpreventioncommunitymanagement/statistics?areaId=${this.areaId}&beginTime=${this.beginDate}&endTime=${this.endDate}`).then((res) => {
if (res.code == 0) {
- this.totalInfo = res.data.map
- var xData = [], yDataBack = [], yDataError = []
- for(let key in res.data.fiveTotal){
- xData.push(key)
- yDataBack.push(res.data.fiveTotal[key])
- }
- for(let key in res.data.fiveUnusual){
- yDataError.push(res.data.fiveUnusual[key])
- }
- this.chartInit(xData, yDataBack, yDataError)
- this.chartInitCircle()
+ this.info = res.data
+ var xData = [], yDataScreening = [], yDataNucleicAcid = []
+ res.data.trend.map((item) => {
+ xData.push(item.ymd)
+ yDataScreening.push(item['排查人数'])
+ yDataNucleicAcid.push(item['已采核酸'])
+ })
+ res.data.sourceMap.map((item) => {
+ if(item.type == 1) {
+ this.backVal = item.c
+ }else {
+ this.pointVal = item.c
+ }
+ })
+ this.chartInit(xData, yDataScreening, yDataNucleicAcid)
+ this.chartInitCircle(this.backVal, this.pointVal)
}
})
},
chartInit(xData, yDataBack, yDataError) {
- console.log(xData)
this.echartData = echarts.init(document.getElementById('statistic'))
var option = {
grid: {
@@ -161,7 +184,7 @@ export default {
};
this.echartData.setOption(option)
},
- chartInitCircle() {
+ chartInitCircle(backVal, pointVal) {
this.echartDataCircle = echarts.init(document.getElementById('statisticCircle'))
var option = {
color: ['#4185F5', '#5AAD6A'],
@@ -174,14 +197,14 @@ export default {
position: 'center'
},
data: [
- { value: 1048, name: '返乡登记' },
- { value: 735, name: '卡口登记' },
+ { value: backVal, name: '返乡登记' },
+ { value: pointVal, name: '卡口登记' },
],
}
]
};
this.echartDataCircle.setOption(option)
- }
+ },
},
}
@@ -207,7 +230,7 @@ export default {
.title {
display: flex;
justify-content: space-between;
- padding: 32px 32px 32px 48px;
+ padding: 32px;
h2 {
font-size: 36px;
font-family: PingFang-SC-Heavy, PingFang-SC;
@@ -256,6 +279,14 @@ export default {
}
}
}
+ .area-name {
+ display: inline-block;
+ width: calc(100% - 64px);
+ vertical-align: bottom;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ }
.mar-t160 {
margin-top: 160px;
}
diff --git a/src/project/pingchang/AppNucleicAcidSampling/Add.vue b/src/project/pingchang/AppNucleicAcidSampling/Add.vue
index 7e8a5f8a..0a46ba2a 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/Add.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/Add.vue
@@ -5,44 +5,44 @@
*管理区域
-
{{info.areaName}}
+
{{info.areaName}}
*管理对象
-
{{info.name}}
+
{{info.name}}
*身份证号
-
{{info.idNumber}}
+
{{info.idNumber}}
*手机号码
-
{{info.phone}}
+
{{info.phone}}
*居家状态
-
{{ $dict.getLabel('EP_homeStatus2', info.homeStatus)}}
+
{{ $dict.getLabel('EP_homeStatus2', info.homeStatus)}}
*隔离时间
-
{{info.quarantineBeginTime}}至{{info.quarantineEndTime}}
+
{{info.quarantineBeginTime.substring(0, 10)}}至{{info.quarantineEndTime.substring(0, 10)}}
*隔离策略
-
{{ $dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}
+
{{ $dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}
