+
diff --git a/frontend/src/components/developStatusChart/index.vue b/frontend/src/components/developStatusChart/index.vue
index 4fb4ec9..90b6254 100644
--- a/frontend/src/components/developStatusChart/index.vue
+++ b/frontend/src/components/developStatusChart/index.vue
@@ -37,50 +37,35 @@ const initChart = () => {
chartInstance = echarts.init(chartContainer.value);
const option = {
- tooltip: {
- trigger: 'item',
- formatter: '{a}
{b}: {c} ({d}%)',
- // position: function (point, params, dom, rect, size) {
-
- // // 固定在图表右侧显示，再往右挪一点
- // return [size.viewSize.width - 120, point[1]];
- // }
- },
+ tooltip: {
+ trigger: 'item',
+ formatter: '{a}
{b}: {c} ({d}%)',
+ position: 'right'
+ },
legend: {
- bottom: '25%',
- right: '2%',
- orient: 'vertical', // 垂直排列
+
data: ['已建', '在建'],
- itemWidth: 21,
- itemHeight: 11,
- itemStyle: {
- borderRadius: 0
- },
- textStyle: {
- fontSize: 11
- },
- itemGap: 12 // 图例项之间的间距
+ left: '60%',
+ orient: 'vertical',
+ top: 'center',
+ itemWidth: 20,
+ itemHeight: 12
},
series: [
{
- name: '建设状态',
+ name: '装机容量',
type: 'pie',
- radius: ['80%', '95%'], // 外环
- center: ['35%', '50%'], // 整体向下移动一点
- avoidLabelOverlap: false,
- itemStyle: {
- borderRadius: 0,
- borderColor: '#fff',
- borderWidth: 1
- },
+ radius: ['70%', '90%'], // 外环
+ center: ['30%', '50%'], // 整体向下移动一点
+
+ itemStyle: {
+ borderRadius: 2,
+ borderColor: '#fff',
+ borderWidth: 2
+ },
label: {
show: false // 不显示外侧标签
},
- emphasis: {
- label: {
- show: false
- }
- },
labelLine: {
show: false // 不显示引导线
},
@@ -90,24 +75,18 @@ const initChart = () => {
]
},
{
- name: '中心圆',
+ name: '数量(座)',
type: 'pie',
- radius: ['0%', '55%'], // 中心圆
- center: ['35%', '50%'], // 与外环保持一致，整体向下移动
- avoidLabelOverlap: false,
+ radius: ['0%', '50%'], // 中心圆
+ center: ['30%', '50%'], // 与外环保持一致，整体向下移动
itemStyle: {
- borderRadius: 0,
- borderColor: '#fff',
- borderWidth: 0
- },
+ borderRadius: 2,
+ borderColor: '#fff',
+ borderWidth: 2
+ },
label: {
show: false
},
- emphasis: {
- label: {
- show: false
- }
- },
labelLine: {
show: false
},
@@ -128,13 +107,13 @@ const initChart = () => {
};
-
\ No newline at end of file
diff --git a/frontend/src/modules/jidiInfoMod/index.vue b/frontend/src/modules/jidiInfoMod/index.vue
index 0cc3b90..234cf57 100644
--- a/frontend/src/modules/jidiInfoMod/index.vue
+++ b/frontend/src/modules/jidiInfoMod/index.vue
@@ -43,6 +43,7 @@ onMounted(() => {});
}
.basic_body1 {
- width: 100%;
+ width: 100%;
+ line-break: anywhere;
}
diff --git a/frontend/src/modules/shuidianhuangjingjieruMod/DataTable.vue b/frontend/src/modules/shuidianhuangjingjieruMod/DataTable.vue
index b644ed6..e473d15 100644
--- a/frontend/src/modules/shuidianhuangjingjieruMod/DataTable.vue
+++ b/frontend/src/modules/shuidianhuangjingjieruMod/DataTable.vue
@@ -27,7 +27,7 @@ const columns: ColumnsType = [
align: 'left'
},
{
- title: '装机容量 (万 kW)',
+ title: '装机容量 (万kW)',
key: 'capacity',
align: 'center',
children: [
@@ -35,28 +35,28 @@ const columns: ColumnsType = [
title: '总计',
dataIndex: 'total',
key: 'total',
- width: 70,
+ width: 73.6,
align: 'center'
},
{
title: '已建',
dataIndex: 'built',
key: 'built',
- width: 70,
+ width: 73.6,
align: 'center'
},
{
title: '在建',
dataIndex: 'building',
key: 'building',
- width: 70,
+ width: 73.6,
align: 'center'
},
{
title: '未建',
dataIndex: 'unbuilt',
key: 'unbuilt',
- width: 70,
+ width: 73.6,
align: 'center'
},
]
@@ -206,7 +206,7 @@ onMounted(() => {
.data-table-container {
padding: 0;
background: #fff;
- margin-top: 10px;
+ padding: 16px 0px;
}
.custom-table {
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 63d92ac..fafb4af 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -95,3 +95,13 @@ svg {
height: 98%;
position: relative;
}
+//滚动条统一样式
+::-webkit-scrollbar {
+ width: 8px;
+ height: 8px;
+}
+::-webkit-scrollbar-thumb {
+ border-radius: 4px;
+ background: #bbb;
+ -webkit-box-shadow: inset 0 0 6px #ddd;
+}
