|
|
@@ -19,7 +19,7 @@
|
|
|
</div>
|
|
|
<div
|
|
|
class="position"
|
|
|
- :style="`${getCalcFontSize(16)}`"
|
|
|
+ :style="`${getCalcFontSize(20)}`"
|
|
|
v-if="currents == 0"
|
|
|
>
|
|
|
<div class="position-icon svg-icon svg-icon-green">
|
|
|
@@ -35,7 +35,7 @@
|
|
|
)
|
|
|
"
|
|
|
class="position"
|
|
|
- :style="`${getCalcFontSize(16)};cursor:pointer`"
|
|
|
+ :style="`${getCalcFontSize(20)};cursor:pointer`"
|
|
|
v-else
|
|
|
>
|
|
|
<div class="position-icon svg-icon svg-icon-green">
|
|
|
@@ -233,8 +233,8 @@
|
|
|
<div class="jnjp-count">
|
|
|
<div class="jnjp-fd jnjp">
|
|
|
<div class="jnjp-title">
|
|
|
- <span class="text">节能减排</span>
|
|
|
- <span class="unit">万吨</span>
|
|
|
+ <span class="text" :style="`${getCalcFontSize(16)}`">节能减排</span>
|
|
|
+ <span class="unit" :style="`${getCalcFontSize(16)}`">万吨</span>
|
|
|
</div>
|
|
|
<div class="jnjp-content">
|
|
|
<div class="jnjp-item">
|
|
|
@@ -309,8 +309,8 @@
|
|
|
</div>
|
|
|
<div class="jnjp-gf jnjp">
|
|
|
<div class="jnjp-title">
|
|
|
- <span class="text">节能减排</span>
|
|
|
- <span class="unit">万吨</span>
|
|
|
+ <span class="text" :style="`${getCalcFontSize(16)}`">节能减排</span>
|
|
|
+ <span class="unit" :style="`${getCalcFontSize(16)}`">万吨</span>
|
|
|
</div>
|
|
|
<div class="jnjp-content">
|
|
|
<div class="jnjp-item">
|
|
|
@@ -821,12 +821,13 @@
|
|
|
:showTitle="false"
|
|
|
:CurveValues="CurveValues"
|
|
|
width="100%"
|
|
|
- height="10.926vh"
|
|
|
+ height="18.519vh"
|
|
|
:unit="'MW'"
|
|
|
:ratio="1000"
|
|
|
:id="'cut-power'"
|
|
|
:orient="'horizontal'"
|
|
|
/>
|
|
|
+ <!-- 200px -->
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 实时负荷/关键指标弹窗 -->
|
|
|
@@ -956,17 +957,49 @@
|
|
|
/>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <!-- 单场站点击弹窗 -->
|
|
|
+ <el-dialog
|
|
|
+ custom-class="windDialogs"
|
|
|
+ width="85%"
|
|
|
+ top="40px"
|
|
|
+ v-model="windDialogFlag"
|
|
|
+ :show-close="true"
|
|
|
+ destroy-on-close
|
|
|
+ @close="
|
|
|
+ backMap(
|
|
|
+ stationList[currents - 1]?.wpId,
|
|
|
+ stationList[currents - 1]?.name
|
|
|
+ )
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <template #title>
|
|
|
+ <div class="dialog-title">
|
|
|
+ <div class="title">{{ showName }}</div>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <div class="dialog-body" style="height: 900px">
|
|
|
+ <img class="dialog-img" src="@assets/imgs/dialog.png" />
|
|
|
+ <windDialog ref="windDialog" :wpId="wpId" v-if="wpId.includes('FDC')" />
|
|
|
+ <lightDialog
|
|
|
+ ref="lightDialog"
|
|
|
+ :wpId="wpId"
|
|
|
+ v-if="wpId.includes('GDC')"
|
|
|
+ />
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+import windDialog from "./windDialog.vue";
|
|
|
+import lightDialog from "./lightDialog.vue";
|
|
|
import dashPieChartVue from "./dash-pie-chart.vue";
|
|
|
import Row from "@/components/coms/grid/row.vue";
|
|
|
import Col from "@/components/coms/grid/col.vue";
|
|
|
import GjzbPieChart from "./gjzb-pie-chart.vue";
|
|
|
import ListBarChart2Home from "./list-bar-chart2-home.vue";
|
|
|
//全国地图总览
|
|
|
-import SvgMapNX from "./svg-map-nx.vue";
|
|
|
+import SvgMapNX from "../map/svg-map-nx.vue";
|
|
|
// 山西
|
|
|
import SX from "../map/SX.vue";
|
|
|
import PowerEcharts from "./powerEcharts.vue";
|
|
|
@@ -991,6 +1024,8 @@ export default {
|
|
|
name: "Map",
|
|
|
// 使用组件
|
|
|
components: {
|
|
|
+ windDialog,
|
|
|
+ lightDialog,
|
|
|
dashPieChartVue,
|
|
|
SvgMapNX,
|
|
|
SX,
|
|
|
@@ -1140,6 +1175,7 @@ export default {
|
|
|
baseSWidth: 3291,
|
|
|
baseSHeight: 1080,
|
|
|
baseFontSizeFixNum: 4,
|
|
|
+ windDialogFlag: false, //单场站弹窗开关
|
|
|
};
|
|
|
},
|
|
|
emits: {
|
|
|
@@ -1796,19 +1832,24 @@ export default {
|
|
|
: this.companyname
|
|
|
? this.companyname
|
|
|
: planBtnName;
|
|
|
- this.mapClick(this.wpId, this.activeTab);
|
|
|
- if (wpId.includes("FDC") || wpId.includes("GDC")) {
|
|
|
- this.tabShow = wpId.includes("FDC")
|
|
|
- ? -1
|
|
|
- : wpId.includes("GDC")
|
|
|
- ? -2
|
|
|
- : 0;
|
|
|
- } else {
|
|
|
- this.tabShow = this.activeTab;
|
|
|
- }
|
|
|
+ if (penetrateType <= 3) {
|
|
|
+ this.mapClick(this.wpId, this.activeTab);
|
|
|
+ if (wpId.includes("FDC") || wpId.includes("GDC")) {
|
|
|
+ this.tabShow = wpId.includes("FDC")
|
|
|
+ ? -1
|
|
|
+ : wpId.includes("GDC")
|
|
|
+ ? -2
|
|
|
+ : 0;
|
|
|
+ } else {
|
|
|
+ this.tabShow = this.activeTab;
|
|
|
+ }
|
|
|
|
|
|
- this.flag = wpId.includes("FDC") || wpId.includes("GDC") ? true : false;
|
|
|
- this.currentActiveTab(penetrateType);
|
|
|
+ this.flag = wpId.includes("FDC") || wpId.includes("GDC") ? true : false;
|
|
|
+ this.currentActiveTab(penetrateType);
|
|
|
+ } else if (penetrateType == 4) {
|
|
|
+ this.windDialogFlag = true;
|
|
|
+ this.showName = planBtnName;
|
|
|
+ }
|
|
|
},
|
|
|
// 全国实时负荷点击弹窗
|
|
|
showPowerChart({ dialogTitle, data, chartName = "", unit, type }) {
|
|
|
@@ -2180,8 +2221,19 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
-
|
|
|
-<style lang="less" scoped>
|
|
|
+<style lang="less">
|
|
|
+.windDialogs {
|
|
|
+ .el-dialog__body {
|
|
|
+ padding: 10px 15px !important;
|
|
|
+ height: calc(100% - 64px);
|
|
|
+ .dialog-body {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+</style>
|
|
|
+<style scoped lang="less">
|
|
|
// ul,
|
|
|
// ul li,
|
|
|
// p {
|
|
|
@@ -2533,7 +2585,8 @@ export default {
|
|
|
.right-content {
|
|
|
position: absolute;
|
|
|
padding-right: 0.91vw; //30px
|
|
|
- padding-top: 14.35vh; //155px
|
|
|
+ // padding-top: 14.35vh; //155px
|
|
|
+ padding-top: 9.259vh; //100px
|
|
|
z-index: 4;
|
|
|
right: 0;
|
|
|
top: 0;
|
|
|
@@ -2797,11 +2850,11 @@ export default {
|
|
|
.power-chart {
|
|
|
margin-top: 1.852vh; //20
|
|
|
width: 26.922vw; //886
|
|
|
- height: 15.278vh; //165
|
|
|
+ height: 22.963vh; //248
|
|
|
background: rgba(0, 0, 0, 0.4);
|
|
|
padding: 0 0.456vw; //15
|
|
|
.power-title {
|
|
|
- padding: 1.481vh 0 1.296vh 0; //16 14
|
|
|
+ padding: 1.111vh 0 1.111vh 0; //16 14
|
|
|
border-bottom: 1px solid rgba(163, 164, 166, 0.2);
|
|
|
}
|
|
|
}
|
baiyanting