From dc7a9e7bd2fb02dccec8fef97cfdedad830df097 Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Mon, 2 Sep 2024 16:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/echarts/pie/default.vue | 18 +- .../src/layouts/components/Footer/index.vue | 2 +- frontend/src/styles/element.scss | 5 + frontend/src/views/home/components/table.vue | 248 +++++++++- frontend/src/views/home/components/tree.vue | 6 +- frontend/src/views/home/tabs/dashboard.vue | 432 +++++------------- .../plan/planList/components/details.vue | 2 +- 7 files changed, 376 insertions(+), 337 deletions(-) diff --git a/frontend/src/components/echarts/pie/default.vue b/frontend/src/components/echarts/pie/default.vue index 087a189..5da0d28 100644 --- a/frontend/src/components/echarts/pie/default.vue +++ b/frontend/src/components/echarts/pie/default.vue @@ -41,7 +41,7 @@ const init = () => { isRing: false, //是否环形图 isRadius: false, //是否圆角 isSpace: true, //是否显示间隔 - isLabelLine: true, //是否显示引导线 + isLabelLine: false, //是否显示引导线 ...props.customData, }; legendData.value = { @@ -51,7 +51,7 @@ const init = () => { itemGap: 0, // 设置图例项之间的间隔为20 ...props.legendData, }; - chart.value = chartsRef.value && echarts.init(chartsRef.value) + chart.value = chartsRef.value && echarts.init(chartsRef.value); var option = { title: { text: customData.value.title, @@ -67,7 +67,7 @@ const init = () => { series: [ { type: "pie", - radius: customData.value.isRing ? ["45", "65"] : "65%", + radius: customData.value.isRing ? ["55", "75"] : "75%", data: props.chartsData, center: ["55%", "50%"], // 设置饼图的中心位置 // padAngle: 2, @@ -80,6 +80,16 @@ const init = () => { shadowColor: "rgba(0, 0, 0, 0.5)", }, }, + label: { + normal: { + show: true, + position: "inside", + textStyle: { + color: "#fff", + fontSize: 12, + }, + }, + }, itemStyle: { borderRadius: customData.value.isRadius ? 10 : 0, borderColor: customData.value.isSpace ? "#fff" : "", @@ -91,7 +101,7 @@ const init = () => { }, ], }; - option &&chart.value&& chart.value.setOption(option); + option && chart.value && chart.value.setOption(option); setTimeout(() => { chart.value.resize(); }, 0); diff --git a/frontend/src/layouts/components/Footer/index.vue b/frontend/src/layouts/components/Footer/index.vue index 38638dc..0351286 100644 --- a/frontend/src/layouts/components/Footer/index.vue +++ b/frontend/src/layouts/components/Footer/index.vue @@ -30,7 +30,7 @@ -
+
2024 © 南京灿能电力自动化股份有限公司
diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss
index 80ccd70..2c09edc 100644
--- a/frontend/src/styles/element.scss
+++ b/frontend/src/styles/element.scss
@@ -334,3 +334,8 @@
margin-right: 10px !important;
margin-bottom: 20px !important;
}
+
+.el-tree-node__content:hover {
+ background-color: var(--el-color-primary) !important;
+ color: #fff;
+}
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 21e27b2..97183f2 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -1,5 +1,5 @@
- {{ item.label }} {{ item.label }}
-
+
+