首页山西地图位置修改，弹窗接口参数修改

src/views/Home/components/home/index.vue

@@ -243,7 +243,11 @@
               </div>
               <div class="jnjp-value" :style="`${getCalcFontSize(14)}`">
                 {{
-                  Number(Number(StationinformationData?.qt?.fdjym)).toFixed(2)
+                  wpId.includes("FDC")
+                    ? Number(Number(StationinformationData?.qt?.jym)).toFixed(2)
+                    : Number(Number(StationinformationData?.qt?.fdjym)).toFixed(
+                        2
+                      )
                 }}
               </div>
               <div class="jnjp-name" :style="`${getCalcFontSize(12)}`">煤</div>
@@ -254,7 +258,11 @@
               </div>
               <div class="jnjp-value" :style="`${getCalcFontSize(14)}`">
                 {{
-                  Number(Number(StationinformationData?.qt?.fdjys)).toFixed(2)
+                  wpId.includes("FDC")
+                    ? Number(Number(StationinformationData?.qt?.jys)).toFixed(2)
+                    : Number(Number(StationinformationData?.qt?.fdjys)).toFixed(
+                        2
+                      )
                 }}
               </div>
               <div class="jnjp-name" :style="`${getCalcFontSize(12)}`">水</div>
@@ -267,7 +275,11 @@
               <!-- </div> -->
               <div class="jnjp-value" :style="`${getCalcFontSize(14)}`">
                 {{
-                  Number(Number(StationinformationData?.qt?.fdco2)).toFixed(2)
+                  wpId.includes("FDC")
+                    ? Number(Number(StationinformationData?.qt?.co2)).toFixed(2)
+                    : Number(Number(StationinformationData?.qt?.fdco2)).toFixed(
+                        2
+                      )
                 }}
               </div>
               <div class="jnjp-name" :style="`${getCalcFontSize(12)}`">
@@ -282,7 +294,11 @@
               <!-- </div> -->
               <div class="jnjp-value" :style="`${getCalcFontSize(14)}`">
                 {{
-                  Number(Number(StationinformationData?.qt?.fdso2)).toFixed(2)
+                  wpId.includes("FDC")
+                    ? Number(Number(StationinformationData?.qt?.so2)).toFixed(2)
+                    : Number(Number(StationinformationData?.qt?.fdso2)).toFixed(
+                        2
+                      )
                 }}
               </div>
               <div class="jnjp-name" :style="`${getCalcFontSize(12)}`">
@@ -303,7 +319,11 @@
               </div>
               <div class="jnjp-value" :style="`${getCalcFontSize(14)}`">
                 {{
-                  Number(Number(StationinformationData?.qt?.gfjym)).toFixed(2)
+                  wpId.includes("GDC")
+                    ? Number(Number(StationinformationData?.qt?.jym)).toFixed(2)
+                    : Number(Number(StationinformationData?.qt?.gfjym)).toFixed(
+                        2
+                      )
                 }}
               </div>
               <div class="jnjp-name" :style="`${getCalcFontSize(12)}`">煤</div>
@@ -314,7 +334,11 @@
               </div>
               <div class="jnjp-value" :style="`${getCalcFontSize(14)}`">
                 {{
-                  Number(Number(StationinformationData?.qt?.gfjys)).toFixed(2)
+                  wpId.includes("GDC")
+                    ? Number(Number(StationinformationData?.qt?.jys)).toFixed(2)
+                    : Number(Number(StationinformationData?.qt?.gfjys)).toFixed(
+                        2
+                      )
                 }}
               </div>
               <div class="jnjp-name" :style="`${getCalcFontSize(12)}`">水</div>
@@ -327,7 +351,11 @@
               <!-- </div> -->
               <div class="jnjp-value" :style="`${getCalcFontSize(14)}`">
                 {{
-                  Number(Number(StationinformationData?.qt?.gfco2)).toFixed(2)
+                  wpId.includes("GDC")
+                    ? Number(Number(StationinformationData?.qt?.co2)).toFixed(2)
+                    : Number(Number(StationinformationData?.qt?.gfco2)).toFixed(
+                        2
+                      )
                 }}
               </div>
               <div class="jnjp-name" :style="`${getCalcFontSize(12)}`">
@@ -342,7 +370,11 @@
               <!-- </div> -->
               <div class="jnjp-value" :style="`${getCalcFontSize(14)}`">
                 {{
-                  Number(Number(StationinformationData?.qt?.gfso2)).toFixed(2)
+                  wpId.includes("GDC")
+                    ? Number(Number(StationinformationData?.qt?.so2)).toFixed(2)
+                    : Number(Number(StationinformationData?.qt?.gfso2)).toFixed(
+                        2
+                      )
                 }}
               </div>
               <div class="jnjp-name" :style="`${getCalcFontSize(12)}`">
@@ -446,19 +478,11 @@
                   <i :style="`${getCalcFontSize(12)}`" class="unit">台</i>
                 </div>
               </div>
-              <div
-                v-if="
-                  !(
-                    wpId.includes('FDC') ||
-                    wpId.includes('GC') ||
-                    wpId.includes('GDC')
-                  )
-                "
-                :style="`${getCalcFontSize(14)}`"
-                class="info-nums"
-              >
+              <div :style="`${getCalcFontSize(14)}`" class="info-nums">
                 场站<text class="nums" :style="`${getCalcFontSize(20)}`">{{
-                  StationinformationData?.cblpoint?.jr_fcts
+                  wpId.includes("FDC")
+                    ? 1
+                    : StationinformationData?.cblpoint?.jr_fcts
                 }}</text>
                 <i :style="`${getCalcFontSize(12)}`" class="unit">个</i>
               </div>
@@ -593,15 +617,19 @@
             >
               <span :style="`${getCalcFontSize(14)}`">月利用小时</span>
               <span :style="`${getCalcFontSize(18)}`" class="lyxs-value">{{
-                StationinformationData?.qt?.fdylyxs?.toFixed(2) || 0
+                wpId.includes("FDC")
+                  ? StationinformationData?.qt?.ylyxs?.toFixed(2) || 0
+                  : StationinformationData?.qt?.fdylyxs?.toFixed(2) || 0
               }}</span>
               <span :style="`${getCalcFontSize(12)}`" class="lyxs-unit">h</span>
             </div>
             <div class="border"></div>
-            <div class="nlyxs">
+            <div class="nlyxs" @click="handleUsingDetail('year', '年利用小时')">
               <span :style="`${getCalcFontSize(14)}`">年利用小时</span>
               <span :style="`${getCalcFontSize(18)}`" class="lyxs-value">{{
-                StationinformationData?.qt?.fdnlyxs?.toFixed(2) || 0
+                wpId.includes("FDC")
+                  ? StationinformationData?.qt?.nlyxs?.toFixed(2) || 0
+                  : StationinformationData?.qt?.fdnlyxs?.toFixed(2) || 0
               }}</span>
               <span :style="`${getCalcFontSize(12)}`" class="lyxs-unit">h</span>
             </div>
@@ -629,7 +657,9 @@
               </div>
               <div :style="`${getCalcFontSize(14)}`" class="info-nums">
                 电站<text class="nums" :style="`${getCalcFontSize(20)}`">{{
-                  StationinformationData?.cblpoint?.jr_gfts
+                  wpId.includes("GDC")
+                    ? 1
+                    : StationinformationData?.cblpoint?.jr_gfts
                 }}</text>
                 <i :style="`${getCalcFontSize(12)}`" class="unit">个</i>
               </div>
@@ -758,18 +788,25 @@
             </div>
           </div>
           <div class="jrts-bottom">
-            <div class="ylyxs">
+            <div
+              class="ylyxs"
+              @click="handleUsingDetail('month', '月利用小时')"
+            >
               <span :style="`${getCalcFontSize(14)}`">月利用小时</span>
               <span :style="`${getCalcFontSize(18)}`" class="lyxs-value">{{
-                StationinformationData?.qt?.gfylyxs?.toFixed(2) || 0
+                wpId.includes("GDC")
+                  ? StationinformationData?.qt?.ylyxs?.toFixed(2) || 0
+                  : StationinformationData?.qt?.gfylyxs?.toFixed(2) || 0
               }}</span>
               <span :style="`${getCalcFontSize(12)}`" class="lyxs-unit">h</span>
             </div>
             <div class="border"></div>
-            <div class="nlyxs">
+            <div class="nlyxs" @click="handleUsingDetail('year', '年利用小时')">
               <span :style="`${getCalcFontSize(14)}`">年利用小时</span>
               <span :style="`${getCalcFontSize(18)}`" class="lyxs-value">{{
-                StationinformationData?.qt?.gfnlyxs?.toFixed(2) || 0
+                wpId.includes("GDC")
+                  ? StationinformationData?.qt?.nlyxs?.toFixed(2) || 0
+                  : StationinformationData?.qt?.gfnlyxs?.toFixed(2) || 0
               }}</span>
               <span :style="`${getCalcFontSize(12)}`" class="lyxs-unit">h</span>
             </div>
@@ -1889,16 +1926,13 @@ export default {
     },
     handleElectricDetail(timetype, title, type) {
       let wpId = "";
-      if (type) {
-        this.type = type;
-        type == "fc" ? (wpId = this.wpId + "-1") : (wpId = this.wpId + "-2");
-      } else {
-        wpId =
-          this.wpId +
-          (this.wpId.includes("FDC") || this.wpId.includes("GDC")
-            ? ""
-            : this.activeTab);
-      }
+
+      wpId =
+        this.wpId +
+        (this.wpId.includes("FDC") || this.wpId.includes("GDC")
+          ? ""
+          : this.activeTab);
+
       this.dialogElectric = true;
       let format =
         timetype == "day" ? "MM-DD" : timetype == "month" ? "YYYY-MM" : "YYYY";
@@ -2741,7 +2775,7 @@ export default {
             display: flex;
             justify-content: space-around;
             align-items: center;
-
+            cursor: pointer;
             .lyxs-value {
               font-family: Bicubik;
               color: #05bb4c;

src/views/Home/components/map/SX.vue

@@ -1509,10 +1509,10 @@ export default {
       svgLeft: 0,
       svgWidth: "100%",
       svgHeight: "100%",
-      offsetX: 100,
-      offsetY: -100,
-      scaleX: 0.1,
-      scaleY: 0.1,
+      offsetX: -10,
+      offsetY: 16,
+      scaleX: 0.7,
+      scaleY: 1.3,
     };
   },
   // 函数