Merge branch 'mw2' of ssh://61.161.152.110:29418/electronic-map into tjj2

src/views/WindSite/components/boosterstation/BoosterStation.js

@@ -11,10 +11,12 @@ export class BoosterStation {
 			"qs3ubkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0002" },
 			"qs3uckv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0003" },
 			"qs3uabkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0009" },
+			"qs3fhz110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0012" },
 			"qs3uakv110r": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0001" },
 			"qs3laa110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0004" },
 			"qs3pmw110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0013" },
 			"qs3qmvar110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0014" },
+			"qs3cos110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0016" },
 			"qs3uakv35r": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0053" },
 			"qs3laa35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0056" },
 			"qs3pmw35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0116" },
@@ -23,8 +25,13 @@ export class BoosterStation {
 			"qs3ubkv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0538" },
 			"qs3uckv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0539" },
 			"qs3uabkv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0573" },
+			"qs3fhz35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0639" },
 			"qs3ymwd": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0162" },
 			"qs3rzwd": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0161" },
+			"qs3ruakv": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0059" },
+			"qs3rlaa": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0062" },
+			"qs3rpmw": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0123" },
+			"qs3rqmvar": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0124" },
 			"qs3dw": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0155" },
 			"qs3uabkvc": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0573" },
 			"qs3ubckv": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0574" },
@@ -240,7 +247,7 @@ export class BoosterStation {
 			"qsqmvarzb1s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0459" },
 			"qscoszb1s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0461" },
 			"qsuakvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0177" },
-			"qsuabkvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0162" },
+			"qsuabkvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0183" },
 			"qs3uozb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0005" },
 			"qslaazb2x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0708" },
 			"qspmwzb2x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0714" },
@@ -250,7 +257,7 @@ export class BoosterStation {
 			"qsrzwdzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0481" },
 			"qsdwzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI1249" },
 			"qsuakvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0161" },
-			"qsuabkvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0178" },
+			"qsuabkvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0167" },
 			"qs3u0vzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0006" },
 			"qslaazb1x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0468" },
 			"qspmwzb1x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0474" },

src/views/WindSite/components/boosterstation/qs.vue

@@ -1359,13 +1359,13 @@
                 <g>
                   <text transform="matrix(1 0 0 1 24.1226 476.4844)">
                     <tspan
-                      x="0"
+                      x="-7"
                       y="0"
                       fill="#97A1A2"
                       font-family="'MicrosoftYaHei'"
                       font-size="11.3899"
                     >
-                      Ub
+                      Uab
                     </tspan>
                     <tspan
                       x="15.778"
@@ -1559,13 +1559,13 @@
                 <g>
                   <text transform="matrix(1 0 0 1 937.8662 460.2295)">
                     <tspan
-                      x="0"
+                      x="5"
                       y="0"
                       fill="#97A1A2"
                       font-family="'MicrosoftYaHei'"
                       font-size="11.3899"
                     >
-                      Uab
+                      Ua
                     </tspan>
                     <tspan
                       x="22.074"
@@ -1605,7 +1605,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="11.3899"
                     >
-                      Ubc
+                      Uab
                     </tspan>
                     <tspan
                       x="21.49"

src/views/WindSite/pages/BoosterStation.vue

@@ -22,7 +22,10 @@
 
     <!-- 香山 -->
     <XS class="booster-station-body" v-if="wpId === 'XS_FDC'" />
-
+	
+	<!-- 宋堡第六 -->
+	<SBDL class="booster-station-body" v-if="wpId === 'QS3_FDC'" />
+	
     <!-- 大武口 -->
     <DWK class="booster-station-body" v-if="wpId === 'DWK_GDC'" />
 
@@ -37,6 +40,7 @@
 
     <!-- 马场湖 -->
     <MCH class="booster-station-body" v-if="wpId === 'MCH_GDC'" />
+	
   </div>
 </template>
 
@@ -47,7 +51,7 @@ import MHS from "../components/boosterstation/mhs.vue";
 import NSS from "../components/boosterstation/nss.vue";
 import QS from "../components/boosterstation/qs.vue";
 import SBQ from "../components/boosterstation/sbq.vue";
-// import SBDL from "../components/boosterstation/sbdl.vue";
+import SBDL from "../components/boosterstation/sbdl.vue";
 import XS from "../components/boosterstation/xs.vue";
 import DWK from "../components/boosterstation/dwk.vue";
 import PL1 from "../components/boosterstation/pl1.vue";
@@ -66,7 +70,7 @@ export default {
     NSS,
     QS,
     SBQ,
-    // SBDL,
+    SBDL,
     XS,
     DWK,
     PL1,
@@ -102,7 +106,6 @@ export default {
   // 函数
   methods: {
     select(res) {
-      console.log(2333, res.code);
       this.$router.replace({
         path: `/monitor/windsite/boosterstation/${res.code}`,
       });
@@ -137,7 +140,12 @@ export default {
               });
             }
           });
-
+			
+			// 当点击为宋六时
+			btnGroup[0].btns.push({
+			  text: '宋堡第六风电场',
+			  code: 'QS3_FDC',
+			});
           that.btnGroups = btnGroup;
           that.renderBtnActiveIndex();
         },