From 1df2cd7d3f7c4e2d2d6aecbe195eef629a94ac08 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 11:54:20 +0800 Subject: [PATCH 01/35] up --- public/dashboard/index.html | 67 ++++++++++++++----------------------- 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 595d258..b7c08ef 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -96,7 +96,7 @@

最新陪护单信息

- +
@@ -151,44 +151,8 @@

上月满意度评价分析

-
张** 第一人民医院内科楼15床
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
工号103 -
- 		100分
 
工号267 -
- 		90分
 
工号032 -
- 		80分
 
工号011 -
- 		60分
+
@@ -336,7 +300,17 @@ projectChartY.push(item.total) }) // 最近订单 lastOrder - + var lasts = datas.lastOrder + $(".last").empty("") + lasts.map(item=>{ + var contactName = item.contact? + item.contact.charAt(0) + item.contact.slice(1).replace(new RegExp(item.contact.charAt(1), "g"), '*') + :'**' + $(".last").append("" + +contactName+""+item.project.name+""+ + ""+item.status_name+""+ + "") + }) // 最新出院 outOrder var outs = datas.outOrder $(".outOrder").empty("") @@ -358,7 +332,18 @@ :'**' $(".tip").append(""+ contactName+"评价:"+item.comment+""+ - ""+item.project.name+""+ + ""+item.project.name+""+ + "") + }) + // 满意度 satisfied + var satisfieds = datas.satisfied + $(".satisfied").empty("") + satisfieds.map(item=>{ + var score = parseInt(item.score)*20 + var per = score +'%' + $(".satisfied").append(""+item.paramedic.name+""+ + "
"+ + ""+score+"分"+ "") }) console.log("result", result) From 0f233081418e52e7c4da801897a1e073a41038ab Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 11:56:33 +0800 Subject: [PATCH 02/35] up --- public/dashboard/index.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index b7c08ef..5d8d36e 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -346,6 +346,9 @@ ""+score+"分"+ "") }) + $('.skillbar').skillbar({ + speed: 1000, + }); console.log("result", result) initChart() }, @@ -355,9 +358,7 @@ }); } - $('.skillbar').skillbar({ - speed: 1000, - }); + // 图表 function initChart() { From 36ce759596e239c0d3414db91c56e9c5fc778eec Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 11:58:11 +0800 Subject: [PATCH 03/35] 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 5d8d36e..d942fb6 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -344,7 +344,7 @@ $(".satisfied").append(""+item.paramedic.name+""+ "
"+ ""+score+"分"+ - "") + " ") }) $('.skillbar').skillbar({ speed: 1000, From 54d609c86a7b59e6e801b6ce1e2b2c78987779b8 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 12:00:10 +0800 Subject: [PATCH 04/35] 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 d942fb6..66cd528 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -341,7 +341,7 @@ satisfieds.map(item=>{ var score = parseInt(item.score)*20 var per = score +'%' - $(".satisfied").append(""+item.paramedic.name+""+ + $(".satisfied").append(""+item.paramedic.name+""+ "
"+ ""+score+"分"+ " ") From d2d8f66d5da34523706ce97c860cbec1dcef2679 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:11:43 +0800 Subject: [PATCH 05/35] up --- public/dashboard/index copy.html | 652 --------------- public/dashboard/index.html | 1281 +++++++++++++++--------------- public/dashboard/index1.html | 683 ++++++++++++++++ 3 files changed, 1308 insertions(+), 1308 deletions(-) delete mode 100644 public/dashboard/index copy.html create mode 100644 public/dashboard/index1.html diff --git a/public/dashboard/index copy.html b/public/dashboard/index copy.html deleted file mode 100644 index f57b6fa..0000000 --- a/public/dashboard/index copy.html +++ /dev/null @@ -1,652 +0,0 @@ - - - - - - - - - - - - - 护工管理平台驾驶舱 - - - - - - - - - - - - - -
- -
-
-
- 驾驶舱 -
-
-
-
-
- -
-

护工陪护实时概况

-
-

护工数: 736

-

已陪护: 696

-

未陪护: 40

-

陪护单: 855

-

上工率: 122.5%

-
-
-
- -
-

床位陪护实时概况

-
-

床位数: 7650

-

正在陪护: 855

-

未陪护: 7795

-

陪护率: 11.2%

-
-
-
-
- -
- -
-
- -
-
-

本月陪护订单分析

-
-
- -
-

本月营收分析

-
-
-
-
-
- -
-

陪护统计表

-
-
-
-
-
- -
-

最新陪护单信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
张**第一人民医院内科楼15床已派工
任**武进中医院新大楼69床已派工
王**阳湖院外科楼34床待处理
林**常州市中医院188床待派工
刘**常州市妇幼保健院63床待派工
马**第一人民医院外科楼159床已派工
宋**常州市中医院99床已派工
-
- -
-

最新出院信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
周**第一人民医院内科楼132床已结算
张**武进中医院75床已结算
-
- -
-

最新投诉信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
陈**投诉袁护工武进中医院
-
- -
-

上月满意度评价分析

- - - - - - - - - - - - - - - - - - - - - - - - - -
工号103 -
- 		100分
 
工号267 -
- 		90分
 
工号032 -
- 		80分
 
工号011 -
- 		60分
-
-
-
- - - - - diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 66cd528..f57b6fa 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -1,683 +1,652 @@ - - - - - - - - - - - 护工管理平台驾驶舱 - - - - - - - - - - + + + + + + + + + - - - -
- -
-
-
- 驾驶舱 -
-
-
-
-
- -
-

护工陪护实时概况

-
-

护工数: --

-

已陪护: --

-

未陪护: --

-

陪护单: --

-

上工率: --

-
-
-
- -
-

床位陪护实时概况

-
-

床位数: --

-

正在陪护: --

-

未陪护: --

-

陪护率: --

-
-
-
-
- -
- + + + +
+ +
+
+
+ 驾驶舱 +
+
+
+
+
+ +
+

护工陪护实时概况

+
+

护工数: 736

+

已陪护: 696

+

未陪护: 40

+

陪护单: 855

+

上工率: 122.5%

+
- -
-
-

本月陪护订单分析

-
-
- -
-

本月营收分析

-
+ +
+

床位陪护实时概况

+
+

床位数: 7650

+

正在陪护: 855

+

未陪护: 7795

+

陪护率: 11.2%

+
-
-
- -
-

陪护统计表

-
-
-
-
-
- -
-

最新陪护单信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
张**第一人民医院内科楼15床已派工
任**武进中医院新大楼69床已派工
王**阳湖院外科楼34床待处理
林**常州市中医院188床待派工
刘**常州市妇幼保健院63床待派工
马**第一人民医院外科楼159床已派工
宋**常州市中医院99床已派工
-
- -
-

最新出院信息

- - -
-
- -
-

最新评价信息

- - -
-
- -
-

上月满意度评价分析

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

本月陪护订单分析

+
+
+ +
+

本月营收分析

+
+
+
+
+
+ +
+

陪护统计表

+
+
+
- - - + + - + ], + color: ["#ffb22f", "#0087ff"], + }; + option4 && myChart4.setOption(option4); + + + + diff --git a/public/dashboard/index1.html b/public/dashboard/index1.html new file mode 100644 index 0000000..66cd528 --- /dev/null +++ b/public/dashboard/index1.html @@ -0,0 +1,683 @@ + + + + + + + + + + + + + 护工管理平台驾驶舱 + + + + + + + + + + + + + +
+ +
+
+
+ 驾驶舱 +
+
+
+
+
+ +
+

护工陪护实时概况

+
+

护工数: --

+

已陪护: --

+

未陪护: --

+

陪护单: --

+

上工率: --

+
+
+
+ +
+

床位陪护实时概况

+
+

床位数: --

+

正在陪护: --

+

未陪护: --

+

陪护率: --

+
+
+
+
+ +
+ +
+
+ +
+
+

本月陪护订单分析

+
+
+ +
+

本月营收分析

+
+
+
+
+
+ +
+

陪护统计表

+
+
+
+
+
+ +
+

最新陪护单信息

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
张**第一人民医院内科楼15床已派工
任**武进中医院新大楼69床已派工
王**阳湖院外科楼34床待处理
林**常州市中医院188床待派工
刘**常州市妇幼保健院63床待派工
马**第一人民医院外科楼159床已派工
宋**常州市中医院99床已派工
+
+ +
+

最新出院信息

+ + +
+
+ +
+

最新评价信息

+ + +
+
+ +
+

上月满意度评价分析

+ + + +
+
+
+
+ + + + + From e9f8110c3339d69d381ba8af385b877842c08e40 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:12:56 +0800 Subject: [PATCH 06/35] up --- public/dashboard/index.html | 1281 +++++++++++++++++----------------- public/dashboard/index1.html | 683 ------------------ public/dashboard/index2.html | 652 +++++++++++++++++ 3 files changed, 1308 insertions(+), 1308 deletions(-) delete mode 100644 public/dashboard/index1.html create mode 100644 public/dashboard/index2.html diff --git a/public/dashboard/index.html b/public/dashboard/index.html index f57b6fa..66cd528 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -1,652 +1,683 @@ - - - - - - - - - - - 护工管理平台驾驶舱 - - - - - - - - - - + + + + + + + + + - - - -
- -
-
-
- 驾驶舱 -
-
-
-
-
- -
-

护工陪护实时概况

-
-

护工数: 736

-

已陪护: 696

-

未陪护: 40

-

陪护单: 855

-

上工率: 122.5%

-
-
+ + + +
+ +
+
+
+ 驾驶舱 +
- -
-

床位陪护实时概况

-
-

床位数: 7650

-

正在陪护: 855

-

未陪护: 7795

-

陪护率: 11.2%

+
+
+
+ +
+

护工陪护实时概况

+
+

护工数: --

+

已陪护: --

+

未陪护: --

+

陪护单: --

+

上工率: --

+
+
+
+ +
+

床位陪护实时概况

+
+

床位数: --

+

正在陪护: --

+

未陪护: --

+

陪护率: --

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

本月陪护订单分析

-
-
- -
-

本月营收分析

-
-
-
-
-
- -
-

陪护统计表

-
-
-
+
-
- -
-

最新陪护单信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
张**第一人民医院内科楼15床已派工
任**武进中医院新大楼69床已派工
王**阳湖院外科楼34床待处理
林**常州市中医院188床待派工
刘**常州市妇幼保健院63床待派工
马**第一人民医院外科楼159床已派工
宋**常州市中医院99床已派工
-
- -
-

最新出院信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
周**第一人民医院内科楼132床已结算
张**武进中医院75床已结算
-
- -
-

最新投诉信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
陈**投诉袁护工武进中医院
-
- -
-

上月满意度评价分析

- - - - - - - - - - - - - - - - - - - - - - - - - -
工号103 -
- 		100分
 
工号267 -
- 		90分
 
工号032 -
- 		80分
 
工号011 -
- 		60分
-
-
-
- - - + + - + marker.setMap(null); + marker = null; + marker = new TMap.MultiMarker({ + id: "marker-layer", //图层id + map: map, + styles: { //点标注的相关样式 + "marker": new TMap.MarkerStyle({ + "width": 25, + "height": 35, + "anchor": { + x: 16, + y: 32 + }, + "src": "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png" + }) + }, + geometries: [{ //点标注数据数组 + "id": "demo", + "styleId": "marker", + "position": center, + "properties": { + "title": "marker" + } + }] + }); + } + + diff --git a/public/dashboard/index1.html b/public/dashboard/index1.html deleted file mode 100644 index 66cd528..0000000 --- a/public/dashboard/index1.html +++ /dev/null @@ -1,683 +0,0 @@ - - - - - - - - - - - - - 护工管理平台驾驶舱 - - - - - - - - - - - - - -
- -
-
-
- 驾驶舱 -
-
-
-
-
- -
-

护工陪护实时概况

-
-

护工数: --

-

已陪护: --

-

未陪护: --

-

陪护单: --

-

上工率: --

-
-
-
- -
-

床位陪护实时概况

-
-

床位数: --

-

正在陪护: --

-

未陪护: --

-

陪护率: --

-
-
-
-
- -
- -
-
- -
-
-

本月陪护订单分析

-
-
- -
-

本月营收分析

-
-
-
-
-
- -
-

陪护统计表

-
-
-
-
-
- -
-

最新陪护单信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
张**第一人民医院内科楼15床已派工
任**武进中医院新大楼69床已派工
王**阳湖院外科楼34床待处理
林**常州市中医院188床待派工
刘**常州市妇幼保健院63床待派工
马**第一人民医院外科楼159床已派工
宋**常州市中医院99床已派工
-
- -
-

最新出院信息

- - -
-
- -
-

最新评价信息

- - -
-
- -
-

上月满意度评价分析

- - - -
-
-
-
- - - - - diff --git a/public/dashboard/index2.html b/public/dashboard/index2.html new file mode 100644 index 0000000..f57b6fa --- /dev/null +++ b/public/dashboard/index2.html @@ -0,0 +1,652 @@ + + + + + + + + + + + + + 护工管理平台驾驶舱 + + + + + + + + + + + + + +
+ +
+
+
+ 驾驶舱 +
+
+
+
+
+ +
+

护工陪护实时概况

+
+

护工数: 736

+

已陪护: 696

+

未陪护: 40

+

陪护单: 855

+

上工率: 122.5%

+
+
+
+ +
+

床位陪护实时概况

+
+

床位数: 7650

+

正在陪护: 855

+

未陪护: 7795

+

陪护率: 11.2%

+
+
+
+
+ +
+ +
+
+ +
+
+

本月陪护订单分析

+
+
+ +
+

本月营收分析

+
+
+
+
+
+ +
+

陪护统计表

+
+
+
+
+
+ +
+

最新陪护单信息

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
张**第一人民医院内科楼15床已派工
任**武进中医院新大楼69床已派工
王**阳湖院外科楼34床待处理
林**常州市中医院188床待派工
刘**常州市妇幼保健院63床待派工
马**第一人民医院外科楼159床已派工
宋**常州市中医院99床已派工
+
+ +
+

最新出院信息

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
周**第一人民医院内科楼132床已结算
张**武进中医院75床已结算
+
+ +
+

最新投诉信息

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
陈**投诉袁护工武进中医院
+
+ +
+

上月满意度评价分析

+ + + + + + + + + + + + + + + + + + + + + + + + + +
工号103 +
+ 		100分
 
工号267 +
+ 		90分
 
工号032 +
+ 		80分
 
工号011 +
+ 		60分
+
+
+
+ + + + + From 89989d06f9055e0d1f3f57423367ea8ff97480be Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:14:04 +0800 Subject: [PATCH 07/35] 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 66cd528..7df4502 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -341,7 +341,7 @@ satisfieds.map(item=>{ var score = parseInt(item.score)*20 var per = score +'%' - $(".satisfied").append(""+item.paramedic.name+""+ + $(".satisfied").append(""+item.paramedic.name+""+ "
"+ ""+score+"分"+ " ") From fdc9af32566e9b7d2a8852cdc56c4c14d696f771 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:16:59 +0800 Subject: [PATCH 08/35] 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 7df4502..09ec1b8 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -338,10 +338,10 @@ // 满意度 satisfied var satisfieds = datas.satisfied $(".satisfied").empty("") - satisfieds.map(item=>{ + satisfieds.map((item,index)=>{ var score = parseInt(item.score)*20 var per = score +'%' - $(".satisfied").append(""+item.paramedic.name+""+ + $(".satisfied").append(""+item.paramedic.name+""+ "
"+ ""+score+"分"+ " ") From a9ebbc1f21e62046c94f3168f23328ffda976f7d Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:18:30 +0800 Subject: [PATCH 09/35] 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 09ec1b8..4fcdeca 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -368,7 +368,7 @@ // name:'访问量', type: 'pie', color: ["#04c6c7", "#ffc34a"], - radius: '70%', + radius: '50%', data: paramedicChart }] }; From a77bbfd19066c8dab231f06920fb990a974f85d2 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:20:17 +0800 Subject: [PATCH 10/35] up --- public/dashboard/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 4fcdeca..d68466d 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -364,6 +364,7 @@ function initChart() { // 护工陪护实时概况 var option = { + tooltip:{}, series: [{ // name:'访问量', type: 'pie', @@ -376,6 +377,7 @@ myChart.setOption(option); // 床位陪护实时概况 var option1 = { + tooltip:{}, series: [{ type: 'pie', color: ["#04c6c7", "#ffc34a"], From e5ee12c5defae5aa549006a542662adcb31adcda Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:21:00 +0800 Subject: [PATCH 11/35] up --- public/dashboard/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index d68466d..605bfda 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -514,6 +514,7 @@ var option4; option4 = { + tooltip:{}, color: ['#018fff'], lineStyle: { color: '#018fff' From 00449d77dccf3c241155f7905e29b46d007eb30b Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:22:47 +0800 Subject: [PATCH 12/35] up --- public/dashboard/index.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 605bfda..e9af82b 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -514,7 +514,16 @@ var option4; option4 = { - tooltip:{}, + tooltip:{ + trigger: 'axis', + formatter: function (params) { + let tooltipContent = ''; + params.forEach((param) => { + tooltipContent += `${param.seriesName}: ${param.value}`; + }); + return tooltipContent; + }, + }, color: ['#018fff'], lineStyle: { color: '#018fff' From 8d8c7f2ecc3452190256904f728d296fa39ecee5 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:25:29 +0800 Subject: [PATCH 13/35] 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 e9af82b..f631665 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -519,7 +519,7 @@ formatter: function (params) { let tooltipContent = ''; params.forEach((param) => { - tooltipContent += `${param.seriesName}: ${param.value}`; + tooltipContent += `

${param.seriesName}: ${param.value}

`; }); return tooltipContent; }, From ba1ea580b42bcf10398c90a8dcd8b351b80aabc3 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:27:46 +0800 Subject: [PATCH 14/35] up --- public/dashboard/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index f631665..389ca81 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -420,6 +420,7 @@ }, axisLabel: { interval: 0, + rotate: 45, textStyle: { color: '#fff', fontSize: '14px' @@ -565,6 +566,7 @@ }, axisLabel: { interval: 0, + rotate: 45, textStyle: { color: '#fff', fontSize: '14px' From 64d63e9dcb260fffc352dcfd0a8aea17ddd32d74 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:28:36 +0800 Subject: [PATCH 15/35] 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 389ca81..41d726e 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -420,7 +420,7 @@ }, axisLabel: { interval: 0, - rotate: 45, + rotate: 25, textStyle: { color: '#fff', fontSize: '14px' @@ -566,7 +566,7 @@ }, axisLabel: { interval: 0, - rotate: 45, + rotate: 25, textStyle: { color: '#fff', fontSize: '14px' From 92998b1a68d189c8f3b1013e28395501635e444c Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:32:26 +0800 Subject: [PATCH 16/35] up --- public/dashboard/index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 41d726e..8a058e5 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -420,7 +420,7 @@ }, axisLabel: { interval: 0, - rotate: 25, + rotate: 20, textStyle: { color: '#fff', fontSize: '14px' @@ -520,6 +520,7 @@ formatter: function (params) { let tooltipContent = ''; params.forEach((param) => { + console.log("param",param) tooltipContent += `

${param.seriesName}: ${param.value}

`; }); return tooltipContent; @@ -566,7 +567,7 @@ }, axisLabel: { interval: 0, - rotate: 25, + rotate: 20, textStyle: { color: '#fff', fontSize: '14px' From 7e064580442b67b581ed0313275b1fe65f77ce61 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:33:41 +0800 Subject: [PATCH 17/35] 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 8a058e5..b132a5d 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -521,7 +521,7 @@ let tooltipContent = ''; params.forEach((param) => { console.log("param",param) - tooltipContent += `

${param.seriesName}: ${param.value}

`; + tooltipContent += `

${param.name}

${param.seriesName}: ${param.value}

`; }); return tooltipContent; }, From 6e901ba098716f947d11a3abaef5429eb3e7697e Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:36:28 +0800 Subject: [PATCH 18/35] up --- public/dashboard/index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index b132a5d..6121055 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -519,9 +519,12 @@ trigger: 'axis', formatter: function (params) { let tooltipContent = ''; + var xAxisName = params[0].name; + // 添加X轴名称到提示框内容 + tooltipContent += `

${param.name}

` params.forEach((param) => { console.log("param",param) - tooltipContent += `

${param.name}

${param.seriesName}: ${param.value}

`; + tooltipContent += `

${param.seriesName}: ${param.value}

`; }); return tooltipContent; }, From 8688b8bd55aeeba8d68b247ee698c3ea668da440 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:36:53 +0800 Subject: [PATCH 19/35] 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 6121055..10bb7d8 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -521,7 +521,7 @@ let tooltipContent = ''; var xAxisName = params[0].name; // 添加X轴名称到提示框内容 - tooltipContent += `

${param.name}

` + tooltipContent += `

${xAxisName}

` params.forEach((param) => { console.log("param",param) tooltipContent += `

${param.seriesName}: ${param.value}

`; From 4fb38df9a2bc26a1aebb3cb007b1f242501ac8d8 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:40:04 +0800 Subject: [PATCH 20/35] up --- public/dashboard/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 10bb7d8..79af7b3 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -515,6 +515,9 @@ var option4; option4 = { + grid:{ + bottom:2% + }, tooltip:{ trigger: 'axis', formatter: function (params) { From a4621fa33bed78d7dd8c1874db87643f02876eb3 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:41:17 +0800 Subject: [PATCH 21/35] up --- public/dashboard/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 79af7b3..bcf28e0 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -515,9 +515,6 @@ var option4; option4 = { - grid:{ - bottom:2% - }, tooltip:{ trigger: 'axis', formatter: function (params) { @@ -532,6 +529,9 @@ return tooltipContent; }, }, + grid:{ + bottom:"2%" + }, color: ['#018fff'], lineStyle: { color: '#018fff' From 5d21b990ecc6b1c7359f44f3c8d8d6b2d9218af4 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:41:41 +0800 Subject: [PATCH 22/35] 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 bcf28e0..8c72ceb 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -530,7 +530,7 @@ }, }, grid:{ - bottom:"2%" + bottom:"12%" }, color: ['#018fff'], lineStyle: { From a07bdfa9b828de2b84a90800f2463a428938c661 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:42:07 +0800 Subject: [PATCH 23/35] up --- public/dashboard/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 8c72ceb..d1b7eba 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -530,6 +530,7 @@ }, }, grid:{ + top:"2%", bottom:"12%" }, color: ['#018fff'], From 4ad9b7b4d6b0fbe34d95a88cbd5fd03b4297b092 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:42:35 +0800 Subject: [PATCH 24/35] 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 d1b7eba..fdb6f29 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -530,8 +530,8 @@ }, }, grid:{ - top:"2%", - bottom:"12%" + top:"10%", + bottom:"20%" }, color: ['#018fff'], lineStyle: { From 12cba1908b10c698cf790264d194c7485383b7a2 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:42:53 +0800 Subject: [PATCH 25/35] 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 fdb6f29..10e1f04 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -531,7 +531,7 @@ }, grid:{ top:"10%", - bottom:"20%" + bottom:"30%" }, color: ['#018fff'], lineStyle: { From 87de5b6f464f747a75c2c642fba5d2ee316357eb Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:46:52 +0800 Subject: [PATCH 26/35] up --- public/dashboard/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 10e1f04..b10a932 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -31,12 +31,12 @@ -
- -
驾驶舱 +
+ +
From a031c252fc519efd19a50844f9167abc4773f0b1 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:48:28 +0800 Subject: [PATCH 27/35] 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 b10a932..a55f9ca 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -34,7 +34,7 @@
驾驶舱 -
+
From af00286e2a66d5994c94d9b6e61b224ecf446b9e Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 13:56:25 +0800 Subject: [PATCH 28/35] 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 a55f9ca..0ddc6d0 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -662,7 +662,7 @@ }] }); window.setInterval(function() { - //panToHospital(); + panToHospital(); }, 3000); } From c9c43c087cfcc2ad1c47ce8ba94d4f0a5d222801 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 14:00:27 +0800 Subject: [PATCH 29/35] up --- public/dashboard/index.html | 70 ++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 0ddc6d0..64b5a69 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -661,44 +661,50 @@ } }] }); + panToHospital() window.setInterval(function() { - panToHospital(); + // panToHospital(); }, 3000); } function panToHospital() { - current_hospital++; - if (current_hospital == hospitals.length) { - current_hospital = 0; - } - var center = new TMap.LatLng(hospitals[current_hospital].lat, hospitals[current_hospital].lng); - map.panTo(center); + // current_hospital++; + // if (current_hospital == hospitals.length) { + // current_hospital = 0; + // } + hospitals.map(item=>{ + var center = new TMap.LatLng(item.lat, item.lng); + // marker.setMap(null); + // var marker1 = null; + var marker1 = new TMap.MultiMarker({ + id: "marker-layer", //图层id + map: map, + styles: { //点标注的相关样式 + "marker": new TMap.MarkerStyle({ + "width": 25, + "height": 35, + "anchor": { + x: 16, + y: 32 + }, + "src": "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png" + }) + }, + geometries: [{ //点标注数据数组 + "id": "demo", + "styleId": "marker", + "position": center, + "properties": { + "title": "marker" + } + }] + }); + marker.push(marker1) + }) + + // map.panTo(center); + - marker.setMap(null); - marker = null; - marker = new TMap.MultiMarker({ - id: "marker-layer", //图层id - map: map, - styles: { //点标注的相关样式 - "marker": new TMap.MarkerStyle({ - "width": 25, - "height": 35, - "anchor": { - x: 16, - y: 32 - }, - "src": "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png" - }) - }, - geometries: [{ //点标注数据数组 - "id": "demo", - "styleId": "marker", - "position": center, - "properties": { - "title": "marker" - } - }] - }); } From 7317b27875e650d0b5e99a0874d26998b50eee59 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 14:03:52 +0800 Subject: [PATCH 30/35] up --- public/dashboard/index.html | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 64b5a69..7bc7fda 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -661,7 +661,7 @@ } }] }); - panToHospital() + // panToHospital() window.setInterval(function() { // panToHospital(); }, 3000); @@ -676,30 +676,15 @@ var center = new TMap.LatLng(item.lat, item.lng); // marker.setMap(null); // var marker1 = null; - var marker1 = new TMap.MultiMarker({ - id: "marker-layer", //图层id - map: map, - styles: { //点标注的相关样式 - "marker": new TMap.MarkerStyle({ - "width": 25, - "height": 35, - "anchor": { - x: 16, - y: 32 - }, - "src": "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png" - }) - }, - geometries: [{ //点标注数据数组 + var mark = { //点标注数据数组 "id": "demo", "styleId": "marker", "position": center, "properties": { "title": "marker" } - }] - }); - marker.push(marker1) + } + marker.geometries.push(mark) }) // map.panTo(center); From d0bf5e7666e78eaab5e9e92aa7f3083eec13b76b Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 14:04:19 +0800 Subject: [PATCH 31/35] 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 7bc7fda..6ea4c2f 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -661,7 +661,7 @@ } }] }); - // panToHospital() + panToHospital() window.setInterval(function() { // panToHospital(); }, 3000); From 0224d04dcb9e07bcdcaf717bae112b4eca11c0df Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 14:06:05 +0800 Subject: [PATCH 32/35] up --- public/dashboard/index.html | 43 ++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 6ea4c2f..1e012c4 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -638,29 +638,7 @@ center: center, //设置地图中心点坐标 }); //初始化marker - marker = new TMap.MultiMarker({ - id: "marker-layer", //图层id - map: map, - styles: { //点标注的相关样式 - "marker": new TMap.MarkerStyle({ - "width": 25, - "height": 35, - "anchor": { - x: 16, - y: 32 - }, - "src": "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png" - }) - }, - geometries: [{ //点标注数据数组 - "id": "demo", - "styleId": "marker", - "position": center, - "properties": { - "title": "marker" - } - }] - }); + panToHospital() window.setInterval(function() { // panToHospital(); @@ -672,6 +650,7 @@ // if (current_hospital == hospitals.length) { // current_hospital = 0; // } + var geometriesArr = [] hospitals.map(item=>{ var center = new TMap.LatLng(item.lat, item.lng); // marker.setMap(null); @@ -684,9 +663,25 @@ "title": "marker" } } - marker.geometries.push(mark) + geometriesArr.push(mark) }) + marker = new TMap.MultiMarker({ + id: "marker-layer", //图层id + map: map, + styles: { //点标注的相关样式 + "marker": new TMap.MarkerStyle({ + "width": 25, + "height": 35, + "anchor": { + x: 16, + y: 32 + }, + "src": "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png" + }) + }, + geometries: geometriesArr + }); // map.panTo(center); From 15a5d5957fe5c007e517c7a037489ad58a22e5d2 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 14:14:31 +0800 Subject: [PATCH 33/35] up --- public/dashboard/index.html | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 1e012c4..5bb6703 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -166,39 +166,34 @@ var current_hospital = 0; var map, marker; var hospitals = [{ - name: "常州市第一人民医院", + name: "常州市第一人民医院1", lat: 31.77956, lng: 119.960747 }, { - name: "常州市中医院", + name: "常州市中医院1", lat: 31.773121, lng: 119.964615 }, { - name: "常州市武进人民医院（南院）", + name: "常州市武进人民医院（南院）1", lat: 31.687063, lng: 119.978226 }, { - name: "常州市第二人民医院阳湖院", + name: "常州市第二人民医院阳湖院1", lat: 31.688465, lng: 119.938339 }, { - name: "常州市妇幼保健院", + name: "常州市妇幼保健院1", lat: 31.783091, lng: 119.893227 }, { name: "武进区中医院", - lat: 31.783091, - lng: 119.893227 - }, - { - name: "武进区中医院", - lat: 31.783091, - lng: 119.893227 + lat: 31.725018, + lng: 119.941279 } ]; var paramedicChart = [{ From aa66f6a84034daef09f67ccd888876ccb1cfd90c Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 14:15:49 +0800 Subject: [PATCH 34/35] up --- public/dashboard/index.html | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 5bb6703..54684f1 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -166,27 +166,27 @@ var current_hospital = 0; var map, marker; var hospitals = [{ - name: "常州市第一人民医院1", + name: "常州市第一人民医院", lat: 31.77956, lng: 119.960747 }, { - name: "常州市中医院1", + name: "常州市中医院", lat: 31.773121, lng: 119.964615 }, { - name: "常州市武进人民医院（南院）1", + name: "常州市武进人民医院（南院）", lat: 31.687063, lng: 119.978226 }, { - name: "常州市第二人民医院阳湖院1", + name: "常州市第二人民医院阳湖院", lat: 31.688465, lng: 119.938339 }, { - name: "常州市妇幼保健院1", + name: "常州市妇幼保健院", lat: 31.783091, lng: 119.893227 }, @@ -635,21 +635,12 @@ //初始化marker panToHospital() - window.setInterval(function() { - // panToHospital(); - }, 3000); } function panToHospital() { - // current_hospital++; - // if (current_hospital == hospitals.length) { - // current_hospital = 0; - // } var geometriesArr = [] hospitals.map(item=>{ var center = new TMap.LatLng(item.lat, item.lng); - // marker.setMap(null); - // var marker1 = null; var mark = { //点标注数据数组 "id": "demo", "styleId": "marker", @@ -677,9 +668,6 @@ }, geometries: geometriesArr }); - // map.panTo(center); - - } From a7252bf99c23d7ed0c22e076ce00e4a713deabae Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 25 Jan 2024 14:18:24 +0800 Subject: [PATCH 35/35] up --- public/dashboard/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 54684f1..41e49e6 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -344,7 +344,6 @@ $('.skillbar').skillbar({ speed: 1000, }); - console.log("result", result) initChart() }, complete: function(xhr, textStatus) { @@ -518,7 +517,6 @@ // 添加X轴名称到提示框内容 tooltipContent += `

${xAxisName}

` params.forEach((param) => { - console.log("param",param) tooltipContent += `

${param.seriesName}: ${param.value}

`; }); return tooltipContent;