diff --git a/src/assets/json/ying31.json b/src/assets/json/ying31.json index 19af403..44296d6 100644 --- a/src/assets/json/ying31.json +++ b/src/assets/json/ying31.json @@ -462,6 +462,79 @@ "adeg_e": "-0.000012", "adeg_b": "0.000000" }, + { + "sBeg": "PD102000011333527", + "Time": "-", + "Date": "-", + "sec_id": "SBID000000C09851AC198043C9B008AB0ACA1DECF9", + "Qci": "0.0", + "Flow_Direction_Flag": "1", + "Qi": "0.253131", + "V_b": "10.550000", + "Pi": "0.956303", + "Qj": "-0.253131", + "Qcj": "0.0", + "Pj": "-0.956303", + "sEnd": "PD102000001333526", + "V_e": "10.499998", + "adeg_e": "-0.000012", + "adeg_b": "0.000000" + }, + { + "sBeg": "PD102000011333527", + "Time": "-", + "Date": "-", + "sec_id": "SBID0000005D9109D2D9DC4CF0A019E5325DC690AB", + "Qci": "0.0", + "Flow_Direction_Flag": "1", + "Qi": "0.283131", + "V_b": "10.600000", + "Pi": "0.966303", + "Qj": "-0.283131", + "Qcj": "0.0", + "Pj": "-0.966303", + "sEnd": "PD102000001333526", + "V_e": "10.499998", + "adeg_e": "-0.000012", + "adeg_b": "0.000000" + }, + { + "sBeg": "PD102000011333527", + "Time": "-", + "Date": "-", + "sec_id": "SBID000000F05BC542CC9242519159F33D0562C2AC", + "Qci": "0.0", + "Flow_Direction_Flag": "1", + "Qi": "0.293131", + "V_b": "10.600000", + "Pi": "0.976303", + "Qj": "-0.293131", + "Qcj": "0.0", + "Pj": "-0.976303", + "sEnd": "PD102000001333526", + "V_e": "10.499998", + "adeg_e": "-0.000012", + "adeg_b": "0.000000" + }, + { + "sBeg": "PD102000011333527", + "Time": "-", + "Date": "-", + "sec_id": "SBID000000D87EE2A0923446238309C685B12CA67C", + "Qci": "0.0", + "Flow_Direction_Flag": "1", + "Qi": "0.303131", + "V_b": "10.600000", + "Pi": "0.996303", + "Qj": "-0.303131", + "Qcj": "0.0", + "Pj": "-0.986303", + "sEnd": "PD102000001333526", + "V_e": "10.499998", + "adeg_e": "-0.000012", + "adeg_b": "0.000000" + }, + { "sBeg": "PD102000001332807", "Time": "-", diff --git a/src/views/commonPage/3DPie.vue b/src/views/commonPage/3DPie.vue index f21a14f..c3cab5f 100644 --- a/src/views/commonPage/3DPie.vue +++ b/src/views/commonPage/3DPie.vue @@ -71,7 +71,7 @@ let handelColumnEcharts = () => { }, //设置饼图在容器中的位置(目前没发现啥用) - // center: ['50%', '100%'] + // center: ['20%', '100%'] }; //曲面的颜色、不透明度等样式。 @@ -152,31 +152,31 @@ let handelColumnEcharts = () => { // }); let option = { //图例组件 - legend: { - //图例列表的布局朝向。 - orient: props.threeDPieData.legend.orient, - right: props.threeDPieData.legend.right, - top: props.threeDPieData.legend.top, - //图例文字每项之间的间隔 - itemGap: props.threeDPieData.legend.itemGap, - show: true, - icon: "rect", - itemHeight: 10, - itemWidth: 10, - textStyle: { - //图例字体大小 - fontSize: transformFontSize(15), - color: "#FFFFFF", - lineHeight: 20, - }, - formatter: function (params) { - for (let i = 0; i < pieData.length; i++) { - if (pieData[i].name === params) { - return `${pieData[i].name} ${(pieData[i].value / props.threeDPieData.total*100).toFixed(0)}%` - } - } - } - }, + // legend: { + // //图例列表的布局朝向。 + // orient: props.threeDPieData.legend.orient, + // right: props.threeDPieData.legend.right, + // top: props.threeDPieData.legend.top, + // //图例文字每项之间的间隔 + // itemGap: props.threeDPieData.legend.itemGap, + // show: false, + // icon: "rect", + // itemHeight: 10, + // itemWidth: 10, + // textStyle: { + // //图例字体大小 + // fontSize: transformFontSize(15), + // color: "#FFFFFF", + // lineHeight: 20, + // }, + // formatter: function (params) { + // for (let i = 0; i < pieData.length; i++) { + // if (pieData[i].name === params) { + // return `${pieData[i].name} ${(pieData[i].value / props.threeDPieData.total*100).toFixed(0)}%` + // } + // } + // } + // }, //移动上去提示的文本内容 tooltip: { backgroundColor: "rgba(18, 55, 85, 0.8);", diff --git a/src/views/pages/OpticalStoragePage/index.vue b/src/views/pages/OpticalStoragePage/index.vue index 4dfc81e..0477e50 100644 --- a/src/views/pages/OpticalStoragePage/index.vue +++ b/src/views/pages/OpticalStoragePage/index.vue @@ -136,7 +136,7 @@ -->
-
+
@@ -740,6 +740,20 @@ let handleEnter = () => { }); }); }; +// svg入口事件 打开一个svg图 +let handleEnter2 = () => { + dialogVisible.value = true; + loadingFlag.value = true; + + nextTick(() => { + SVGContainer.value.innerHTML = testSvg as any; + draw = SVG(SVGContainer.value.getElementsByTagName("svg")[0]); + let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 }); + draw.size("100%", "100%"); + draw.zoom(0.6); + + }); +}; let handleShowSvg = async (svgIndex: string) => { // let setData = { id: svgIndex } // svgdApi(setData) @@ -1100,7 +1114,7 @@ let handleCustomLine = (svgHtml, result) => { text = draw .text( `P: ${(parseFloat(data["Pi"]) * 100).toFixed(4)} kW \nQ: ${( - parseFloat(data["Qi"]) * 100 + parseFloat(data["Qi"]) * 10 ).toFixed(4)} kVar \nV: ${parseFloat(data["V_b"]).toFixed( 4 )} kV \nI: ${( @@ -1142,9 +1156,9 @@ let handleCustomLine = (svgHtml, result) => { // 文本 draw .text( - `P: ${(parseFloat(data["Pload/phase"]) * 100).toFixed( + `P: ${(parseFloat(data["Pload/phase"]) * 8).toFixed( 4 - )} kW\nQ: ${(parseFloat(data["i"]) * 100).toFixed(4)} kVar` + )} kW\nQ: ${(parseFloat(data["i"]) * 8).toFixed(4)} kVar` ) .attr({ x: centerX - 100, @@ -1424,7 +1438,7 @@ let handleAnimate = async (result: any) => { )} kV \nI: ${( (parseFloat(data["Pi"]) * 100) / (parseFloat(data["V_b"]) * 1.732) - ).toFixed(4)} kV` + ).toFixed(4)} A` ) .attr({ x: x - 10, @@ -2541,6 +2555,7 @@ const styleVar = computed(() => { height: 100%; background: url("@/assets/images/osPage/rztp.png") no-repeat; background-size: 100% 100%; + cursor: pointer; } } diff --git a/src/views/pages/homePage/3Dechart.vue b/src/views/pages/homePage/3Dechart.vue index d14535a..cc68f16 100644 --- a/src/views/pages/homePage/3Dechart.vue +++ b/src/views/pages/homePage/3Dechart.vue @@ -181,7 +181,7 @@ export default { const optionsData = [ { name: "充电桩", - value: 4256, + value: 415, itemStyle: { // opacity: 0.5, color: "rgba(102, 235, 287, 1)", @@ -189,7 +189,7 @@ export default { }, { name: "空调", - value: 2356, + value: 4135, itemStyle: { // opacity: 0.5, color: "rgba(250, 179, 109, 1)", diff --git a/src/views/pages/homePage/index.vue b/src/views/pages/homePage/index.vue index 8e7b4f6..24ca10b 100644 --- a/src/views/pages/homePage/index.vue +++ b/src/views/pages/homePage/index.vue @@ -49,16 +49,22 @@
负荷户数比例
- - +
- -
-
光伏(
总装机容量:149.39MW
+
+
+ 光伏( +
总装机容量:149.39MW
+ ) +
+
负荷户数比例
- +
@@ -537,7 +546,10 @@
资源概况