Parcourir la source

新增埃肯光伏电站相关功能

SunZehao il y a 2 ans
Parent
commit
cb3bce7707

+ 13 - 2
src/views/Home/components/map.vue

@@ -177,12 +177,20 @@
       ></MCHGDC>
 
       <!-- 大武口 -->
-      <DWKGDC
+      <!-- <DWKGDC
         v-if="mapName === 'DWK_GDC'"
         :data="sourceMap"
         @clickFj="clickFj"
         @changePeriod="changePeriod"
-      ></DWKGDC>
+      ></DWKGDC> -->
+
+      <!-- 埃肯 -->
+      <AKGDC
+        v-if="mapName === 'AK_GDC'"
+        :data="sourceMap"
+        @clickFj="clickFj"
+        @changePeriod="changePeriod"
+      ></AKGDC>
 
       <!-- 平罗 -->
       <PLGDC
@@ -230,6 +238,8 @@ import SBQFDC from "./map/SBQ_FDC.vue";
 import MCHGDC from "./map/MCH_GDC.vue";
 // 大武口
 import DWKGDC from "./map/DWK_GDC.vue";
+// 埃肯
+import AKGDC from "./map/AK_GDC.vue";
 // 平罗
 import PLGDC from "./map/PL_GDC.vue";
 // 宣和
@@ -251,6 +261,7 @@ export default {
     SBQFDC,
     MCHGDC,
     DWKGDC,
+    AKGDC,
     PLGDC,
     XHGDC,
     HZJGDC,

Fichier diff supprimé car celui-ci est trop grand
+ 319 - 0
src/views/Home/components/map/AK_GDC.vue


+ 91 - 16
src/views/Home/components/map/svg-map-nx.vue

@@ -334,11 +334,11 @@
             @mouseover="mouseover(4)"
             @mouseout="mouseout"
           >
-            <use xlink:href="#nx-map-line-1" x="550" y="15" />
-            <use xlink:href="#nx-map-circle-1" x="550" y="-5" />
+            <use xlink:href="#nx-map-line-1" x="540" y="15" />
+            <use xlink:href="#nx-map-circle-1" x="540" y="-5" />
             <!-- +25 -5 -->
             <rect
-              x="575"
+              x="455"
               y="15"
               width="110"
               height="18"
@@ -347,17 +347,45 @@
               opacity="0.8"
             />
             <!-- +5 +14 -->
-            <text class="mapKey" x="580" y="29" fill="#919697" font-size="12">
+            <text class="mapKey" x="460" y="29" fill="#919697" font-size="12">
               大武口
             </text>
             <!-- +70 0 -->
-            <text class="mapValue" x="640" y="29" fill="#05bb4c" font-size="12">
+            <text class="mapValue" x="530" y="29" fill="#05bb4c" font-size="12">
               {{ sourceMap.DWK_GDC_zjts }}台
             </text>
           </g>
           <g
             v-if="showType === 'all' || showType === 'gf'"
             class="item-label"
+            @click="clickLabel('AK_GDC', '埃肯光电场')"
+            @mouseover="mouseover(10)"
+            @mouseout="mouseout"
+          >
+            <use xlink:href="#nx-map-line-1" x="560" y="15" />
+            <use xlink:href="#nx-map-circle-1" x="560" y="-5" />
+            <!-- +25 -5 -->
+            <rect
+              x="585"
+              y="15"
+              width="110"
+              height="18"
+              stroke="#46C55A35"
+              fill="#000000"
+              opacity="0.8"
+            />
+            <!-- +5 +14 -->
+            <text class="mapKey" x="590" y="29" fill="#919697" font-size="12">
+              埃肯
+            </text>
+            <!-- +70 0 -->
+            <text class="mapValue" x="670" y="29" fill="#05bb4c" font-size="12">
+              {{ sourceMap.AK_GDC_zjts }}台
+            </text>
+          </g>
+          <g
+            v-if="showType === 'all' || showType === 'gf'"
+            class="item-label"
             @click="clickLabel('PL_GDC', '平罗光电场')"
             @mouseover="mouseover(5)"
             @mouseout="mouseout"
@@ -741,47 +769,47 @@
             </g>
             <g v-show="popup[4]">
               <!-- +5 (+10+50, +20)+25 -->
-              <use xlink:href="#popup-box-svg" x="460" y="15" />
-              <text class="mapKey" x="470" y="35" fill="#919697" font-size="12">
+              <use xlink:href="#popup-box-svg" x="320" y="15" />
+              <text class="mapKey" x="330" y="35" fill="#919697" font-size="12">
                 经度
               </text>
-              <text x="520" y="35" fill="#05bb4c" font-size="12">
+              <text x="380" y="35" fill="#05bb4c" font-size="12">
                 {{ xtMap.DWK_GDC && xtMap.DWK_GDC.jd }}°
               </text>
-              <text class="mapKey" x="470" y="60" fill="#919697" font-size="12">
+              <text class="mapKey" x="330" y="60" fill="#919697" font-size="12">
                 纬度
               </text>
-              <text x="520" y="60" fill="#05bb4c" font-size="12">
+              <text x="380" y="60" fill="#05bb4c" font-size="12">
                 {{ xtMap.DWK_GDC && xtMap.DWK_GDC.wd }}°
               </text>
-              <text class="mapKey" x="470" y="85" fill="#919697" font-size="12">
+              <text class="mapKey" x="330" y="85" fill="#919697" font-size="12">
                 海拔
               </text>
-              <text x="520" y="85" fill="#05bb4c" font-size="12">
+              <text x="380" y="85" fill="#05bb4c" font-size="12">
                 {{ xtMap.DWK_GDC && xtMap.DWK_GDC.hb }}米
               </text>
               <text
                 class="mapKey"
-                x="470"
+                x="330"
                 y="110"
                 fill="#919697"
                 font-size="12"
               >
                 功率
               </text>
-              <text x="520" y="110" fill="#05bb4c" font-size="12">
+              <text x="380" y="110" fill="#05bb4c" font-size="12">
                 {{ xtMap.DWK_GDC && xtMap.DWK_GDC.gl }}MW
               </text>
               <text
                 class="mapKey"
-                x="470"
+                x="330"
                 y="135"
                 fill="#919697"
                 font-size="12"
               >
                 日照
               </text>
-              <text x="520" y="135" fill="#05bb4c" font-size="12">
+              <text x="380" y="135" fill="#05bb4c" font-size="12">
                 {{ xtMap.DWK_GDC && xtMap.DWK_GDC.ssfs }}W/m²
               </text>
             </g>
@@ -1092,6 +1120,52 @@
                 {{ xtMap.HZJ_GDC && xtMap.HZJ_GDC.ssfs }}W/m²
               </text>
             </g>
+            <g v-show="popup[10]">
+              <!-- +5 (+10+50, +20)+25 -->
+              <use xlink:href="#popup-box-svg" x="450" y="15" />
+              <text class="mapKey" x="460" y="35" fill="#919697" font-size="12">
+                经度
+              </text>
+              <text x="510" y="35" fill="#05bb4c" font-size="12">
+                {{ xtMap.AK_GDC && xtMap.AK_GDC.jd }}°
+              </text>
+              <text class="mapKey" x="460" y="60" fill="#919697" font-size="12">
+                纬度
+              </text>
+              <text x="510" y="60" fill="#05bb4c" font-size="12">
+                {{ xtMap.AK_GDC && xtMap.AK_GDC.wd }}°
+              </text>
+              <text class="mapKey" x="460" y="85" fill="#919697" font-size="12">
+                海拔
+              </text>
+              <text x="510" y="85" fill="#05bb4c" font-size="12">
+                {{ xtMap.AK_GDC && xtMap.AK_GDC.hb }}米
+              </text>
+              <text
+                class="mapKey"
+                x="460"
+                y="110"
+                fill="#919697"
+                font-size="12"
+              >
+                功率
+              </text>
+              <text x="510" y="110" fill="#05bb4c" font-size="12">
+                {{ xtMap.AK_GDC && xtMap.AK_GDC.gl }}MW
+              </text>
+              <text
+                class="mapKey"
+                x="460"
+                y="135"
+                fill="#919697"
+                font-size="12"
+              >
+                日照
+              </text>
+              <text x="510" y="135" fill="#05bb4c" font-size="12">
+                {{ xtMap.AK_GDC && xtMap.AK_GDC.ssfs }}W/m²
+              </text>
+            </g>
           </g>
         </g>
       </g>
@@ -1138,6 +1212,7 @@ export default {
         false,
         false,
         false,
+        false,
       ],
       effectsY: [[65, 1]],
       sd: 1950,

+ 3 - 3
src/views/Status/Status.vue

@@ -679,7 +679,7 @@ export default {
   width: 100%;
   height: calc(100vh - 7.222vh);
   overflow: auto;
-  display: flex;
+//   display: flex;
   flex-direction: column;
 
   .panel-box {
@@ -689,8 +689,8 @@ export default {
     flex-wrap: wrap;
 
     .panel-item {
-      width: calc(20% - 1.185vh);
-      margin-left: 1.481vh;
+      width: calc(25% - 1.185vh);
+      margin-right: 1.1vh;
       margin-bottom: 1.481vh;
 
       &:nth-child(5n + 1) {

+ 9 - 1
src/views/Status/components/status-panel.vue

@@ -108,7 +108,7 @@ export default {
 <style lang="less" scoped>
 .status-panel {
   position: relative;
-  height: 22.315vh;
+  height: 29.315vh;
   cursor: pointer;
 
   .pause {
@@ -210,6 +210,14 @@ export default {
 
           .f1,
           .f2,
+          .f3,
+          .f4,
+          .f5{
+            line-height: 38px;
+          }
+
+          .f1,
+          .f2,
           .f4 {
             text-align: right;
             color: @gray;