diff --git a/.history/src/views/XQXY_20231208144150.vue b/.history/src/views/XQXY_20231208144150.vue new file mode 100644 index 0000000..9cbe87f --- /dev/null +++ b/.history/src/views/XQXY_20231208144150.vue @@ -0,0 +1,2065 @@ + + + diff --git a/.history/src/views/XQXY_20231208144213.vue b/.history/src/views/XQXY_20231208144213.vue new file mode 100644 index 0000000..0339588 --- /dev/null +++ b/.history/src/views/XQXY_20231208144213.vue @@ -0,0 +1,2071 @@ + + + diff --git a/.history/src/views/XQXY_20231208144216.vue b/.history/src/views/XQXY_20231208144216.vue new file mode 100644 index 0000000..3320de4 --- /dev/null +++ b/.history/src/views/XQXY_20231208144216.vue @@ -0,0 +1,2071 @@ + + + diff --git a/.history/src/views/XQXY_20231208144244.vue b/.history/src/views/XQXY_20231208144244.vue new file mode 100644 index 0000000..22ca387 --- /dev/null +++ b/.history/src/views/XQXY_20231208144244.vue @@ -0,0 +1,2071 @@ + + + diff --git a/.history/src/views/XQXY_20231208144302.vue b/.history/src/views/XQXY_20231208144302.vue new file mode 100644 index 0000000..c265e1f --- /dev/null +++ b/.history/src/views/XQXY_20231208144302.vue @@ -0,0 +1,2071 @@ + + + diff --git a/.history/src/views/XQXY_20231208144324.vue b/.history/src/views/XQXY_20231208144324.vue new file mode 100644 index 0000000..e0bc753 --- /dev/null +++ b/.history/src/views/XQXY_20231208144324.vue @@ -0,0 +1,2071 @@ + + + diff --git a/.history/src/views/XQXY_20231208144343.vue b/.history/src/views/XQXY_20231208144343.vue new file mode 100644 index 0000000..eb39b68 --- /dev/null +++ b/.history/src/views/XQXY_20231208144343.vue @@ -0,0 +1,2071 @@ + + + diff --git a/.history/src/views/XQXY_20231208144443.vue b/.history/src/views/XQXY_20231208144443.vue new file mode 100644 index 0000000..6f16e46 --- /dev/null +++ b/.history/src/views/XQXY_20231208144443.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144554.vue b/.history/src/views/XQXY_20231208144554.vue new file mode 100644 index 0000000..5b6fcbb --- /dev/null +++ b/.history/src/views/XQXY_20231208144554.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144609.vue b/.history/src/views/XQXY_20231208144609.vue new file mode 100644 index 0000000..462cc77 --- /dev/null +++ b/.history/src/views/XQXY_20231208144609.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144610.vue b/.history/src/views/XQXY_20231208144610.vue new file mode 100644 index 0000000..462cc77 --- /dev/null +++ b/.history/src/views/XQXY_20231208144610.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144645.vue b/.history/src/views/XQXY_20231208144645.vue new file mode 100644 index 0000000..ff8419d --- /dev/null +++ b/.history/src/views/XQXY_20231208144645.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144653.vue b/.history/src/views/XQXY_20231208144653.vue new file mode 100644 index 0000000..0de6e4e --- /dev/null +++ b/.history/src/views/XQXY_20231208144653.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144757.vue b/.history/src/views/XQXY_20231208144757.vue new file mode 100644 index 0000000..c5ad479 --- /dev/null +++ b/.history/src/views/XQXY_20231208144757.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144807.vue b/.history/src/views/XQXY_20231208144807.vue new file mode 100644 index 0000000..08385aa --- /dev/null +++ b/.history/src/views/XQXY_20231208144807.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144815.vue b/.history/src/views/XQXY_20231208144815.vue new file mode 100644 index 0000000..ae95f17 --- /dev/null +++ b/.history/src/views/XQXY_20231208144815.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144846.vue b/.history/src/views/XQXY_20231208144846.vue new file mode 100644 index 0000000..08cccf0 --- /dev/null +++ b/.history/src/views/XQXY_20231208144846.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144908.vue b/.history/src/views/XQXY_20231208144908.vue new file mode 100644 index 0000000..94f3233 --- /dev/null +++ b/.history/src/views/XQXY_20231208144908.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144914.vue b/.history/src/views/XQXY_20231208144914.vue new file mode 100644 index 0000000..a9eb991 --- /dev/null +++ b/.history/src/views/XQXY_20231208144914.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144920.vue b/.history/src/views/XQXY_20231208144920.vue new file mode 100644 index 0000000..451d96c --- /dev/null +++ b/.history/src/views/XQXY_20231208144920.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144940.vue b/.history/src/views/XQXY_20231208144940.vue new file mode 100644 index 0000000..4e42df1 --- /dev/null +++ b/.history/src/views/XQXY_20231208144940.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208144946.vue b/.history/src/views/XQXY_20231208144946.vue new file mode 100644 index 0000000..e436eab --- /dev/null +++ b/.history/src/views/XQXY_20231208144946.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208145010.vue b/.history/src/views/XQXY_20231208145010.vue new file mode 100644 index 0000000..e436eab --- /dev/null +++ b/.history/src/views/XQXY_20231208145010.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208145056.vue b/.history/src/views/XQXY_20231208145056.vue new file mode 100644 index 0000000..e436eab --- /dev/null +++ b/.history/src/views/XQXY_20231208145056.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208150539.vue b/.history/src/views/XQXY_20231208150539.vue new file mode 100644 index 0000000..0355051 --- /dev/null +++ b/.history/src/views/XQXY_20231208150539.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208150646.vue b/.history/src/views/XQXY_20231208150646.vue new file mode 100644 index 0000000..a32ddef --- /dev/null +++ b/.history/src/views/XQXY_20231208150646.vue @@ -0,0 +1,2020 @@ + + + diff --git a/.history/src/views/XQXY_20231208150653.vue b/.history/src/views/XQXY_20231208150653.vue new file mode 100644 index 0000000..0355051 --- /dev/null +++ b/.history/src/views/XQXY_20231208150653.vue @@ -0,0 +1,2020 @@ + + + diff --git a/src/views/XQXY.vue b/src/views/XQXY.vue index b8c91e3..a131945 100644 --- a/src/views/XQXY.vue +++ b/src/views/XQXY.vue @@ -10,7 +10,7 @@
-

省综代理用户情况

+

代理用户情况

2,356

@@ -27,7 +27,7 @@
-

年度售电量

+

申报响应量情况

520万KW

@@ -465,7 +465,7 @@ export default { grid: { top: "15%", right: "5%", - left: "8%", + left: "12%", bottom: "13%", }, xAxis: [ @@ -481,11 +481,12 @@ export default { }, formatter: "", }, - // splitLine: { - // lineStyle: { - // color: 'rgba(255,255,255,0.12)' - // } - // } + splitLine: { + show:false, + lineStyle: { + color: "rgba(255,255,255,0.12)", + }, + }, }, ], yAxis: [ @@ -508,6 +509,12 @@ export default { axisTick: { show: false, }, + splitLine: { + show:true, + lineStyle: { + color: "rgba(255,255,255,0.12)", + }, + }, }, ], series: [ @@ -545,7 +552,7 @@ export default { show: true, lineHeight: 10, formatter: "{c}", - position: "top", + position: "right", textStyle: { color: "#fff", fontSize: "0.0625rem", @@ -587,7 +594,7 @@ export default { show: true, lineHeight: 10, formatter: "{c}", - position: "top", + position: "right", textStyle: { color: "#fff", fontSize: "0.0625rem", @@ -599,8 +606,8 @@ export default { legend: { x: "right", right: 50, - itemWidth:16, - itemHeight:4, + itemWidth: 16, + itemHeight: 4, data: [ { icon: "roundRect", @@ -623,10 +630,10 @@ export default { // trigger: "axis", // }, grid: { - left: "5%", + left: "10%", right: "5%", bottom: "20%", - top:"22%" + top: "22%", // containLabel: true }, // toolbox: { @@ -639,18 +646,18 @@ export default { // boundaryGap: false, data: ["2019", "2020", "2021"], axisLine: { - lineStyle: { - color: "#FFFFFF", - }, - }, - axisTick: { - show: false, + lineStyle: { + color: "#FFFFFF", }, + }, + axisTick: { + show: false, + }, axisLabel: { textStyle: { fontSize: "0.0729rem", - }, - fontSize: "0.0729rem", + }, + fontSize: "0.0729rem", color: "#fff", margin: 15, }, @@ -682,22 +689,22 @@ export default { }, }, legend: { - itemWidth:16, - itemHeight:4, + itemWidth: 16, + itemHeight: 4, data: [ { - icon:"rect", + icon: "rect", name: "削锋", }, { - icon:"rect", + icon: "rect", name: "填谷", }, ], x: "right", y: "top", - right:100, - top:0, + right: 100, + top: 0, textStyle: { color: "#fff", fontSize: "0.0625rem", @@ -837,25 +844,25 @@ export default { bottom: "20%", // 调整饼状图的下边距 }, title: { - text: "{percents|" + "85.2%" + "}\n{val|" +"工业" + "}", + text: "{percents|" + "85.2%" + "}\n{val|" + "工业" + "}", left: "16%", top: "40%", textStyle: { color: "#fff", - rich:{ - percents:{ + rich: { + percents: { fontSize: "0.0729rem", - align:"center", - fontWeight:700, - lineHeight:28, - color:"#fff", + align: "center", + fontWeight: 700, + lineHeight: 28, + color: "#fff", }, - val:{ - fontSize:"0.0625rem", - align:"center", - color:"#fff", - } - } + val: { + fontSize: "0.0625rem", + align: "center", + color: "#fff", + }, + }, }, }, legend: { @@ -872,7 +879,7 @@ export default { console.log(item); percent = ((item.value / total) * 100).toFixed(2); if (name !== "") { - return `{name|${name}}` + "\t" + "\t" + `{num|${percent}}{num|%}`; + return `{name|${name}}` + "\t" + "\t" + `{num|${percent}}\t\t{name|%}`; // return `{name|${name}` + `{num|${percent}}{name|kWh}`; } else { return ""; @@ -888,7 +895,7 @@ export default { icon: "rect", }, ], - right: 20, + left: 180, top: 60, orient: "vertical", align: "left", @@ -958,25 +965,25 @@ export default { bottom: "20%", // 调整饼状图的下边距 }, title: { - text: "{percents|" + "85.2%" + "}\n{val|" +"削锋" + "}", + text: "{percents|" + "85.2%" + "}\n{val|" + "削锋" + "}", left: "16%", top: "40%", textStyle: { color: "#fff", - rich:{ - percents:{ + rich: { + percents: { fontSize: "0.0729rem", - align:"center", - fontWeight:700, - lineHeight:28, - color:"#fff", + align: "center", + fontWeight: 700, + lineHeight: 28, + color: "#fff", }, - val:{ - fontSize:"0.0625rem", - align:"center", - color:"#fff", - } - } + val: { + fontSize: "0.0625rem", + align: "center", + color: "#fff", + }, + }, }, }, legend: { @@ -993,7 +1000,7 @@ export default { console.log(item); percent = ((item.value / total) * 100).toFixed(2); if (name !== "") { - return `{name|${name}}` + "\t" + "\t" + `{num|${percent}}{num|%}`; + return `{name|${name}}` + "\t" + "\t" + `{num|${percent}}\t\t{name|%}`; // return `{name|${name}` + `{num|${percent}}{name|kWh}`; } else { return ""; @@ -1009,7 +1016,7 @@ export default { icon: "rect", }, ], - right: 20, + left: 180, top: 60, orient: "vertical", align: "left", @@ -1311,57 +1318,6 @@ export default { window.addEventListener("resize", function () { myChart.resize(); }); - // var selectedPro = param.name; - // if (!cityProper[selectedPro]) { - // option.series.splice(1); - // option.legend = null; - // option.visualMap = null; - // myChart.setOption(option, true); - // return; - // } - //获取点击区域数据 - // $.get(cityProper[selectedPro], function (geojson) { - // echarts.registerMap(selectedPro, geojson); - // //根据需求,如果要替换青岛地图,series参数为[0],不替换为[1],其中left、top自己设置。 - // option.series[0] = { - // name: "", - // type: "map", - // map: selectedPro, - // boxDepth: 80, //地图倾斜度 - // regionHeight: 5, //地图厚度 - // itemStyle: { - // normal: { - // label: { - // show: true, - // }, - // }, - // emphasis: { - // label: { - // show: true, - // }, - // }, - // }, - // groundplane: { - // show: false, - // }, - // data: data, - // shading: "realistic", - // // 真实感材质相关配置 shading: 'realistic'时有效 - // realisticMaterial: { - // detailTexture: "#fff", // 纹理贴图 - // textureTiling: 1, // 纹理平铺,1是拉伸,数字表示纹理平铺次数 - // roughness: 0, // 材质粗糙度,0完全光滑,1完全粗糙 - // metalness: 0, // 0材质是非金属 ,1金属 - // roughnessAdjust: 0, - // }, - // viewControl: { - // distance: 30, // 地图视角 控制初始大小 - // rotateSensitivity: 1, // 旋转 - // zoomSensitivity: 1, // 缩放 - // }, - // }; - // myChart.setOption(option); - // }); } } registerMap(); @@ -1413,20 +1369,19 @@ export default { background-size: cover; text-align: center; p { - width: 627px; - height: 47px; - font-size: 44px; - font-family: " Alibaba PuHuiTi" 2, " Alibaba PuHuiTi" 20; - font-weight: 600; - text-align: center; - line-height: 47px; - letter-spacing: 3px; - color: #fff; - margin-left: 490px; - // margin-left: -50px; + width: 627px; + height: 47px; + font-size: 44px; + font-family: " Alibaba PuHuiTi" 2, " Alibaba PuHuiTi" 20; + font-weight: 600; + text-align: center; + line-height: 47px; + letter-spacing: 3px; + color: #fff; + margin-left: 490px; + // margin-left: -50px; + } } - } - img:nth-of-type(1) { width: 231px; @@ -2053,13 +2008,13 @@ export default { } #map { width: 994px; - position: absolute; - height: 627px; - background: url(../assets/客户侧总体用能情况分析/背景.png); - background-size: cover; - left: 50%; - transform: translateX(-50%); - overflow: hidden; + position: absolute; + height: 627px; + background: url(../assets/客户侧总体用能情况分析/背景.png); + background-size: cover; + left: 50%; + transform: translateX(-50%); + overflow: hidden; } }