diff --git a/dist.zip b/dist.zip index 7caa40c..2b21263 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/views/commonPage/3DPie.vue b/src/views/commonPage/3DPie.vue index c3cab5f..a65133d 100644 --- a/src/views/commonPage/3DPie.vue +++ b/src/views/commonPage/3DPie.vue @@ -1,8 +1,8 @@ \ No newline at end of file +#myCanvas { + width: 450px; + height: 300px; + border: 1px solid red; +} + diff --git a/src/views/pages/homePage/index.vue b/src/views/pages/homePage/index.vue index 24ca10b..d0a16c5 100644 --- a/src/views/pages/homePage/index.vue +++ b/src/views/pages/homePage/index.vue @@ -49,10 +49,10 @@
负荷户数比例
- + >
@@ -163,12 +163,12 @@

可调负荷

-
负荷户数比例
+
充电桩户数比例
- +
@@ -1073,12 +1073,12 @@ const getStatInfo = async () => { // 资源总览 // 荷 interface leftDataInfo { - businessValue: string, - residentValue: string, - tableData: tableInfo1[][] - tableData1: tableInfo1[][], - threeDPieData: any - threeDPieData1:any + businessValue: string; + residentValue: string; + tableData: tableInfo1[][]; + tableData1: tableInfo1[][]; + threeDPieData: any; + threeDPieData1: any; } interface tableInfo1 { index: string; @@ -1089,113 +1089,106 @@ interface tableInfo1 { } let show = ref(true); let leftData = reactive({ - businessValue: '0', - residentValue: '0', + businessValue: "0", + residentValue: "0", tableData: [], tableData1: [], // 3d饼图数据 threeDPieData: { pieData: [ { - name: "谷段", //名称 - value: 10, //值 + name: "35kV", //名称 + value: 3, //值 itemStyle: { - color: "#EE5944",//半透明 + color: "#EE5944", //半透明 232 158 205 + // color: "rgba(250,189,101,.8)",//半透明 232 158 205 }, }, { - name: "高峰", - value: 20, - itemStyle: { - color: "#2E53F5", - }, - }, - { - name: "尖峰", - value: 40, + name: "10kV", + value: 5, itemStyle: { + // color: "#2E53F5", color: "#F1BA50", }, }, { - name: "平段", - value: 40, + name: "0.4kV", + value: 393, itemStyle: { - color: "#6FFBF7", + // color: "#F1BA50", + color: "#2E53F5", }, - } + }, ], total: 108, - center: 0.9, // 是否圆环 + center: 0.85, // 是否圆环 legend: { - show:false, - orient: 'horizontal', - left: 'center', - top: '-3%', - itemGap: 20 + // show:false, + orient: "horizontal", + show: false, + left: "center", + top: "10%", + itemGap: 1990, }, grid3D: { viewControl: { - distance: 350, // 缩放视角 - alpha: 45, // 角度 - } + distance: 250, // 缩放视角 + alpha: 45, // 角度 + }, }, - // radius: ["40%", "40%"], - // center: ["50%", "50%"], - getHeight3D: 40, // 高度 + getHeight3D: 20, // 高度 }, // 3d饼图数据1 threeDPieData1: { pieData: [ { - name: "谷段", //名称 + name: "居民充电桩", //名称 value: 10, //值 itemStyle: { - color: "#EE5944",//半透明 + color: "#EE5944", //半透明 232 158 205 + // color: "rgba(250,189,101,.8)",//半透明 232 158 205 }, }, { - name: "高峰", + name: "商业充电桩", value: 20, itemStyle: { color: "#2E53F5", }, }, { - name: "尖峰", + name: "V2G充电桩", value: 40, itemStyle: { color: "#F1BA50", }, }, - { - name: "平段", - value: 40, - itemStyle: { - color: "#6FFBF7", - }, - } ], total: 108, - center: 0.9, // 是否圆环 + center: 0.85, // 是否圆环 legend: { + // show:false, + show: false, //工具栏不展示 + tooltip: { + show: true, + }, + orient: "horizontal", - orient: 'horizontal', - left: 'center', - top: '-30%', - itemGap: 20 + left: "center", + + top: "2%", + itemGap: 1990, }, grid3D: { viewControl: { - distance: 350, // 缩放视角 - alpha: 45, // 角度 - } + distance: 250, // 缩放视角 + alpha: 35, // 角度 + }, }, - // radius: ["40%", "40%"], - // center: ["50%", "50%"], - getHeight3D: 40, // 高度 - } -}) + getHeight3D: 30, // 高度 + }, +}); // 网 // 网盒子得标识 let networkContentFlag = ref(true); @@ -1870,6 +1863,12 @@ const styleVar = computed(() => { top: changeHeight(-20); width: changeWidth(506.97); height: changeHeight(325.41); + left: changeHeight(-200); + top: changeHeight(-120); + width: changeWidth(506.97); + height: changeHeight(325.41); + width: changeWidth(1006.97); + height: changeHeight(625.41); } } } @@ -1995,10 +1994,12 @@ const styleVar = computed(() => { } .echarts { position: absolute; - left: changeHeight(-100); - top: changeHeight(-20); + left: changeHeight(-220); + top: changeHeight(-120); width: changeWidth(506.97); height: changeHeight(325.41); + width: changeWidth(1006.97); + height: changeHeight(625.41); } } }