Merge branch 'mw2' of http://61.161.152.110:10101/r/electronic-map into yx

src/router/index.js

@@ -693,6 +693,11 @@ const routes = [{
 		import( /* webpackChunkName: "historysearch" */ "../views/report/xnyrb.vue"),
 },
 {
+	path: "/others/weather",
+	name: "weather",
+	component: () => import("../views/report/weather.vue"),
+},
+{
 	path: "/others/ExportExcel",
 	name: "ExportExcel",
 	component: () => import("../views/report/ExportExcel.vue"),

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

@@ -93,6 +93,18 @@ export class BoosterStation {
 			"dwkubkv": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0042" },
 			"dwkuckv": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0043" },
 			"dwkuabkv": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0004" },
+			
+			"dwklaa311": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0008" },
+			"dwkqkvar311": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0009" },
+			"dwklaa312": { tag: "" },
+			"dwkqkvar312": { tag: "" },
+			"dwklaa313": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0013" },
+			"dwkqkvar313": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0014" },
+			"dwklaa314": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0018" },
+			"dwkqkvar314": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0019" },
+			"dwklaa315": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0023" },
+			"dwkqkvar315": { tag: "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0024" },
+
 			"dwksrdy01": { tag: "DWKGF.NX_GD_DWKG_GF_P1_L1_001_AI0008" },
 			"dwksrdy02": { tag: "DWKGF.NX_GD_DWKG_GF_P1_L1_002_AI0008" },
 			"dwksrdy03": { tag: "DWKGF.NX_GD_DWKG_GF_P1_L1_003_AI0008" },
@@ -230,6 +242,7 @@ export class BoosterStation {
 			"qspmw": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0330" },
 			"qsqmvar": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0331" },
 			"qsuxkv": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0321" },
+			"qsfhz": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0335" },
 			"qscos": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0333" },
 			"qslaazb2s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0692" },
 			"qspmwzb2s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0698" },
@@ -600,14 +613,24 @@ export class BoosterStation {
 			"mhsuckvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0035" },
 			"mhsu0kvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0040" },
 			"mhsdwzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0217" },
-			"mhsymwdzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0049" },
+			"mhsymwdzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0258" },
 			"mhsrzwdzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0050" },
+			//补
+			"mhsuabkvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0037" },
+			"mhsubckvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0038" },
+			"mhsucakvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0039" },
+			"mhsIaazb1s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0025" },
+			"mhsPmwzb1s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0029" },
+			"mhsqmvarzb1s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0030" },
 			"mhsIaazb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0041" },
 			"mhsPmwzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0045" },
 			"mhsqmvarzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0046" },
 			"mhsdwzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0261" },
 			"mhsymwdzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0259" },
 			"mhsrzwdzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0260" },
+			"mhslaazb2s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0234" },
+			"mhspmwzb2s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0238" },
+			"mhsqmvarzb2s": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0239" },
 			"mhslaazb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0250" },
 			"mhspmwzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0254" },
 			"mhsqmvarzb2": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0255" },
@@ -1298,12 +1321,12 @@ export class BoosterStation {
 			"sbqqmx2": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0109" },
 			"sbqlaamx2": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0105" },
 			"sbqdwmx2": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0563" },
-			"sbquakvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0609" },
-			"sbqubkvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0610" },
-			"sbquckvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0611" },
-			"sbquabkvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0612" },
-			"sbqubckvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0613" },
-			"sbqu0kvzb3": { tag: "SBQDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0615" },
+			"sbquakvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0609" },
+			"sbqubkvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0610" },
+			"sbquckvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0611" },
+			"sbquabkvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0612" },
+			"sbqubckvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0613" },
+			"sbqu0kvzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0615" },
 			"sbqpkwzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0588" },
 			"sbqqkvarzb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0589" },
 			"sbqlaazb3": { tag: "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0585" },
@@ -1493,12 +1516,17 @@ export class BoosterStation {
 			"xspkw": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0001" },
 			"xsqkvar": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0002" },
 			"xsfhz": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0018" },
-			//右边这块无点
-			"xsuakvzb2z": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0066" },
-			"xsuabkvzb2z": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0074" },
+			//右边这块无点,补
+			"xsuakvzb2zs": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0066" },
+			"xsuabkvzb2zs": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0074" },
+			"xslaazb2s": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0093" },
+			"xspmwzb2s": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0080" },
+			"xsqkvarzb2s": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0081" },
+			"xsuakvzb2z": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0090" },
+			"xsuabkvzb2z": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0098" },
 			"xslaazb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0069" },
-			"xspmwzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0080" },
-			"xsqkvarzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0081" },
+			"xspmwzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0104" },
+			"xsqkvarzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0105" },
 			"xsuakvzb2y": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0123" },
 			"xsubkvzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0124" },
 			"xsuckvzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0125" },
@@ -1510,9 +1538,15 @@ export class BoosterStation {
 			"xswdzb22": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0087" },
 			"xsrzwdzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0088" },
 			"xsdwzb2": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0089" },
+			//补
+			"xsuakvzb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0034" },
+			"xsuabkvzb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0038" },
+			"xslaazb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0156" },
+			"xspkwzb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0032" },
+			"xsqkvarzb1d": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0033" },
 			"xsuakvzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0021" },
-			"xsuabkvzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0038" },
-			"xslaazb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0024" },
+			"xsuabkvzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0402" },
+			"xslaazb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0150" },
 			"xspkwzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0019" },
 			"xsqkvarzb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0020" },
 			"xsymwd1zb1": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0028" },
@@ -1531,7 +1565,7 @@ export class BoosterStation {
 			"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_AI0" },
+			"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" },
@@ -1607,7 +1641,7 @@ 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_DI0853" },
+			"xskg3140": { tag: "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI0583" },
 			"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" },

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

@@ -14,7 +14,7 @@
               y="0px"
               width="1681.668px"
               height="806.571px"
-              viewBox="0 0 1718.668 806.571"
+              viewBox="0 80 1718.668 806.571"
               enable-background="new 0 0 1681.668 806.571"
               xml:space="preserve"
             >
@@ -907,7 +907,7 @@
                 </g>
 
                 <text
-                  transform="matrix(1 0 0 1 812.7134 241.6914)"
+                  transform="matrix(1 0 0 1 862.7134 241.6914)"
                   fill="#FFFFFF"
                   font-family="'MicrosoftYaHei'"
                   font-size="11.6452"
@@ -5374,6 +5374,510 @@
                     points="1312.93,214.32 1319.754,206.598    1326.773,214.32  "
                   />
                 </g>
+
+
+
+
+              <g>
+                <rect
+                  x="312.274"
+                  y="204.162"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.492"
+                />
+                <rect
+                  x="312.274"
+                  y="223.68"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.491"
+                />
+                <g>
+                  <text transform="matrix(1 0 0 1 330.9995 216.8369)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      la
+                    </tspan>
+                    <tspan
+                      x="9.327"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (A)
+                    </tspan>
+                    <tspan
+                      x="22.526"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+                <g>
+                  
+                  <text transform="matrix(1 0 0 1 317.0742 236.3535)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      Q
+                    </tspan>
+                    <tspan
+                      x="9.282"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (kVar)
+                    </tspan>
+                    <tspan
+                      x="36.451"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+              </g>
+              <g id="data">
+                <text
+                  transform="matrix(1 0 0 1 366.2817 216.2568)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwklaa311 }}
+                </text>
+                <text
+                  transform="matrix(1 0 0 1 366.2817 235.7734)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwkqkvar311 }}
+                </text>
+              </g>
+
+              <g>
+                <rect
+                  x="512.274"
+                  y="204.162"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.492"
+                />
+                <rect
+                  x="512.274"
+                  y="223.68"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.491"
+                />
+                <g>
+                  <text transform="matrix(1 0 0 1 530.9995 216.8369)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      la
+                    </tspan>
+                    <tspan
+                      x="9.327"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (A)
+                    </tspan>
+                    <tspan
+                      x="22.526"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+                <g>
+                  
+                  <text transform="matrix(1 0 0 1 517.0742 236.3535)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      Q
+                    </tspan>
+                    <tspan
+                      x="9.282"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (kVar)
+                    </tspan>
+                    <tspan
+                      x="36.451"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+              </g>
+              <g id="data">
+                <text
+                  transform="matrix(1 0 0 1 566.2817 216.2568)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwklaa312 }}
+                </text>
+                <text
+                  transform="matrix(1 0 0 1 566.2817 235.7734)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwkqkvar312 }}
+                </text>
+              </g>
+
+              <g>
+                <rect
+                  x="712.274"
+                  y="204.162"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.492"
+                />
+                <rect
+                  x="712.274"
+                  y="223.68"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.491"
+                />
+                <g>
+                  <text transform="matrix(1 0 0 1 730.9995 216.8369)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      la
+                    </tspan>
+                    <tspan
+                      x="9.327"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (A)
+                    </tspan>
+                    <tspan
+                      x="22.526"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+                <g>
+                  
+                  <text transform="matrix(1 0 0 1 717.0742 236.3535)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      Q
+                    </tspan>
+                    <tspan
+                      x="9.282"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (kVar)
+                    </tspan>
+                    <tspan
+                      x="36.451"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+              </g>
+              <g id="data">
+                <text
+                  transform="matrix(1 0 0 1 766.2817 216.2568)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwklaa313 }}
+                </text>
+                <text
+                  transform="matrix(1 0 0 1 766.2817 235.7734)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwkqkvar313 }}
+                </text>
+              </g>
+
+              <g>
+                <rect
+                  x="912.274"
+                  y="204.162"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.492"
+                />
+                <rect
+                  x="912.274"
+                  y="223.68"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.491"
+                />
+                <g>
+                  <text transform="matrix(1 0 0 1 930.9995 216.8369)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      la
+                    </tspan>
+                    <tspan
+                      x="9.327"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (A)
+                    </tspan>
+                    <tspan
+                      x="22.526"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+                <g>
+                  
+                  <text transform="matrix(1 0 0 1 917.0742 236.3535)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      Q
+                    </tspan>
+                    <tspan
+                      x="9.282"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (kVar)
+                    </tspan>
+                    <tspan
+                      x="36.451"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+              </g>
+              <g id="data">
+                <text
+                  transform="matrix(1 0 0 1 966.2817 216.2568)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwklaa314 }}
+                </text>
+                <text
+                  transform="matrix(1 0 0 1 966.2817 235.7734)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwkqkvar314 }}
+                </text>
+              </g>
+
+              <g>
+                <rect
+                  x="1332.274"
+                  y="204.162"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.492"
+                />
+                <rect
+                  x="1332.274"
+                  y="223.68"
+                  opacity="0.9"
+                  fill="#162320"
+                  width="115.11"
+                  height="18.491"
+                />
+                <g>
+                  <text transform="matrix(1 0 0 1 1350.9995 216.8369)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      la
+                    </tspan>
+                    <tspan
+                      x="9.327"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (A)
+                    </tspan>
+                    <tspan
+                      x="22.526"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+                <g>
+                  
+                  <text transform="matrix(1 0 0 1 1337.0742 236.3535)">
+                    <tspan
+                      x="0"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      Q
+                    </tspan>
+                    <tspan
+                      x="9.282"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="9.6234"
+                    >
+                      (kVar)
+                    </tspan>
+                    <tspan
+                      x="36.451"
+                      y="0"
+                      fill="#97A1A2"
+                      font-family="'MicrosoftYaHei'"
+                      font-size="11.3899"
+                    >
+                      :
+                    </tspan>
+                  </text>
+                </g>
+              </g>
+              <g id="data">
+                <text
+                  transform="matrix(1 0 0 1 1386.2817 216.2568)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwklaa315 }}
+                </text>
+                <text
+                  transform="matrix(1 0 0 1 1386.2817 235.7734)"
+                  fill="#1A823B"
+                  font-family="'MicrosoftYaHei'"
+                  font-size="9.463"
+                >
+                  {{ ajaxData.dwkqkvar315 }}
+                </text>
+              </g>
+
               </g>
             </svg>
           </template>

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

@@ -14,7 +14,7 @@
               y="0px"
               width="1617.869px"
               height="1130.968px"
-              viewBox="0 0 1617.869 1130.968"
+              viewBox="0 80 1617.869 1200.968"
               enable-background="new 0 0 1617.869 1130.968"
               xml:space="preserve"
             >
@@ -87,7 +87,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 479.7937 68.6948)"
@@ -113,7 +113,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 479.7937 94.7671)"
@@ -323,7 +323,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    Ua(kV):
+                    Uab(kV):
                   </text>
                 </g>
                 <g>
@@ -333,7 +333,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    Ub(kV):
+                    Ubc(kV):
                   </text>
                 </g>
                 <g>
@@ -343,102 +343,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    Uc(kV):
-                  </text>
-                </g>
-                <rect
-                  x="1423.638"
-                  y="533.923"
-                  opacity="0.9"
-                  fill="#1B2522"
-                  enable-background="new    "
-                  width="154.674"
-                  height="21.633"
-                ></rect>
-                <g>
-                  <text
-                    transform="matrix(1 0 0 1 1442.0056 548.8325)"
-                    fill="#929CA0"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    U0(V):
-                  </text>
-                </g>
-                <rect
-                  x="10.384"
-                  y="462.191"
-                  opacity="0.9"
-                  fill="#1B2522"
-                  enable-background="new    "
-                  width="154.68"
-                  height="21.638"
-                ></rect>
-                <rect
-                  x="10.384"
-                  y="486.177"
-                  opacity="0.9"
-                  fill="#1B2522"
-                  enable-background="new    "
-                  width="154.68"
-                  height="21.633"
-                ></rect>
-                <rect
-                  x="10.384"
-                  y="510.153"
-                  opacity="0.9"
-                  fill="#1B2522"
-                  enable-background="new    "
-                  width="154.68"
-                  height="21.633"
-                ></rect>
-                <g>
-                  <text
-                    transform="matrix(1 0 0 1 23.3337 476.5142)"
-                    fill="#929CA0"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    Ua(kV):
-                  </text>
-                </g>
-                <g>
-                  <text
-                    transform="matrix(1 0 0 1 22.4221 500.9946)"
-                    fill="#929CA0"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    Ub(kV):
-                  </text>
-                </g>
-                <g>
-                  <text
-                    transform="matrix(1 0 0 1 23.8796 526.0669)"
-                    fill="#929CA0"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    Uc(kV):
-                  </text>
-                </g>
-                <rect
-                  x="10.384"
-                  y="533.923"
-                  opacity="0.9"
-                  fill="#1B2522"
-                  enable-background="new    "
-                  width="154.68"
-                  height="21.633"
-                ></rect>
-                <g>
-                  <text
-                    transform="matrix(1 0 0 1 28.7512 548.8325)"
-                    fill="#929CA0"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    U0(V):
+                    Uca(kV):
                   </text>
                 </g>
                 <text
@@ -574,7 +479,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1036.6912 522.7817)"
@@ -736,7 +641,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 327.6301 522.7817)"
@@ -8133,7 +8038,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    {{ ajaxData.mhsqmvar }}
+                    {{ ajaxData.mhsuxkv }}
                   </text>
                   <text
                     transform="matrix(1 0 0 1 490.4875 140.7554)"
@@ -8141,7 +8046,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    {{ ajaxData.mhsuxkv }}
+                    {{ ajaxData.mhsfhz }}
                   </text>
                   <text
                     transform="matrix(1 0 0 1 490.4875 92.8745)"
@@ -8149,7 +8054,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    {{ ajaxData.mhsfhz }}
+                    {{ ajaxData.mhsqmvar }}
                   </text>
                   <text
                     transform="matrix(1 0 0 1 490.4875 166.5874)"
@@ -8194,40 +8099,6 @@
                     {{ ajaxData.mhsu0kv }}
                   </text>
                 </g>
-                <g id="_x33__x5F_">
-                  <text
-                    transform="matrix(1 0 0 1 64.9373 477.2935)"
-                    fill="#3B8646"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    {{ ajaxData.mhsuakvzb1 }}
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 64.9373 501.9946)"
-                    fill="#3B8646"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    {{ ajaxData.mhsubkvzb1 }}
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 64.9373 526.1753)"
-                    fill="#3B8646"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    {{ ajaxData.mhsuckvzb1 }}
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 64.9373 549.9399)"
-                    fill="#3B8646"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    {{ ajaxData.mhsu0kvzb1 }}
-                  </text>
-                </g>
                 <g id="_x34__x5F_">
                   <text
                     transform="matrix(1 0 0 1 334.3875 431.1304)"
@@ -8235,7 +8106,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    {{ ajaxData.mhsdwzb1 }}
+                    {{ ajaxData.mhsymwdzb1 }}
                   </text>
                   <text
                     transform="matrix(1 0 0 1 334.3875 451.4321)"
@@ -8243,7 +8114,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    {{ ajaxData.mhsymwdzb1 }}
+                    {{ ajaxData.mhsrzwdzb1 }}
                   </text>
                   <text
                     transform="matrix(1 0 0 1 334.3875 475.0483)"
@@ -8251,7 +8122,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.6069"
                   >
-                    {{ ajaxData.mhsrzwdzb1 }}
+                    {{ ajaxData.mhsdwzb1 }}
                   </text>
                   <text
                     transform="matrix(1 0 0 1 334.3875 499.8979)"
@@ -8353,14 +8224,6 @@
                   >
                     {{ ajaxData.mhsucakvzb2 }}
                   </text>
-                  <text
-                    transform="matrix(1 0 0 1 1478.1902 549.9399)"
-                    fill="#3B8646"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="10.6069"
-                  >
-                    -.--
-                  </text>
                 </g>
                 <g id="_x37__x5F_">
                   <text
@@ -9115,6 +8978,364 @@
                     points="1490.177,610.015 1497.641,601.634     1505.323,610.015   "
                   ></polyline>
                 </g>
+
+
+
+
+
+                
+
+                <rect
+                  x="262.244"
+                  y="344.98"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="149.407"
+                  height="21.63"
+                ></rect>
+                <rect
+                  x="262.244"
+                  y="368.969"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="149.407"
+                  height="21.63"
+                ></rect>
+                <rect
+                  x="262.244"
+                  y="392.94"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="149.407"
+                  height="21.633"
+                ></rect>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 301.2751 361.3022)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    la
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 312.1877 361.3022)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    (A)
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 327.6301 361.3022)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    :
+                  </text>
+                </g>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 294.3708 382.7817)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    P
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 302.5232 382.7817)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    (MW)
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 327.6301 382.7817)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    :
+                  </text>
+                </g>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 283.9812 408.854)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    Q
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 291.8459 408.854)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    (MVar)
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 326.6301 408.854)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    :
+                  </text>
+                </g>
+
+                
+                <rect
+                  x="971.305"
+                  y="344.98"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="149.407"
+                  height="21.63"
+                ></rect>
+                <rect
+                  x="971.305"
+                  y="368.969"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="149.407"
+                  height="21.63"
+                ></rect>
+                <rect
+                  x="971.305"
+                  y="392.94"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="149.407"
+                  height="21.633"
+                ></rect>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 1010.3357 361.3022)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    la
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 1021.2478 361.3022)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    (A)
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 1036.6912 361.3022)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    :
+                  </text>
+                </g>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 1003.4314 382.7817)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    P
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 1011.5837 382.7817)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    (MW)
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 1036.6912 382.7817)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    :
+                  </text>
+                </g>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 993.0417 408.854)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    Q
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 1000.905 408.854)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    (MVar)
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 1035.6912 408.854)"
+                    fill="#919CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    :
+                  </text>
+                </g>
+                <g id="_x34__x5F_">
+                  <text
+                    transform="matrix(1 0 0 1 334.3875 359.8979)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhsIaazb1s }}
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 334.3875 381.1987)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhsPmwzb1s }}
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 334.3875 406.8149)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhsqmvarzb1s }}
+                  </text>
+                </g>
+                <g id="_x34__x5F_">
+                  <text
+                    transform="matrix(1 0 0 1 1045.0095 359.8979)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhslaazb2s }}
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 1045.0095 381.1987)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhspmwzb2s }}
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 1045.0095 406.8149)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhsqmvarzb2s }}
+                  </text>
+                </g>
+
+
+                <rect
+                  x="23.638"
+                  y="462.191"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="154.674"
+                  height="21.638"
+                ></rect>
+                <rect
+                  x="23.638"
+                  y="486.177"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="154.674"
+                  height="21.633"
+                ></rect>
+                <rect
+                  x="23.638"
+                  y="510.153"
+                  opacity="0.9"
+                  fill="#1B2522"
+                  enable-background="new    "
+                  width="154.674"
+                  height="21.633"
+                ></rect>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 36.5876 476.5142)"
+                    fill="#929CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    Uab(kV):
+                  </text>
+                </g>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 35.6765 500.9946)"
+                    fill="#929CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    Ubc(kV):
+                  </text>
+                </g>
+                <g>
+                  <text
+                    transform="matrix(1 0 0 1 37.1326 526.0669)"
+                    fill="#929CA0"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    Uca(kV):
+                  </text>
+                </g>
+                <g id="_x36__x5F_">
+                  <text
+                    transform="matrix(1 0 0 1 78.1902 477.2935)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhsuabkvzb1 }}
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 78.1902 501.9946)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhsubckvzb1 }}
+                  </text>
+                  <text
+                    transform="matrix(1 0 0 1 78.1902 526.1753)"
+                    fill="#3B8646"
+                    font-family="'MicrosoftYaHei'"
+                    font-size="10.6069"
+                  >
+                    {{ ajaxData.mhsucakvzb1 }}
+                  </text>
+                </g>
+
+
               </g>
             </svg>
           </template>

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

@@ -14,7 +14,7 @@
               y="0px"
               width="1848.938px"
               height="829.936px"
-              viewBox="0 0 1848.938 829.936"
+              viewBox="0 80 1848.938 829.936"
               enable-background="new 0 0 1848.938 829.936"
               xml:space="preserve"
             >

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

@@ -14,7 +14,7 @@
               y="0px"
               width="1755.701px"
               height="853.164px"
-              viewBox="0 0 1755.701 853.164"
+              viewBox="0 80 1755.701 853.164"
               enable-background="new 0 0 1755.701 853.164"
               xml:space="preserve"
             >
@@ -211,7 +211,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    COS:
+                    COSΦ:
                   </text>
                 </g>
               </g>
@@ -5545,7 +5545,7 @@
                   font-family="'MicrosoftYaHei'"
                   font-size="9.463"
                 >
-                  -.--
+                  {{ ajaxData.qsfhz }}
                 </text>
                 <text
                   transform="matrix(1 0 0 1 1129.3955 115.9824)"
@@ -5811,7 +5811,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="10.7648"
                   >
-                    0.00{{ ajaxData.qsqkvarfc6 }}
+                    {{ ajaxData.qsqkvarfc6 }}
                   </text>
                 </g>
                 <g>

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

@@ -15,7 +15,7 @@
               y="0px"
               width="1313.34px"
               height="587.686px"
-              viewBox="0 0 1313.34 587.686"
+              viewBox="0 50 1313.34 587.686"
               enable-background="new 0 0 1313.34 587.686"
               xml:space="preserve"
             >
@@ -2679,7 +2679,7 @@
                         font-family="'MicrosoftYaHei'"
                         font-size="10.652"
                       >
-                        P(MW)
+                        P(kW)
                       </text>
                     </g>
                     <g>
@@ -2689,7 +2689,7 @@
                         font-family="'MicrosoftYaHei'"
                         font-size="10.652"
                       >
-                        Q(MVar)
+                        Q(kVar)
                       </text>
                     </g>
                   </g>
@@ -3658,7 +3658,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="8.85"
                   >
-                    {{ ajaxData.qs3uabkvc }}
+                    {{ ajaxData.qs3ubckv }}
                   </text>
                   <text
                     transform="matrix(1 0 0 1 657.1328 514.8923)"
@@ -3666,7 +3666,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="8.85"
                   >
-                    {{ ajaxData.qs3uabkvc }}
+                    {{ ajaxData.qs3ucakv }}
                   </text>
                   <text
                     transform="matrix(1 0 0 1 657.1333 532.9568)"
@@ -3674,7 +3674,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="8.85"
                   >
-                    {{ ajaxData.qs3uabkvc }}
+                    {{ ajaxData.qs33u0kv }}
                   </text>
                 </g>
 

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

@@ -11,7 +11,7 @@
         y="0px"
         width="1918px"
         height="879.725px"
-        viewBox="0 0 1918 879.725"
+        viewBox="0 80 1918 879.725"
         enable-background="new 0 0 1918 879.725"
         xml:space="preserve"
       >

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

@@ -11,7 +11,7 @@
         y="0px"
         width="1788.209px"
         height="848.758px"
-        viewBox="0 0 1788.209 848.758"
+        viewBox="0 80 1788.209 848.758"
         enable-background="new 0 0 1788.209 848.758"
         xml:space="preserve"
       >
@@ -1233,7 +1233,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MW)
             </text>
             <text
               transform="matrix(1 0 0 1 1082.4431 341.554)"
@@ -1268,7 +1268,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1082.4431 361.9807)"
@@ -1280,82 +1280,6 @@
             </text>
           </g>
           <rect
-            x="1012.299"
-            y="408.355"
-            opacity="0.9"
-            fill="#162320"
-            enable-background="new    "
-            width="108.178"
-            height="17.293"
-          />
-          <rect
-            x="1012.299"
-            y="427.525"
-            opacity="0.9"
-            fill="#162320"
-            enable-background="new    "
-            width="108.178"
-            height="17.293"
-          />
-          <rect
-            x="1012.299"
-            y="465.12"
-            opacity="0.9"
-            fill="#162320"
-            enable-background="new    "
-            width="108.178"
-            height="17.293"
-          />
-          <g>
-            <text
-              transform="matrix(1 0 0 1 1015.3396 420.5793)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="10.652"
-            >
-              油面温度1(℃):
-            </text>
-          </g>
-          <g>
-            <text
-              transform="matrix(1 0 0 1 1015.3406 439.5793)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="10.652"
-            >
-              油面温度1(℃):
-            </text>
-          </g>
-          <rect
-            x="1012.299"
-            y="446.015"
-            opacity="0.9"
-            fill="#162320"
-            enable-background="new    "
-            width="108.178"
-            height="17.293"
-          />
-          <g>
-            <text
-              transform="matrix(1 0 0 1 1015.3406 458.0686)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="10.652"
-            >
-              绕阻温度1(℃):
-            </text>
-          </g>
-          <g>
-            <text
-              transform="matrix(1 0 0 1 1056.9753 478.259)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="10.652"
-            >
-              挡位 :
-            </text>
-          </g>
-          <rect
             x="554.709"
             y="103.2"
             opacity="0.9"
@@ -1449,7 +1373,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 595.9578 157.7942)"
@@ -1939,7 +1863,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MW)
             </text>
             <text
               transform="matrix(1 0 0 1 91.4441 445.3)"
@@ -1974,7 +1898,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.4431 465.7268)"
@@ -2114,7 +2038,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MW)
             </text>
             <text
               transform="matrix(1 0 0 1 1712.4441 445.3)"
@@ -2149,7 +2073,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1712.4441 465.7278)"
@@ -3212,7 +3136,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MW)
             </text>
             <text
               transform="matrix(1 0 0 1 49.9114 819.7336)"
@@ -3247,7 +3171,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 49.9109 840.1604)"
@@ -5028,14 +4952,14 @@
           <rect
             x="1060.316"
             y="628.239"
-            fill="#AAAAAA"
+            fill="#27963A"
             width="2.854"
             height="7.871"
           />
           <g>
             <line
               fill="none"
-              stroke="#AAAAAA"
+              stroke="#27963A"
               stroke-width="1.6"
               stroke-miterlimit="10"
               x1="1055.979"
@@ -5046,7 +4970,7 @@
 
             <line
               fill="none"
-              stroke="#AAAAAA"
+              stroke="#27963A"
               stroke-width="1.6"
               stroke-miterlimit="10"
               x1="1058.359"
@@ -5057,7 +4981,7 @@
 
             <line
               fill="none"
-              stroke="#AAAAAA"
+              stroke="#27963A"
               stroke-width="1.6"
               stroke-miterlimit="10"
               x1="1060.319"
@@ -6575,48 +6499,6 @@
           <g>
             <g>
               <text
-                transform="matrix(1 0 0 1 1086.5925 421.885)"
-                fill="#1A823B"
-                font-family="'MicrosoftYaHei'"
-                font-size="8.85"
-              >
-                {{ ajaxData.xsymwd1zb1 }}
-              </text>
-            </g>
-            <g>
-              <text
-                transform="matrix(1 0 0 1 1086.5925 439.2395)"
-                fill="#1A823B"
-                font-family="'MicrosoftYaHei'"
-                font-size="8.85"
-              >
-                {{ ajaxData.xsymwd2zb1 }}
-              </text>
-            </g>
-            <g>
-              <text
-                transform="matrix(1 0 0 1 1086.5925 476.9983)"
-                fill="#1A823B"
-                font-family="'MicrosoftYaHei'"
-                font-size="8.85"
-              >
-                {{ ajaxData.xsrzwdzb1 }}
-              </text>
-            </g>
-            <g>
-              <text
-                transform="matrix(1 0 0 1 1086.5925 457.7297)"
-                fill="#1A823B"
-                font-family="'MicrosoftYaHei'"
-                font-size="8.85"
-              >
-                {{ ajaxData.xsdwzb1 }}
-              </text>
-            </g>
-          </g>
-          <g>
-            <g>
-              <text
                 transform="matrix(1 0 0 1 608.7156 116.8137)"
                 fill="#217E3A"
                 font-family="'MicrosoftYaHei'"
@@ -9242,7 +9124,7 @@
           <g v-if="ajaxData.xskg3140 == false" id="_27_">
             <line
               fill="none"
-              stroke="#AAAAAA"
+              stroke="#27963A"
               stroke-width="1.5"
               stroke-miterlimit="10"
               x1="1053.302"
@@ -9251,7 +9133,7 @@
               y2="607.761"
             ></line>
             <path
-              fill="#AAAAAA"
+              fill="#27963A"
               d="M1062.239,621.386c1.437,0,2.604,1.166,2.604,2.602s-1.167,2.602-2.604,2.602
 			c-1.435,0-2.601-1.166-2.601-2.602S1060.807,621.386,1062.239,621.386 M1062.239,619.481c-2.487,0-4.504,2.016-4.504,4.506
 			c0,2.486,2.017,4.504,4.504,4.504c2.488,0,4.506-2.018,4.506-4.504C1066.745,621.495,1064.727,619.481,1062.239,619.481
@@ -9260,7 +9142,7 @@
 
             <line
               fill="none"
-              stroke="#AAAAAA"
+              stroke="#27963A"
               stroke-width="1.5"
               stroke-miterlimit="10"
               x1="1068.554"
@@ -9397,7 +9279,7 @@
             <g v-if="ajaxData.xskg3215" id="_25_">
               <line
                 fill="none"
-                stroke="#AAAAAA"
+                stroke="#9E2224"
                 stroke-width="1.5"
                 stroke-miterlimit="10"
                 x1="724.806"
@@ -9406,7 +9288,7 @@
                 y2="597.702"
               ></line>
               <path
-                fill="#AAAAAA"
+                fill="#9E2224"
                 d="M733.745,611.327c1.436,0,2.604,1.166,2.604,2.602c0,1.434-1.167,2.602-2.604,2.602
 				c-1.435,0-2.601-1.168-2.601-2.602C731.144,612.493,732.313,611.327,733.745,611.327 M733.745,609.425
 				c-2.486,0-4.505,2.016-4.505,4.504s2.019,4.506,4.505,4.506c2.487,0,4.508-2.018,4.508-4.506S736.232,609.425,733.745,609.425
@@ -9415,7 +9297,7 @@
 
               <line
                 fill="none"
-                stroke="#AAAAAA"
+                stroke="#9E2224"
                 stroke-width="1.5"
                 stroke-miterlimit="10"
                 x1="733.745"
@@ -10189,6 +10071,589 @@
 			1090.209,533.169 		"
             />
           </g>
+
+          
+
+          
+          
+          <rect
+            x="42.525"
+            y="221.963"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="115.107"
+            height="18.489"
+          />
+          <rect
+            x="42.525"
+            y="242.46"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="115.107"
+            height="18.488"
+          />
+          <g>
+            <text
+              transform="matrix(1 0 0 1 59.4685 235.9133)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              Ua
+            </text>
+            <text
+              transform="matrix(1 0 0 1 74.2673 235.9133)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (kV)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 92.4441 235.9133)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g>
+          <g>
+            <text
+              transform="matrix(1 0 0 1 52.1946 256.4016)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              Uab
+            </text>
+            <text
+              transform="matrix(1 0 0 1 74.2678 256.4016)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (kV)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 92.4431 256.4016)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g>
+          <rect
+            x="41.533"
+            y="262.989"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="116.102"
+            height="18.49"
+          />
+          <rect
+            x="41.533"
+            y="283.485"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="116.102"
+            height="18.49"
+          />
+          <g>
+            <text
+              transform="matrix(1 0 0 1 68.9172 276.9397)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              la
+            </text>
+            <text
+              transform="matrix(1 0 0 1 78.2449 276.9397)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (A)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 91.4431 276.9397)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g>
+          <g>
+            <text
+              transform="matrix(1 0 0 1 63.0144 295.3)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              P
+            </text>
+            <text
+              transform="matrix(1 0 0 1 69.9836 295.3)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (MW)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 91.4441 295.3)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g>
+          <rect
+            x="41.533"
+            y="303.913"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="116.102"
+            height="18.49"
+          />
+          <g>
+            <text
+              transform="matrix(1 0 0 1 54.9919 315.7268)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              Q
+            </text>
+            <text
+              transform="matrix(1 0 0 1 64.2747 315.7268)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (MVar)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 91.4431 315.7268)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g><g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 105.1995 236.5793)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xsuakvzb2zs }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 105.1995 255.4514)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xsuabkvzb2zs }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 105.1995 277.6047)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xslaazb2s }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 105.1995 295.3)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xspmwzb2s }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 105.1995 315.7268)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xsqkvarzb2s }}
+              </text>
+            </g>
+          </g>
+          
+          
+
+
+          <rect
+            x="1042.525"
+            y="381.963"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="115.107"
+            height="18.489"
+          />
+          <rect
+            x="1042.525"
+            y="402.46"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="115.107"
+            height="18.488"
+          />
+          <g>
+            <text
+              transform="matrix(1 0 0 1 1059.4685 395.9133)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              Ua
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1074.2673 395.9133)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (kV)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1092.4441 395.9133)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g>
+          <g>
+            <text
+              transform="matrix(1 0 0 1 1052.1946 416.4016)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              Uab
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1074.2678 416.4016)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (kV)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1092.4431 416.4016)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g>
+          <rect
+            x="1041.533"
+            y="422.989"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="116.102"
+            height="18.49"
+          />
+          <rect
+            x="1041.533"
+            y="443.485"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="116.102"
+            height="18.49"
+          />
+          <g>
+            <text
+              transform="matrix(1 0 0 1 1068.9172 436.9397)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              la
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1078.2449 436.9397)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (A)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1091.4431 436.9397)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g>
+          <g>
+            <text
+              transform="matrix(1 0 0 1 1063.0144 455.3)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              P
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1069.9836 455.3)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (MW)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1091.4441 455.3)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g>
+          <rect
+            x="1041.533"
+            y="463.913"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="116.102"
+            height="18.49"
+          />
+          <g>
+            <text
+              transform="matrix(1 0 0 1 1054.9919 475.7268)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              Q
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1064.2747 475.7268)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="9.6234"
+            >
+              (MVar)
+            </text>
+            <text
+              transform="matrix(1 0 0 1 1091.4431 475.7268)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="11.3899"
+            >
+              :
+            </text>
+          </g><g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 1105.1995 396.5793)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xsuakvzb1d }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 1105.1995 415.4514)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xsuabkvzb1d }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 1105.1995 437.6047)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xslaazb1d }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 1105.1995 455.3)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xspkwzb1d }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 1105.1995 475.7268)"
+                fill="#1D833B"
+                font-family="'MicrosoftYaHei'"
+                font-size="9.463"
+              >
+                {{ ajaxData.xsqkvarzb1d }}
+              </text>
+            </g>
+          </g>
+
+
+
+          <rect
+            x="912.299"
+            y="408.355"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="108.178"
+            height="17.293"
+          />
+          <rect
+            x="912.299"
+            y="427.525"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="108.178"
+            height="17.293"
+          />
+          <rect
+            x="912.299"
+            y="465.12"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="108.178"
+            height="17.293"
+          />
+          <g>
+            <text
+              transform="matrix(1 0 0 1 915.3396 420.5793)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="10.652"
+            >
+              油面温度1(℃):
+            </text>
+          </g>
+          <g>
+            <text
+              transform="matrix(1 0 0 1 915.3406 439.5793)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="10.652"
+            >
+              油面温度1(℃):
+            </text>
+          </g>
+          <rect
+            x="912.299"
+            y="446.015"
+            opacity="0.9"
+            fill="#162320"
+            enable-background="new    "
+            width="108.178"
+            height="17.293"
+          />
+          <g>
+            <text
+              transform="matrix(1 0 0 1 915.3406 458.0686)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="10.652"
+            >
+              绕阻温度1(℃):
+            </text>
+          </g>
+          <g>
+            <text
+              transform="matrix(1 0 0 1 956.9753 478.259)"
+              fill="#97A1A2"
+              font-family="'MicrosoftYaHei'"
+              font-size="10.652"
+            >
+              挡位 :
+            </text>
+          </g>
+          <g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 986.5925 421.885)"
+                fill="#1A823B"
+                font-family="'MicrosoftYaHei'"
+                font-size="8.85"
+              >
+                {{ ajaxData.xsymwd1zb1 }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 986.5925 439.2395)"
+                fill="#1A823B"
+                font-family="'MicrosoftYaHei'"
+                font-size="8.85"
+              >
+                {{ ajaxData.xsymwd2zb1 }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 986.5925 476.9983)"
+                fill="#1A823B"
+                font-family="'MicrosoftYaHei'"
+                font-size="8.85"
+              >
+                {{ ajaxData.xsrzwdzb1 }}
+              </text>
+            </g>
+            <g>
+              <text
+                transform="matrix(1 0 0 1 986.5925 457.7297)"
+                fill="#1A823B"
+                font-family="'MicrosoftYaHei'"
+                font-size="8.85"
+              >
+                {{ ajaxData.xsdwzb1 }}
+              </text>
+            </g>
+          </g>
+
         </g>
       </svg>
     </template>

src/views/WindSite/components/generalappearance/mhs.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-           <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1410.332px" height="526.828px" viewBox="0 0 1410.332 526.828" enable-background="new 0 0 1395.332 526.828" xml:space="preserve">
+           <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1410.332px" height="526.828px" viewBox="0 70 1410.332 526.828" enable-background="new 0 0 1395.332 526.828" xml:space="preserve">
            <g id="s_x5F_fan">
            	<g>
            		<g>

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

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1497.576px" height="815.74px" viewBox="0 0 1497.576 815.74" enable-background="new 0 0 1497.576 815.74" xml:space="preserve">
+            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1497.576px" height="815.74px" viewBox="0 50 1497.576 815.74" enable-background="new 0 0 1497.576 815.74" xml:space="preserve">
             <g id="other">
             	<g>
             		<text transform="matrix(1 0 0 1 36.5847 21.1748)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.3679">运</text>

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

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1830px" height="804px" viewBox="0 0 1830 804" enable-background="new 0 0 1830 804" xml:space="preserve">
+            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1830px" height="804px" viewBox="0 50 1830 804" enable-background="new 0 0 1830 804" xml:space="preserve">
 				<g xmlns="http://www.w3.org/2000/svg">
 					<g id="s_x5F_fan">
 						<g>

src/views/WindSite/components/generalappearance/sbq.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1794px" height="788px" viewBox="0 0 1794 788" enable-background="new 0 0 1794 788" xml:space="preserve">
+            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1794px" height="788px" viewBox="0 50 1794 788" enable-background="new 0 0 1794 788" xml:space="preserve">
             <g id="other">
             	<g opacity="0.6">
             		<path opacity="0.4" fill="#114832" enable-background="new    " d="M44.605,133.222c0,0.709-0.574,1.281-1.283,1.281H8.933    c-0.709,0-1.283-0.572-1.283-1.281v-22.84c0-0.709,0.574-1.281,1.283-1.281h34.392c0.709,0,1.282,0.572,1.282,1.281    L44.605,133.222L44.605,133.222z"></path>

src/views/layout/Menu.vue

@@ -801,6 +801,11 @@ export default {
                   path: "/others/historySearch",
                 },
 				{
+				  text: "气象历史数据",
+				  icon: "svg-wind-site",
+				  path: "/others/weather",
+				},
+				{
 				  text: "数据导出",
 				  icon: "svg-wind-site",
 				  path: "/others/ExportExcel",

src/views/report/ExportExcel.vue

@@ -69,19 +69,14 @@
 		data() {
 			const that = this;
 			return {
-				single:false,
-				rqChecked:true,
-				sjChecked:true,
-				checkList: [],
-				tableIdArr: [], //放checkbox的id数组
-				tableData: [],
-				value1: [],
-				inputVal: [],
-				inputInterval: 1800,
-				options: [],
-				value2: [],
-				startTs: [],
-				endTs: [],
+				single:false,//单击导出状态【点击后，用于判断其状态，为true时，loading显示】
+				rqChecked:true,//日期单击checkbox状态【为true时，下方任意日期选择与当前选择同步】
+				sjChecked:true,//时间间隔checkbox状态【为true时，下方任意时间选择与当前选择同步】
+				tableData: [],//表格数据
+				value1: [],//日期数组，默认一个月的，当用户改变某一个时，找到对应下标去改数据
+				inputVal: [],//时间同上
+				startTs: [],//起始时间，通过下标去找对应的时间
+				endTs: [],//结束时间
 				muBan: {
 					type1: ['数据时间', 'scada风速（m/s）', 'scada功率（kW）', '是否故障（故障=1，不故障=0）', '是否限电（限电=1，不限电=0）'],
 					type2: [
@@ -90,19 +85,19 @@
 						['数据时间', '轮毂高度平均风速（m/s）', '轮毂高度平均风向（°）', '温度（℃）', '压强（hPa）', '湿度（%）']
 					],
 				},
-				templateId: 1,
-				stations: [],
-				paths: [],
-				pathName: [],
+				templateId: 1,//模板默认为1
+				stations: [],//场站名
+				paths: [],//excel的所有数据，最终给zip传
+				pathName: [],//excel的名字
 				zipNames: [],
-				tempArrayS: [],
+				tempArrayS: [],//模板2时，遍历里面的数据
 			}
 		},
 		created() {
 			this.tableVal();
 		},
 		methods: {
-			value1Change(index){
+			value1Change(index){//日期数组，默认一个月的，当用户改变某一个时，找到对应下标去改数据
 				if(this.rqChecked){
 					var date = this.value1[index];
 					this.value1 = [];
@@ -127,12 +122,13 @@
 			sjCheck(){
 				this.sjChecked=event.target.checked
 			},
-			typeClick(a){
+			typeClick(a){//模板切换，改变按钮颜色
 				this.templateId = a;
 			},
-			thisExport(index) {
+			thisExport(index) {//当前导出，index为下标
 				let that = this;
 				that.single = true;
+				// 下面的是通过下标找到对应的数据,请求ajax
 				that.time(index, that.value1[index]);
 				that.stations[index] = that.tableData[index].value;
 				that.allExportF(0, index);
@@ -144,30 +140,19 @@
 					subUrl: "export/databases",
 					success(res) {
 						if (res.code === 200) {
-							const arr = [];
-							const arr2 = [];
 							const arr3 = [];
 							const arr4 = [];
 							var data = []; //项目列表
 							res.data.forEach((item,index) => {
 								const value = Object.keys(item)[0];
-								arr.push({
-									value: value,
-									label: item[value]
-								})
-								arr2.push(value + '/' + item[value]);
 								arr3.push(value);
 								arr4.push(item[value]);
-
 								data.push({
 									fdc: item[value],
 									value: value,
 								});
 								that.inputVal.push(1800);
-								that.checkList.push(index);
 							})
-							that.options = arr;
-							that.value2 = arr2;
 							that.stations = arr3;
 							that.zipNames = arr4;
 							that.tableData = data;
@@ -191,16 +176,13 @@
 					this.time(index, [start, end]);
 				})
 			},
-			handleCommand(command) {
-				this.templateId = command;
-			},
-			formatJson(filterVal, jsonData) {
+			formatJson(filterVal, jsonData) {//模板1时，转数据格式
 				return jsonData.map(v => filterVal.map(j => v[j]));
 			},
-			allExport() {
+			allExport() {//一键导出
 				this.allExportF(0);
 			},
-			allExportF(_index, thisIndex) {
+			allExportF(_index, thisIndex) {//_index递归递增，thisIndex单击导出【下标】
 				BASE.showLoading({text:'正在导出，请耐心等待...'});
 				const that = this;
 				if (that.stations[_index]) {
@@ -216,13 +198,13 @@
 						},
 						success(res) {
 							if (res.code == 200) {
-								if (thisIndex!=undefined) {
-									if (that.templateId == 1) {
+								if (thisIndex!=undefined) {//一键导出
+									if (that.templateId == 1) {//模板1
 										that.export(res.data, 0, that.zipNames[thisIndex]);
-									} else if (that.templateId == 2) {
+									} else if (that.templateId == 2) {//模板2
 										that.exportMuban2(res.data, 0, that.zipNames[thisIndex]);
 									}
-								} else {
+								} else {//单击导出
 									if (that.templateId == 1) {
 										that.export(res.data, 0, that.zipNames[_index], ++_index);
 									} else if (that.templateId == 2) {
@@ -235,6 +217,7 @@
 				}
 			},
 			export (data, _index, zipName, deepIndex) {
+				// deepIndex判断单击或一键
 				const that = this;
 				let tHeader = that.muBan['type' + that.templateId];
 				var dataKey = Object.keys(data);
@@ -253,7 +236,6 @@
 						tempObject = {};
 					})
 
-					// 上面的index、nickName、name是tableData里对象的属性key值
 					data[key][0].forEach((ele, index) => {
 						filterVal.push(index);
 					});
@@ -304,7 +286,6 @@
 						tempObject = {};
 					})
 
-					// 上面的index、nickName、name是tableData里对象的属性key值
 					that.tempArrayS.push(tempArray);
 					_index++;
 					if (dataKey.length == that.tempArrayS.length) {
@@ -397,19 +378,10 @@
 						}
 					})
 			},
-			time(index, val) {
+			time(index, val) {//时间转时间戳
 				this.startTs[index] = Date.parse(new Date(val[0]));
 				this.endTs[index] = Date.parse(new Date(val[1]) + 86400000);
 			},
-			changeSelect(val) {
-				this.stations = [];
-				this.zipNames = [];
-				val.forEach(ele => {
-					var key = ele.split('/');
-					this.stations.push(key[0]);
-					this.zipNames.push(key[1]);
-				})
-			},
 		},
 	}
 </script>

src/views/report/weather.vue

@@ -0,0 +1,275 @@
+<template>
+	<div>
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">开始日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="startDate" type="date" placeholder="开始日期" popper-class="date-select"
+							value-format="YYYY-MM-DD"></el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">结束日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="endDate" type="date" placeholder="结束日期" popper-class="date-select"
+							value-format="YYYY-MM-DD"></el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">场站：</div>
+					<div class="search-input">
+						<el-select v-model="stationId" clearable placeholder="请选择" popper-class="select">
+							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-actions">
+					<button class="btn green" @click="getTable()">查询</button>
+					<button class="btn green" @click="exportCsv()">导出</button>
+				</div>
+			</div>
+		</div>
+		<div class="table-box">
+			<div class="title">升压站报警</div>
+			<ComTable ref="curRef" :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="73vh"
+				v-loading="tableLoading" element-loading-text="拼命加载中.." element-loading-background="rgba(0, 0, 0, 0.8)">
+			</ComTable>
+		</div>
+	</div>
+</template>
+<script>
+	import ComTable from "@/components/coms/table/table.vue";
+	import Papa from 'papaparse';
+	export default {
+		name: "boosterAlarm",
+		components: {
+			ComTable,
+			Papa
+		},
+		data() {
+			let that = this;
+			return {
+				ChangZhan: [],
+				stationId: "XS_FDC",
+				startDate: "",
+				endDate: "",
+				tableLoading: true,
+				pageNum: 1,
+				pageSize: 20,
+				tableData: {
+					column: [{
+						name: "记录日期",
+						field: "recodedata",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "地点",
+						field: "region",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "气象",
+						field: "weather",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "最高温度（℃）",
+						field: "maximumtem",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "最低温度（℃）",
+						field: "minimumtem",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "日出时间",
+						field: "sunrise",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "日落时间",
+						field: "sunset",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "白气象",
+						field: "weather1",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "夜气象",
+						field: "weather2",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "白温度（℃）",
+						field: "temperature1",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "夜温度（℃）",
+						field: "temperature2",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "白体感（℃）",
+						field: "realfeel1",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "夜体感（℃）",
+						field: "realfeel2",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "白降水（ml）",
+						field: "precipitation1",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "夜降水（ml）",
+						field: "precipitation2",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "白风向",
+						field: "winddirection1",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "夜风向",
+						field: "winddirection2",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "白风速(m/s)",
+						field: "speed1",
+						is_num: false,
+						is_light: false,
+					}, {
+						name: "夜风速(m/s)",
+						field: "speed2",
+						is_num: false,
+						is_light: false,
+					}, ],
+					data: [],
+					currentPageTotal: 0
+				}
+			};
+		},
+		created() {
+			this.ChangZhanVal();
+			let end = new Date();
+			let start = new Date(end.getTime() - 1 * 24 * 60 * 60 * 1000);
+			this.endDate = end.formatDate("yyyy-MM-dd");
+			this.startDate = start.formatDate("yyyy-MM-dd");
+			this.getTable();
+		},
+		methods: {
+			exportCsv() {
+				var csv = Papa.unparse(this.tableData);
+				//定义文件内容，类型必须为Blob 否则createObjectURL会报错
+				let content = new Blob([csv]);
+				//生成url对象
+				let urlObject = window.URL || window.webkitURL || window;
+				let url = urlObject.createObjectURL(content);
+				//生成<a></a>DOM元素
+				let el = document.createElement("a");
+				//链接赋值
+				el.href = url;
+				el.download = "文件导出.cvs";
+				//必须点击否则不会下载
+				el.click();
+				//移除链接释放资源
+				urlObject.revokeObjectURL(url);
+			},
+			// 场站
+			ChangZhanVal() {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					subUrl: "powercompare/windfarmAjax",
+					success(res) {
+						that.ChangZhan = res.data;
+						that.stationId = res.data[0].id;
+					}
+				});
+			},
+			getTable() {
+				let that = this;
+				this.tableLoading = true;
+				this.API.requestData({
+					timeout: 30000,
+					method: "GET",
+					subUrl: "weather/history/list",
+					data: {
+						wpId: this.stationId,
+						startTs: this.startDate,
+						endTs: this.endDate,
+						pageNum: this.pageNum,
+						pageSize: this.pageSize,
+					},
+					success(res) {
+						console.log(res)
+						var dataTab = [];
+						res.data.list.forEach(item => {
+							dataTab.push({ //表格
+								recodedata: that.formatTime(item.recodedata),
+								region: item.region,
+								weather: item.weather,
+								maximumtem: item.maximumtem,
+								minimumtem: item.minimumtem,
+								sunrise: item.sunrise,
+								sunset: item.sunset,
+								weather1: item.weather1,
+								weather2: item.weather2,
+								temperature1: item.temperature1,
+								temperature2: item.temperature2,
+								realfeel1: item.realfeel1,
+								realfeel2: item.realfeel2,
+								precipitation1: item.precipitation1,
+								precipitation2: item.precipitation2,
+								winddirection1: item.winddirection1,
+								winddirection2: item.winddirection2,
+								speed1: item.speed1,
+								speed2: item.speed2
+							})
+						})
+						that.tableData.data = dataTab;
+						that.tableLoading = false;
+						that.tableData.total = res.data.total;
+					}
+				});
+			},
+			formatTime(value) {
+				if (typeof(value) == 'undefined') {
+					return ''
+				} else {
+					let date = new Date(parseInt(value))
+					let y = date.getFullYear()
+					let MM = date.getMonth() + 1
+					MM = MM < 10 ? ('0' + MM) : MM
+					let d = date.getDate()
+					d = d < 10 ? ('0' + d) : d
+					return y + '-' + MM + '-' + d
+				}
+			},
+			onChangePage(params) {
+				console.log(params)
+				this.pageNum = params.pageNum;
+				this.pageSize = params.pageSize;
+				this.getTable();
+			},
+		}
+	};
+</script>
+<style scoped>
+	.title {
+		background: rgba(255, 255, 255, 0.1);
+		margin-bottom: 8px;
+		padding: 1vh;
+	}
+</style>