From 08151562e879517eef444d6cca86208eb12df202 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 10:38:37 +0800 Subject: [PATCH 01/12] up --- public/dashboard/index.html | 80 +++++++++++++++---------------------- 1 file changed, 33 insertions(+), 47 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 7d931ef..dd8e507 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -316,7 +316,11 @@ name: '未陪护' }, ] + var monthChartX = [] + var monthY = [] + var incomeChart = [] var projectChartX = [] + var projectChartYperson = [] var projectChartY = [] $(function() { getStatistic() @@ -371,10 +375,25 @@ name: '未陪护' } ] + // 本月陪护订单分析 + var monthsArr = datas.monthAccompany + monthsArr.map(item=>{ + monthChartX.push(item.name) + monthChartY.push(item.total) + }) + // 本月营收分析 + var incomes = datas.income + incomes.map(item=>{ + incomeChart.push({ + name:item.name., + total:item.total + }) + }) // 陪护统计表 var projects = datas.project projects.map(item=>{ projectChartX.push(item.name) + projectChartYperson.push(item.paramedic_total) projectChartY.push(item.total) }) @@ -454,7 +473,7 @@ fontSize: '14px' } }, - data: projectChartX, + data: monthChartX, }, yAxis: { axisLine: { @@ -495,16 +514,15 @@ } }, - data: projectChartY, - } - // , { - // name: '陪护订单量', - // type: 'pictorialBar', - // barGap: '-100%', - // symbolPosition: 'end', - // symbolSize: 50, - // symbolOffset: [0, '-120%'], - // }, + data: monthChartY, + }, { + name: '陪护订单量', + type: 'pictorialBar', + barGap: '-100%', + symbolPosition: 'end', + symbolSize: 50, + symbolOffset: [0, '-120%'], + }, ] }; var myChart2 = echarts.init(document.getElementById('byph')); @@ -520,39 +538,7 @@ radius: '70%', center: ['50%', '50%'], color: ["#ffb22f", "#ff4954", "#01babb"], - data: [{ - value: 75, - name: '一院' - }, - { - value: 60, - name: '市中' - }, - { - value: 30, - name: '武进南院' - }, - { - value: 25, - name: '阳湖院' - }, - { - value: 30, - name: '康复医院' - }, - { - value: 20, - name: '妇幼院' - }, - { - value: 25, - name: '武中' - }, - { - value: 18, - name: '溧阳院' - } - ].sort(function(a, b) { + data: incomeChart.sort(function(a, b) { return a.value - b.value; }), roseType: 'radius', @@ -604,7 +590,7 @@ }, xAxis: { type: 'category', - data: ['一院', '市中', '武进南院', '阳湖院', '康复医院', '妇幼院', '武中', '溧阳院'], + data: projectChartX, axisLine: { show: true, lineStyle: { @@ -651,7 +637,7 @@ series: [{ type: 'bar', name: '陪护单数', - data: [336, 150, 42, 156, 42, 30, 54, 45], + data: projectChartY, itemStyle: { color: '#ffb22f', } @@ -659,7 +645,7 @@ { type: 'bar', name: '总护工数', - data: [288, 130, 35, 125, 38, 30, 50, 40], + data: projectChartXperson, itemStyle: { color: '#0087ff' } From fda53c01c88605b6a6fdc1196c737f41082b4c66 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 10:39:23 +0800 Subject: [PATCH 02/12] up --- public/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index dd8e507..904cc97 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -385,7 +385,7 @@ var incomes = datas.income incomes.map(item=>{ incomeChart.push({ - name:item.name., + name:item.name, total:item.total }) }) From b6fcb06419f6139030593e8510b68a9b7bee8fcc Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 10:40:06 +0800 Subject: [PATCH 03/12] up --- public/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 904cc97..2bd1b25 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -317,7 +317,7 @@ }, ] var monthChartX = [] - var monthY = [] + var monthChartY = [] var incomeChart = [] var projectChartX = [] var projectChartYperson = [] From a94cd5754f57176d24bc1c4355f1cc63812b60ca Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 10:40:55 +0800 Subject: [PATCH 04/12] up --- public/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 2bd1b25..5ad6f17 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -645,7 +645,7 @@ { type: 'bar', name: '总护工数', - data: projectChartXperson, + data: projectChartYperson, itemStyle: { color: '#0087ff' } From 4d9f05fa3b16a2feda6f31f800e8b785803dcb9d Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 10:43:02 +0800 Subject: [PATCH 05/12] up --- public/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 5ad6f17..62a9038 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -386,7 +386,7 @@ incomes.map(item=>{ incomeChart.push({ name:item.name, - total:item.total + total:parseInt(item.total) }) }) // 陪护统计表 From 6187fc4989333ec1befc64abc2fd29e256059974 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 10:45:13 +0800 Subject: [PATCH 06/12] up --- public/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 62a9038..0e3630c 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -386,7 +386,7 @@ incomes.map(item=>{ incomeChart.push({ name:item.name, - total:parseInt(item.total) + value:parseFloat(item.total) }) }) // 陪护统计表 From d8c0bc8fd656c34a48320eb0f4939de20db17655 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 10:55:49 +0800 Subject: [PATCH 07/12] up --- public/dashboard/index.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 0e3630c..ca102e7 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -137,8 +137,8 @@

最新出院信息

- - +
+
@@ -396,7 +396,17 @@ projectChartYperson.push(item.paramedic_total) projectChartY.push(item.total) }) + // 最近订单 lastOrder + // 最新出院 outOrder + var outs = datas.outOrder + $(".outOrder").empty("") + outs.map(item=>{ + $(".outOrder").append("" + +item.contact+""+item.project.name+""+ + ""+item.status_name+""+ + "") + }) console.log("result", result) initChart() }, From 5a25afcf3da6ea512e46f3ed6f418cdff9b4b1a1 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 11:06:20 +0800 Subject: [PATCH 08/12] up --- public/dashboard/index.html | 78 +++++++------------------------------ 1 file changed, 13 insertions(+), 65 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index ca102e7..0d038a5 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -138,75 +138,14 @@

最新出院信息

- +
-

最新投诉信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

最新评价信息

+
陈**投诉袁护工武进中医院
+
@@ -407,6 +346,15 @@ ""+item.status_name+""+ "") }) + // 最新评价 + var tips = datas.tip + $(".tips").empty("") + tips.map(item=>{ + $(".tips").append("" + +item.contact+"评价:"+item.comment+"+ + // ""+item.project.name+""+ + "") + }) console.log("result", result) initChart() }, From ea6b0687d6923eb5e35a78d20c0723fd5e4fb070 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 11:07:08 +0800 Subject: [PATCH 09/12] up --- public/dashboard/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 0d038a5..7862236 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -350,8 +350,8 @@ var tips = datas.tip $(".tips").empty("") tips.map(item=>{ - $(".tips").append("" - +item.contact+"评价:"+item.comment+"+ + $(".tips").append(""+ + item.contact+"评价:"+item.comment+""+ // ""+item.project.name+""+ "") }) From f11b67d8b76fc365fdb93d0a6717a18ea2395c43 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 11:07:44 +0800 Subject: [PATCH 10/12] up --- public/dashboard/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 7862236..bc901e9 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -348,9 +348,9 @@ }) // 最新评价 var tips = datas.tip - $(".tips").empty("") + $(".tip").empty("") tips.map(item=>{ - $(".tips").append(""+ + $(".tip").append(""+ item.contact+"评价:"+item.comment+""+ // ""+item.project.name+""+ "") From 70bb9243d41d36564e6fbf1e52d1a25426944ee9 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 11:28:11 +0800 Subject: [PATCH 11/12] up --- public/dashboard/index.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index bc901e9..c8a118b 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -341,8 +341,11 @@ var outs = datas.outOrder $(".outOrder").empty("") outs.map(item=>{ + var contactName = item.contact? + item.contact.charAt(0) + item.contact.slice(1).replace(new RegExp(item.contact.charAt(1), "g"), '*') + :'**' $(".outOrder").append("" - +item.contact+""+item.project.name+""+ + +contactName+""+item.project.name+""+ ""+item.status_name+""+ "") }) @@ -350,9 +353,12 @@ var tips = datas.tip $(".tip").empty("") tips.map(item=>{ - $(".tip").append(""+ - item.contact+"评价:"+item.comment+""+ - // ""+item.project.name+""+ + var contactName = item.contact? + item.contact.charAt(0) + item.contact.slice(1).replace(new RegExp(item.contact.charAt(1), "g"), '*') + :'**' + $(".tip").append(""+ + contactName+"评价:"+item.comment+""+ + ""+item.project.name+""+ "") }) console.log("result", result) From 01829190efac6a48200e08d60b45244606c441a3 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 11:30:33 +0800 Subject: [PATCH 12/12] up --- public/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index c8a118b..595d258 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -358,7 +358,7 @@ :'**' $(".tip").append(""+ contactName+"评价:"+item.comment+""+ - ""+item.project.name+""+ + ""+item.project.name+""+ "") }) console.log("result", result)