From 3be7075a0801674e92f782acc87af98da13b4b83 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 23 Sep 2022 09:18:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bigscreen/dv/AppPdDv.vue | 58 ++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/packages/bigscreen/dv/AppPdDv.vue b/packages/bigscreen/dv/AppPdDv.vue index 3d58519f..68be2114 100644 --- a/packages/bigscreen/dv/AppPdDv.vue +++ b/packages/bigscreen/dv/AppPdDv.vue @@ -65,24 +65,25 @@ -
+
-
标签人群
-
-
-

高龄老人

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

宣发任务数

+

{{ groupChatNumber ? groupChatNumber.chatHasMsg : 0 }}

-
-

精神病人

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

执行宣发次数

+

{{ groupChatNumber ? groupChatNumber.memberHasMsg : 0 }}

-
-

贫困居民

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

触达人次

+

{{ groupChatNumber ? groupChatNumber.msgTotal : 0 }}

+
@@ -655,6 +656,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; From ece325a45ee6a2a222a7ab9e86d7936da28d5df8 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 23 Sep 2022 09:43:35 +0800 Subject: [PATCH 2/4] bug --- packages/bigscreen/dv/AppPdDv.vue | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/bigscreen/dv/AppPdDv.vue b/packages/bigscreen/dv/AppPdDv.vue index 68be2114..308d4821 100644 --- a/packages/bigscreen/dv/AppPdDv.vue +++ b/packages/bigscreen/dv/AppPdDv.vue @@ -32,7 +32,7 @@
-
+
居民群统计
@@ -72,18 +72,18 @@

宣发任务数

-

{{ groupChatNumber ? groupChatNumber.chatHasMsg : 0 }}

+

{{ xfInfo.createCount || 0 }}

执行宣发次数

-

{{ groupChatNumber ? groupChatNumber.memberHasMsg : 0 }}

+

{{ xfInfo.executeCount || 0 }}

触达人次

-

{{ groupChatNumber ? groupChatNumber.msgTotal : 0 }}

+

{{ xfInfo.receiveCount || 0 }}

-
+
@@ -263,6 +263,7 @@ groupChatNumber: {}, dynamicList: [], rankList: [], + xfInfo: {}, pointList: [] } }, @@ -292,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 => { From dd662e8d2280b8e1922fa0d48a21c6d1ab5f33b1 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 23 Sep 2022 09:47:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bigscreen/dv/AppPlyDv.vue | 1271 ++++++++++++++++++++++++++++ 1 file changed, 1271 insertions(+) create mode 100644 packages/bigscreen/dv/AppPlyDv.vue diff --git a/packages/bigscreen/dv/AppPlyDv.vue b/packages/bigscreen/dv/AppPlyDv.vue new file mode 100644 index 00000000..bb82da97 --- /dev/null +++ b/packages/bigscreen/dv/AppPlyDv.vue @@ -0,0 +1,1271 @@ + + + + + From a50e13a8df5ea5abfa7055c603b26ed39aca10dd Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 23 Sep 2022 11:12:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bigscreen/dv/AppPlyDv.vue | 6 +- .../AppCheckpointManage.vue | 65 +++++++ .../AppCheckpointManage/components/Add.vue | 92 +++++++++ .../AppCheckpointManage/components/List.vue | 181 ++++++++++++++++++ .../apps/AppRiskArea/components/Add.vue | 10 +- .../apps/AppRiskArea/components/List.vue | 5 +- 6 files changed, 351 insertions(+), 8 deletions(-) create mode 100644 project/pingchang/apps/AppCheckpointManage/AppCheckpointManage.vue create mode 100644 project/pingchang/apps/AppCheckpointManage/components/Add.vue create mode 100644 project/pingchang/apps/AppCheckpointManage/components/List.vue diff --git a/packages/bigscreen/dv/AppPlyDv.vue b/packages/bigscreen/dv/AppPlyDv.vue index bb82da97..1963dbf4 100644 --- a/packages/bigscreen/dv/AppPlyDv.vue +++ b/packages/bigscreen/dv/AppPlyDv.vue @@ -32,7 +32,7 @@
-
+
居民群统计
@@ -65,7 +65,7 @@
-
+
宣发统计
@@ -83,7 +83,7 @@

{{ xfInfo.receiveCount || 0 }}

-
+
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 5e1fffd1..f32acfe2 100644 --- a/project/pingchang/apps/AppRiskArea/components/List.vue +++ b/project/pingchang/apps/AppRiskArea/components/List.vue @@ -77,6 +77,7 @@ { 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' }, @@ -100,7 +101,7 @@ methods: { getList() { - this.instance.post(`/app/appepidemicdangerousarea/list`, null, { + this.instance.post(`/app/appepidemicpreventionriskarea/list`, null, { params: { ...this.search } @@ -114,7 +115,7 @@ remove(id) { this.$confirm('确定删除该数据?').then(() => { - this.instance.post(`/app/appepidemicdangerousarea/delete?ids=${id}`).then(res => { + this.instance.post(`/app/appepidemicpreventionriskarea/delete?ids=${id}`).then(res => { if (res.code == 0) { this.$message.success('删除成功!') this.getList()