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

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

@@ -375,13 +375,17 @@ export class BoosterStation {
 		"NSS_FDC": {
 			"nssuakv2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0001" },
 			"nssuabkv2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0004" },
+			"nss3uov2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0244" },
+			"nssfhz2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0313" },
 			"nsslaa2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0009" },
 			"nsspmw2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0012" },
 			"nssqmvar2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0013" },
+			"nssuxkv2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0320" },
 			"nsscos2j": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0319" },
 			"nsslaa2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0014" },
 			"nsspmw2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0017" },
 			"nssqmvar2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0018" },
+			"nssuxkv2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0328" },
 			"nsscos2jy": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0327" },
 			"nsslaa2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0031" },
 			"nsspkw2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0032" },
@@ -389,7 +393,8 @@ export class BoosterStation {
 			"nsscos2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0298" },
 			"nssuakv2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0082" },
 			"nssuabkv2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0085" },
-			"nssfhz2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0323" },
+			"nss3uov2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0257" },
+			"nssfhz2y": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0251" },
 			"nssuakv1zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0082" },
 			"nssuabkv1zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0085" },
 			"nsslaa1zbs": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0022" },
@@ -405,6 +410,8 @@ export class BoosterStation {
 			"nsscos1zbx": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0273" },
 			"nssuakv2zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0086" },
 			"nssuabkv2zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0089" },
+			"nss3uo2zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0282" },
+			"nssfhz2zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0276" },
 			"nsslaa2zbs": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0025" },
 			"nsspmw2zbs": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0026" },
 			"nssqmvar2zbs": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0027" },
@@ -418,6 +425,8 @@ export class BoosterStation {
 			"nsscos2zbx": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0286" },
 			"nssuakv3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0090" },
 			"nssuabkv3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0093" },
+			"nss3uov3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0307" },
+			"nssfhz3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0301" },
 			"nssdw3zb": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0039" },
 			"nssymwd3zb1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0299" },
 			"nssymwd3zb2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0300" },
@@ -435,6 +444,7 @@ export class BoosterStation {
 			"nsspmwjd3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0047" },
 			"nssqmvarjd3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0048" },
 			"nsslaadr1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0049" },
+			"nsspmwdr1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0184" },
 			"nssqmvardr1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0050" },
 			"nsslaadk1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0051" },
 			"nsspmwdk1": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0052" },
@@ -452,6 +462,7 @@ export class BoosterStation {
 			"nsspmwjd6": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0061" },
 			"nssqmvarjd6": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0062" },
 			"nsslaadr2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0063" },
+			"nsspmwdr2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0195" },
 			"nssqmvardr2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0064" },
 			"nsslaadk2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0065" },
 			"nsspmwdk2": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0066" },
@@ -469,6 +480,7 @@ export class BoosterStation {
 			"nsspmwjd9": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0075" },
 			"nssqmvarjd9": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0076" },
 			"nsslaadr3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0077" },
+			"nsspmwdr3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0206" },
 			"nssqmvardr3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0078" },
 			"nsslaadk3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0079" },
 			"nsspmwdk3": { tag: "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI0080" },
@@ -1558,20 +1570,20 @@ export class BoosterStation {
 			"xslaazy1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0384" },
 			"xspkwzy1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0396" },
 			"xsqkvarzy1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0397" },
-			"xsuakvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0267" },
-			"xsubkvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0268" },
-			"xsuckvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0269" },
-			"xsuabkvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0275" },
-			"xsubckvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0276" },
-			"xsucakvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0277" },
-			"xs3u0vzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0274" },
-			"xsuakvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0229" },
-			"xsubkvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0230" },
-			"xsuckvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0231" },
-			"xsuabkvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0237" },
-			"xsubckvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0238" },
-			"xsucakvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0239" },
-			"xs3u0vzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0236" },
+			"xsuakvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0139" },
+			"xsubkvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0140" },
+			"xsuckvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0141" },
+			"xsuabkvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0142" },
+			"xsubckvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0143" },
+			"xsucakvzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0144" },
+			"xs3u0vzb2x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0145" },
+			"xsuakvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0131" },
+			"xsubkvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0132" },
+			"xsuckvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0133" },
+			"xsuabkvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0134" },
+			"xsubckvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0135" },
+			"xsucakvzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0136" },
+			"xs3u0vzb1x": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0137" },
 			"xsuakvby1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0286" },
 			"xsuabkvby1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0294" },
 			"xslaaby1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0289" },
@@ -1641,19 +1653,20 @@ export class BoosterStation {
 			"xskg3215": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1514" },
 			"xskg3210": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1516" },
 			"xskg3150": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0918" },
-			"xskg3140": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0583" },
+			"xskg3140": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0853" },
 			"xskg3130": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0983" },
 			"xskg319pt": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0670" },
 			"xskg31105": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1366" },
 			"xskg3115": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1364" },
 			"xskg3110": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1371" },
-			"xsdlq111": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0033" },
+			"xsdlq111": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0034" },
 			"xsdlq102": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0308" },
 			"xsdlq101": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0169" },
 			"xsdlq302": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0331" },
 			"xsdlq301": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0192" },
 			"xsdlq312": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1629" },
-			"xsdlq324": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1261" },
+			"xsdlq324": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1274" },
+			"xsdlq323": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1209" },
 			"xsdlq322": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1144" },
 			"xsdlq321": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1499" },
 			"xsdlq315": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0914" },
@@ -1663,7 +1676,8 @@ export class BoosterStation {
 			"xssc302": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0333" },
 			"xssc301": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0194" },
 			"xssc312": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1631" },
-			"xssc324": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1261" },
+			"xssc324": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1276" },
+			"xssc323": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1211" },
 			"xssc322": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1146" },
 			"xssc321": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1501" },
 			"xssc315": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0916" },

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

@@ -892,7 +892,7 @@
 								</g>
 								<text transform="matrix(1 0 0 1 1377.4387 168.2646)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									103-01
+									103-02
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -970,7 +970,7 @@
 								</g>
 								<text transform="matrix(1 0 0 1 1151.2805 169.2646)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									121-01
+									121-02
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -1564,7 +1564,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 928.1072 482.0693)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									302-1
+									302-2
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -1652,7 +1652,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1508.7219 482.0693)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									303-1
+									303-5
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -2347,7 +2347,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1029.9426 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-2
 								</text>
 								<text transform="matrix(1 0 0 1 1029.9426 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
@@ -2462,7 +2462,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1430.5168 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -2624,7 +2624,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1513.0168 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<text transform="matrix(1 0 0 1 1513.0168 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
@@ -2667,7 +2667,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1594.011 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<text transform="matrix(1 0 0 1 1594.011 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
@@ -2710,7 +2710,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1677.3254 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<text transform="matrix(1 0 0 1 1677.3254 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
@@ -2793,7 +2793,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1840.761 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									-5
 								</text>
 								<rect x="1828.559" y="521.988" fill="#CAA51A" width="2.25" height="11.584" />
 								<rect x="1828.564" y="556.988" fill="#CAA51A" width="2.25" height="131.657" />
@@ -4883,15 +4883,15 @@
 								</text>
 								<text transform="matrix(1 0 0 1 71.3203 106.0535)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									{{ ajaxData.nssuakv2j }}
+									{{ ajaxData.nssuabkv2j }}
 								</text>
 								<text transform="matrix(1 0 0 1 71.3203 126.7195)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nss3uov2j }}
 								</text>
 								<text transform="matrix(1 0 0 1 71.3203 148.2234)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssfhz2j }}
 								</text>
 						
 								<text transform="matrix(1 0 0 1 487.9116 73.7937)" fill="#1A823B"
@@ -4908,7 +4908,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 487.9111 133.4753)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssuxkv2j }}
 								</text>
 								<text transform="matrix(1 0 0 1 487.9111 154.1511)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
@@ -4929,11 +4929,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1060.2441 133.4753)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssqmvar2jy }}
 								</text>
 								<text transform="matrix(1 0 0 1 1060.2441 154.1511)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									{{ ajaxData.nsscos2jy }}
+									{{ ajaxData.nssuxkv2jy }}
 								</text>
 						
 								<text transform="matrix(1 0 0 1 1640.2461 95.1296)" fill="#1A823B"
@@ -4963,7 +4963,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1779.5313 136.4949)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nss3uov2y }}
 								</text>
 								<text transform="matrix(1 0 0 1 1779.5313 157.9988)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
@@ -5042,11 +5042,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 711.8931 451.7683)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nss3uo2zb }}
 								</text>
 								<text transform="matrix(1 0 0 1 711.8931 472.0867)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssfhz2zb }}
 								</text>
 						
 								<text transform="matrix(1 0 0 1 1106.2656 281.4167)" fill="#1A823B"
@@ -5104,11 +5104,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1352.8184 451.7683)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nss3uov3zb }}
 								</text>
 								<text transform="matrix(1 0 0 1 1352.8184 472.0867)" fill="#1A823B"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
-									-.--
+									{{ ajaxData.nssfhz3zb }}
 								</text>
 						
 								<text transform="matrix(1 0 0 1 1649.1641 362.2957)" fill="#1A823B"
@@ -5189,7 +5189,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 365.4609 867.3298)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
-										-.--
+										{{ ajaxData.nsspmwdr1 }}
 									</text>
 									<text transform="matrix(1 0 0 1 360.4941 893.1804)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -5273,7 +5273,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1019.9316 867.3298)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
-										-.--
+										{{ ajaxData.nsspmwdr2 }}
 									</text>
 									<text transform="matrix(1 0 0 1 1014.9648 893.1804)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -5357,7 +5357,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1671.2656 867.3298)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">
-										-.--
+										{{ ajaxData.nsspmwdr3 }}
 									</text>
 									<text transform="matrix(1 0 0 1 1666.2988 893.1804)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="10.7648">

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

@@ -7798,64 +7798,14 @@
           </g>
           <g>
             <g v-if="ajaxData.xskg11101" id="_1_">
-              <line
-                fill="none"
-                stroke="#AAAAAA"
-                stroke-width="2"
-                stroke-miterlimit="10"
-                x1="778.589"
-                y1="156.168"
-                x2="778.589"
-                y2="173.055"
-              ></line>
-              <path
-                fill="#AAAAAA"
-                d="M764.964,165.107c0,1.436-1.166,2.604-2.602,2.604c-1.434,0-2.602-1.167-2.602-2.604
-				c0-1.436,1.168-2.602,2.602-2.602C763.798,162.505,764.964,163.675,764.964,165.107 M766.866,165.107
-				c0-2.486-2.016-4.505-4.504-4.505s-4.506,2.019-4.506,4.505c0,2.487,2.019,4.506,4.506,4.506
-				C764.85,169.613,766.866,167.595,766.866,165.107L766.866,165.107z"
-              ></path>
-
-              <line
-                fill="none"
-                stroke="#AAAAAA"
-                stroke-width="2"
-                stroke-miterlimit="10"
-                x1="778.362"
-                y1="165.107"
-                x2="765.894"
-                y2="165.107"
-              ></line>
+              <line fill="none" stroke="#AAAAAA" stroke-width="2" stroke-miterlimit="10" x1="778.589" y1="156.168" x2="778.589" y2="173.055" ></line>
+              <path fill="#AAAAAA" d="M764.964,165.107c0,1.436-1.166,2.604-2.602,2.604c-1.434,0-2.602-1.167-2.602-2.604 c0-1.436,1.168-2.602,2.602-2.602C763.798,162.505,764.964,163.675,764.964,165.107 M766.866,165.107 c0-2.486-2.016-4.505-4.504-4.505s-4.506,2.019-4.506,4.505c0,2.487,2.019,4.506,4.506,4.506 C764.85,169.613,766.866,167.595,766.866,165.107L766.866,165.107z" ></path> 
+              <line fill="none" stroke="#AAAAAA" stroke-width="2" stroke-miterlimit="10" x1="778.362" y1="165.107" x2="765.894" y2="165.107" ></line>
             </g>
             <g v-if="ajaxData.xskg11101 == false" id="_1_">
-              <line
-                fill="none"
-                stroke="#AAAAAA"
-                stroke-width="2"
-                stroke-miterlimit="10"
-                x1="778.589"
-                y1="156.168"
-                x2="778.589"
-                y2="173.055"
-              ></line>
-              <path
-                fill="#AAAAAA"
-                d="M764.964,165.107c0,1.436-1.166,2.604-2.604,2.604c-1.434,0-2.6-1.167-2.6-2.604
-				c0-1.436,1.166-2.602,2.6-2.602C763.798,162.506,764.964,163.675,764.964,165.107 M766.866,165.107
-				c0-2.486-2.016-4.505-4.506-4.505c-2.484,0-4.504,2.019-4.504,4.505c0,2.487,2.019,4.506,4.504,4.506
-				C764.851,169.613,766.866,167.595,766.866,165.107L766.866,165.107z"
-              ></path>
-
-              <line
-                fill="none"
-                stroke="#AAAAAA"
-                stroke-width="2"
-                stroke-miterlimit="10"
-                x1="776.476"
-                y1="171.422"
-                x2="765.894"
-                y2="164.609"
-              ></line>
+              <line fill="none" stroke="#AAAAAA" stroke-width="2" stroke-miterlimit="10" x1="778.589" y1="156.168" x2="778.589" y2="173.055" ></line>
+              <path fill="#AAAAAA" d="M764.964,165.107c0,1.436-1.166,2.604-2.604,2.604c-1.434,0-2.6-1.167-2.6-2.604 c0-1.436,1.166-2.602,2.6-2.602C763.798,162.506,764.964,163.675,764.964,165.107 M766.866,165.107 c0-2.486-2.016-4.505-4.506-4.505c-2.484,0-4.504,2.019-4.504,4.505c0,2.487,2.019,4.506,4.504,4.506 C764.851,169.613,766.866,167.595,766.866,165.107L766.866,165.107z" ></path> 
+              <line fill="none" stroke="#AAAAAA" stroke-width="2" stroke-miterlimit="10" x1="776.476" y1="171.422" x2="765.894" y2="164.609" ></line>
             </g>
           </g>
           <g>