From 05703d4267c9e0ab768754f6f0bf27f2c85f024e Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 4 Jan 2024 16:43:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/form/datePicker/index.vue | 102 ++++++++++++++++--
src/styles/index.scss | 1 +
src/styles/vxeTable.scss | 16 +++
src/views/Event-boot/Region/distribution.vue | 10 +-
src/views/dashboard/components/Tableabove.vue | 15 +--
src/views/dashboard/components/echart.vue | 5 +-
src/views/dashboard/index.vue | 5 +-
7 files changed, 130 insertions(+), 24 deletions(-)
create mode 100644 src/styles/vxeTable.scss
diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue
index 361d73b..fdf148e 100644
--- a/src/components/form/datePicker/index.vue
+++ b/src/components/form/datePicker/index.vue
@@ -1,19 +1,41 @@
+
+
+
+
+ 当前
+
-
\ No newline at end of file
+
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 4f1726b..a9fc53d 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1,3 +1,4 @@
@use '@/styles/app';
+@use '@/styles/vxeTable';
@use '@/styles/element';
@use '@/styles/var';
diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss
new file mode 100644
index 0000000..8f526ab
--- /dev/null
+++ b/src/styles/vxeTable.scss
@@ -0,0 +1,16 @@
+.vxe-table--body-wrapper::-webkit-scrollbar {
+ width:10px;
+}
+
+.vxe-table--body-wrapper::-webkit-scrollbar-thumb {
+ border-radius: 5px;
+ height: 3px;
+ background-color: #059f95 !important;
+ border-radius: 30px !important;
+}
+
+.vxe-table--body-wrapper::-webkit-scrollbar-track {
+ box-shadow: inset 0 0 5px rgb(174, 173, 173);
+ border-radius: 2px;
+ background: rgb(235, 233, 233);
+}
diff --git a/src/views/Event-boot/Region/distribution.vue b/src/views/Event-boot/Region/distribution.vue
index e520d1f..e422f24 100644
--- a/src/views/Event-boot/Region/distribution.vue
+++ b/src/views/Event-boot/Region/distribution.vue
@@ -21,7 +21,7 @@
-
+
{
echartMapList.value.options.series = []
EchartMap.value.GetEchar(name)
}
+
// 地图数处理
const map = (res: any) => {
echartMapList.value = {
@@ -307,12 +308,13 @@ const histogram = (res: any) => {
onMounted(() => {
onSubmit()
})
+const layout = mainHeight(73) as any
diff --git a/src/views/dashboard/components/Tableabove.vue b/src/views/dashboard/components/Tableabove.vue
index 90647f8..c1b9d81 100644
--- a/src/views/dashboard/components/Tableabove.vue
+++ b/src/views/dashboard/components/Tableabove.vue
@@ -45,10 +45,11 @@
diff --git a/src/views/dashboard/components/echart.vue b/src/views/dashboard/components/echart.vue
index 0444f45..ad7e209 100644
--- a/src/views/dashboard/components/echart.vue
+++ b/src/views/dashboard/components/echart.vue
@@ -11,7 +11,7 @@