diff --git a/packages/bigscreen/dv/AppPdDv.vue b/packages/bigscreen/dv/AppPdDv.vue index 3d58519f..308d4821 100644 --- a/packages/bigscreen/dv/AppPdDv.vue +++ b/packages/bigscreen/dv/AppPdDv.vue @@ -32,7 +32,7 @@ -
+
居民群统计
@@ -65,24 +65,25 @@
-
+
-
标签人群
-
-
-

高龄老人

- {{ tagInfo.elderlyPeople || 0 }} +
宣发统计
+
+
+

宣发任务数

+

{{ xfInfo.createCount || 0 }}

-
-

精神病人

- {{ tagInfo.mentalIllness || 0 }} +
+

执行宣发次数

+

{{ xfInfo.executeCount || 0 }}

-
-

贫困居民

- {{ tagInfo.poorResidents || 0 }} +
+

触达人次

+

{{ xfInfo.receiveCount || 0 }}

+
@@ -262,6 +263,7 @@ groupChatNumber: {}, dynamicList: [], rankList: [], + xfInfo: {}, pointList: [] } }, @@ -291,9 +293,22 @@ this.pointList = res.data } }) - this.instance.post(`app/appintegraluser/suffixWeekIntegralSort`).then(res => { + this.instance.post(`app/appintegraluser/userTotalIntegralSort`).then(res => { if (res.code === 0) { - this.rankList = res.data + this.pointList = res.data + } + }) + this.instance.post(`app/appmasssendingtask/statisticsEffectByPidu`).then(res => { + if (res.code === 0) { + this.xfInfo = res.data + this.initBarChart('.chart11', { + x: res.data.trend.map(v => v.ymd), + value: res.data.trend.map(v => v.createCount), + name: '宣发统计' + }, [ + {offset: 0, color: 'rgba(25, 179, 209, 1)'}, + {offset: 1, color: 'rgba(25, 179, 209, 0)'} + ]) } }) this.instance.post(`/app/wxgroupstatistic/getCustommerNumber`).then(res => { @@ -655,6 +670,39 @@ } } + .xf { + display: flex; + align-items: center; + justify-content: space-between; + + .item-top__item { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + width: 107px; + height: 52px; + line-height: 1; + cursor: pointer; + user-select: none; + background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/ql4.png); + background-size: 100% 100%; + + h2 { + margin-bottom: 8px; + color: #2AB7D1; + font-size: 12px; + } + + p { + font-size: 14px; + color: #fff; + font-weight: bold; + font-style: oblique; + } + } + } + .ql { display: flex; align-items: center; diff --git a/packages/bigscreen/dv/AppPlyDv.vue b/packages/bigscreen/dv/AppPlyDv.vue new file mode 100644 index 00000000..1963dbf4 --- /dev/null +++ b/packages/bigscreen/dv/AppPlyDv.vue @@ -0,0 +1,1271 @@ + + + + + diff --git a/project/pingchang/apps/AppCheckpointManage/AppCheckpointManage.vue b/project/pingchang/apps/AppCheckpointManage/AppCheckpointManage.vue new file mode 100644 index 00000000..2a6099f0 --- /dev/null +++ b/project/pingchang/apps/AppCheckpointManage/AppCheckpointManage.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/project/pingchang/apps/AppCheckpointManage/components/Add.vue b/project/pingchang/apps/AppCheckpointManage/components/Add.vue new file mode 100644 index 00000000..c4dd5a32 --- /dev/null +++ b/project/pingchang/apps/AppCheckpointManage/components/Add.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/project/pingchang/apps/AppCheckpointManage/components/List.vue b/project/pingchang/apps/AppCheckpointManage/components/List.vue new file mode 100644 index 00000000..c4cf7388 --- /dev/null +++ b/project/pingchang/apps/AppCheckpointManage/components/List.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/project/pingchang/apps/AppRiskArea/components/Add.vue b/project/pingchang/apps/AppRiskArea/components/Add.vue index cefc6124..0bfa4934 100644 --- a/project/pingchang/apps/AppRiskArea/components/Add.vue +++ b/project/pingchang/apps/AppRiskArea/components/Add.vue @@ -11,6 +11,9 @@ + + + { + this.instance.post(`/app/appepidemicpreventionriskarea/queryDetailById?id=${id}`).then(res => { if (res.code === 0) { this.form = res.data } @@ -78,7 +82,7 @@ confirm () { this.$refs.form.validate((valid) => { if (valid) { - this.instance.post(`/app/appepidemicdangerousarea/addOrUpdate`, { + this.instance.post(`/app/appepidemicpreventionriskarea/addOrUpdate`, { ...this.form }).then(res => { if (res.code == 0) { diff --git a/project/pingchang/apps/AppRiskArea/components/List.vue b/project/pingchang/apps/AppRiskArea/components/List.vue index eafa045c..db12bcd4 100644 --- a/project/pingchang/apps/AppRiskArea/components/List.vue +++ b/project/pingchang/apps/AppRiskArea/components/List.vue @@ -66,33 +66,34 @@ export default { moduleName: String }, - data() { - return { - search: { - current: 1, - size: 10, - level: '', - province: '' - }, - currIndex: -1, - areaList: [], - total: 10, - colConfigs: [ - {prop: 'province', label: '省级', align: 'left', width: '200px'}, - {prop: 'city', label: '市级', align: 'center'}, - {prop: 'district', label: '区级', align: 'center'}, - {prop: 'town', label: '镇级', align: 'center'}, - {prop: 'village', label: '村级', align: 'center'}, - {prop: 'level', label: '等级', align: 'center', formart: v => this.dict.getLabel('epidemicDangerousAreaLevel', v)}, - {prop: 'createTime', label: '设置时间', align: 'center'}, - {prop: 'createUserName', label: '添加人', align: 'center'}, - {slot: 'options', label: '操作', align: 'center'} - ], - areaName: '', - unitName: '', - tableData: [] - } - }, + data() { + return { + search: { + current: 1, + size: 10, + level: '', + province: '' + }, + currIndex: -1, + areaList: [], + total: 10, + colConfigs: [ + { prop: 'province', label: '省级', align: 'left', width: '200px' }, + { prop: 'city', label: '市级', align: 'center' }, + { prop: 'district', label: '区级', align: 'center' }, + { prop: 'town', label: '镇级', align: 'center' }, + { prop: 'village', label: '村级', align: 'center' }, + { prop: 'address', label: '详细地址', align: 'center' }, + { prop: 'level', label: '等级', align: 'center', formart: v => this.dict.getLabel('epidemicDangerousAreaLevel', v) }, + { prop: 'createTime', label: '设置时间', align: 'center' }, + { prop: 'createUserName', label: '添加人', align: 'center' }, + { slot: 'options', label: '操作', align: 'center' } + ], + areaName: '', + unitName: '', + tableData: [] + } + }, computed: { ...mapState(['user']) @@ -104,30 +105,30 @@ export default { }) }, - methods: { - getList() { - this.instance.post(`/app/appepidemicpreventionriskarea/list`, null, { - params: { - ...this.search - } - }).then(res => { - if (res.code == 0) { - this.tableData = res.data.records - this.total = res.data.total - } - }) - }, - - remove(id) { - this.$confirm('确定删除该数据?').then(() => { - this.instance.post(`/app/appepidemicpreventionriskarea/delete?ids=${id}`).then(res => { + methods: { + getList() { + this.instance.post(`/app/appepidemicpreventionriskarea/list`, null, { + params: { + ...this.search + } + }).then(res => { if (res.code == 0) { - this.$message.success('删除成功!') - this.getList() + this.tableData = res.data.records + this.total = res.data.total } }) - }) - }, + }, + + remove(id) { + this.$confirm('确定删除该数据?').then(() => { + this.instance.post(`/app/appepidemicpreventionriskarea/delete?ids=${id}`).then(res => { + if (res.code == 0) { + this.$message.success('删除成功!') + this.getList() + } + }) + }) + }, toAdd(id) { this.$emit('change', {