1.升压站和总貌图点位改；2.导出Excel加进度功能；3.sisview改宽度

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

@@ -14,7 +14,7 @@
               y="0px"
               width="1681.668px"
               height="806.571px"
-              viewBox="0 80 1718.668 806.571"
+              viewBox="0 0 1718.668 806.571"
               enable-background="new 0 0 1681.668 806.571"
               xml:space="preserve"
             >
@@ -178,7 +178,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5445,7 +5445,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5545,7 +5545,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5645,7 +5645,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5745,7 +5745,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5845,7 +5845,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"

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

@@ -259,7 +259,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 664.6775 96.584)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 96.584)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -273,7 +273,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 654.8049 118.8701)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 118.8701)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -307,7 +307,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 664.6775 241.7939)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 241.7939)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -321,7 +321,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 654.8049 264.0801)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 264.0801)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">

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

@@ -14,7 +14,7 @@
               y="0px"
               width="1617.869px"
               height="1130.968px"
-              viewBox="0 80 1617.869 1200.968"
+              viewBox="0 0 1617.869 1200.968"
               enable-background="new 0 0 1617.869 1130.968"
               xml:space="preserve"
             >
@@ -4792,7 +4792,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.4551"
                     >
-                      MW
+                      kW
                     </text>
                     <text
                       transform="matrix(1 0 0 1 39.1521 1062.0347)"
@@ -4816,7 +4816,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.4551"
                     >
-                      MVar
+                      kVar
                     </text>
                     <text
                       transform="matrix(1 0 0 1 39.1521 1094.1343)"

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

@@ -7,7 +7,7 @@
 
 						<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="1932.596px" height="894.189px"
-							viewBox="-30 70 1920.596 914.189" enable-background="new 0 0 1922.596 894.189"
+							viewBox="-30 0 1920.596 914.189" enable-background="new 0 0 1922.596 894.189"
 							xml:space="preserve">
 							<g id="other">
 								<path fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -2831,7 +2831,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 -10.5789 867.3301)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											Mw
+											kW
 										</text>
 										<text transform="matrix(1 0 0 1 2.8728 867.3301)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -2843,7 +2843,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 -15.6868 893.1807)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											MVar
+											kVar
 										</text>
 										<text transform="matrix(1 0 0 1 2.8728 893.1807)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -2879,7 +2879,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 1606.0286 113.8252)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(kW)
+											(MW)
 										</text>
 										<text transform="matrix(1 0 0 1 1627.4875 113.8252)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2893,7 +2893,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 1600.3196 136.1104)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(kVar)
+											(MVar)
 										</text>
 										<text transform="matrix(1 0 0 1 1627.4875 136.1104)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">

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

@@ -14,7 +14,7 @@
               y="0px"
               width="1848.938px"
               height="829.936px"
-              viewBox="0 80 1848.938 829.936"
+              viewBox="0 0 1848.938 829.936"
               enable-background="new 0 0 1848.938 829.936"
               xml:space="preserve"
             >
@@ -512,7 +512,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 239.0789 296.7874)"
@@ -538,7 +538,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 239.0789 319.0725)"
@@ -1335,7 +1335,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 506.6316 297.5061)"
@@ -1361,7 +1361,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 506.6316 319.7913)"
@@ -2013,7 +2013,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 765.3103 297.5061)"
@@ -2039,7 +2039,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 765.3098 319.7913)"
@@ -2165,7 +2165,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1041.0198 298.51)"
@@ -2191,7 +2191,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1041.0198 320.7952)"
@@ -2847,7 +2847,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1687.7151 298.51)"
@@ -2873,7 +2873,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1687.7151 320.7952)"
@@ -3442,7 +3442,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1348.2288 298.51)"
@@ -3468,7 +3468,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1348.2268 320.7952)"
@@ -4180,7 +4180,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 739.5056 139.5452)"
@@ -4206,7 +4206,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 739.5056 161.8303)"
@@ -4304,7 +4304,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1355.8752 129.2971)"
@@ -4330,7 +4330,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1355.8733 151.5823)"
@@ -4468,7 +4468,7 @@
                   font-family="'MicrosoftYaHei'"
                   font-size="15"
                 >
-                  输出功率(kW):
+                  输出功率(MM):
                 </text>
               </g>
               <g id="arrow">

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

@@ -6,7 +6,7 @@
 					<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="1853.732px" height="885.063px"
-							viewBox="0 80 1853.732 885.063" enable-background="new 0 0 1853.732 885.063"
+							viewBox="0 0 1853.732 885.063" enable-background="new 0 0 1853.732 885.063"
 							xml:space="preserve">
 							<g id="other_1_">
 								<path fill="none" stroke="#42B0A8" stroke-width="2.5" stroke-miterlimit="10"
@@ -130,7 +130,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 166.8015 82.063)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 188.2629 82.063)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -162,7 +162,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 927.3142 86.4722)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 948.7742 86.4722)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -258,7 +258,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1720.8406 191.0923)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 1742.3005 191.0923)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -290,7 +290,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1591.4314 74.6606)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 1612.8914 74.6606)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -306,7 +306,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1585.7214 95.0884)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1612.8914 95.0884)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">

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

@@ -14,7 +14,7 @@
               y="0px"
               width="1755.701px"
               height="853.164px"
-              viewBox="0 80 1755.701 853.164"
+              viewBox="0 0 1755.701 853.164"
               enable-background="new 0 0 1755.701 853.164"
               xml:space="preserve"
             >
@@ -86,7 +86,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1116.6396 32.3096)"
@@ -112,7 +112,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1116.6396 54.5947)"
@@ -284,7 +284,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 264.3535 306.2197)"
@@ -310,7 +310,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 264.3535 328.5049)"
@@ -411,7 +411,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 264.3535 465.2539)"
@@ -437,7 +437,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 264.3535 487.5391)"
@@ -538,7 +538,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1323.8809 306.2197)"
@@ -564,7 +564,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1323.8809 328.5049)"
@@ -665,7 +665,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1323.8809 465.2539)"
@@ -691,7 +691,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1323.8809 487.5391)"

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

@@ -15,7 +15,7 @@
               y="0px"
               width="1313.34px"
               height="587.686px"
-              viewBox="0 50 1313.34 587.686"
+              viewBox="0 0 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(kW)
+                        P(MM)
                       </text>
                     </g>
                     <g>
@@ -2689,7 +2689,7 @@
                         font-family="'MicrosoftYaHei'"
                         font-size="10.652"
                       >
-                        Q(kVar)
+                        Q(MVar)
                       </text>
                     </g>
                   </g>

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

@@ -7,7 +7,7 @@
 						
 <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="1864.602px" height="860.264px"
-							viewBox="0 80 1864.602 860.264" enable-background="new 0 0 1864.602 860.264"
+							viewBox="0 0 1864.602 860.264" enable-background="new 0 0 1864.602 860.264"
 							xml:space="preserve">
 							<g id="other">
 								<rect x="25.503" y="60.704" opacity="0.9" fill="#162320" enable-background="new    "
@@ -35,7 +35,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 53.9529 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 75.4124 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -51,7 +51,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 48.2439 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 75.4124 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -107,7 +107,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 727.2854 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 748.7454 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -123,7 +123,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 721.5764 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 748.7454 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -1016,7 +1016,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1395.4182 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 1416.8792 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -1032,7 +1032,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1389.7092 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1416.8792 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2383,7 +2383,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 408.8977 461.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 430.3572 461.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2397,7 +2397,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 403.1882 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 430.3572 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2443,7 +2443,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 896.7292 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 918.1887 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2457,7 +2457,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 891.0208 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 918.1887 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2503,7 +2503,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1298.7834 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 1320.2424 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2517,7 +2517,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1293.0745 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1320.2424 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2563,7 +2563,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1418.9377 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 1440.3967 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2577,7 +2577,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1413.2288 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1440.3967 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">

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

@@ -11,7 +11,7 @@
         y="0px"
         width="1918px"
         height="879.725px"
-        viewBox="0 80 1918 879.725"
+        viewBox="0 0 1918 879.725"
         enable-background="new 0 0 1918 879.725"
         xml:space="preserve"
       >
@@ -110,7 +110,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1048.5251 88.1272)"
@@ -676,7 +676,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7498 234.0979)"
@@ -702,7 +702,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7493 256.3821)"
@@ -816,7 +816,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 549.0823 388.0686)"
@@ -842,7 +842,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 549.0823 410.3547)"
@@ -956,7 +956,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7498 493.3762)"
@@ -982,7 +982,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7493 515.6604)"
@@ -1096,7 +1096,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 352.1238 523.7493)"
@@ -1194,7 +1194,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 768.5061 352.0559)"
@@ -1220,7 +1220,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 768.5061 374.343)"
@@ -1318,7 +1318,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 994.5212 352.0559)"
@@ -1344,7 +1344,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 994.5212 374.343)"
@@ -2711,7 +2711,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1243.8181 374.343)"
@@ -2835,7 +2835,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1458.8123 489.2522)"
@@ -2959,7 +2959,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1669.8123 489.2522)"
@@ -8218,7 +8218,7 @@
                 font-family="'MicrosoftYaHei'"
                 font-size="12.1437"
               >
-                (kW)
+                (MM)
               </text>
               <text
                 transform="matrix(1 0 0 1 45.3665 864.7239)"

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

@@ -11,7 +11,7 @@
         y="0px"
         width="1788.209px"
         height="848.758px"
-        viewBox="0 80 1788.209 848.758"
+        viewBox="0 0 1788.209 848.758"
         enable-background="new 0 0 1788.209 848.758"
         xml:space="preserve"
       >
@@ -2213,7 +2213,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 1712.9412 189.844)"
@@ -2248,7 +2248,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1712.9412 210.2727)"

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 86 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 46 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/WindSite/components/generalappearance/xh.vue

@@ -6,7 +6,7 @@
 					<template v-slot:svg>
 						<svg class="svg" version="1.0" id="图层_1" xmlns="http://www.w3.org/2000/svg"
 							xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1374px" height="557.86px"
-							viewBox="0 90 1374 557.86" enable-background="new 0 0 1374 557.86" xml:space="preserve">
+							viewBox="0 40 1374 557.86" enable-background="new 0 0 1374 557.86" xml:space="preserve">
 							<g id="other">
 								<polygon fill="#B6065C" points="1314.454,24.469 1322.343,5.755 1330.232,24.472 	" />
 								<rect x="1321.816" y="24.5" fill="#B6065C" width="1.375" height="49.073" />

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

@@ -11,10 +11,10 @@
               xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
               x="0px"
-              y="0px"
+              y="30px"
               width="1399.132px"
               height="800px"
-              viewBox="0 65 1399.132 629.341"
+              viewBox="0 35 1399.132 629.341"
               enable-background="new 0 0 1399.132 629.341"
               xml:space="preserve"
             >

src/views/WindSite/components/previewPicture.vue

@@ -96,7 +96,7 @@ export default {
       isChange: true,
       // 图片显示默认大小
       width: "1600px",
-      height: "1000px",
+      height: "800px",
       // 可缩小倍数,为空则可无限缩小
       minification: 3,
       // 可放大倍数 为空则可无限放大

src/views/report/ExportExcel.vue

@@ -183,8 +183,9 @@
 				this.allExportF(0);
 			},
 			allExportF(_index, thisIndex) {//_index递归递增，thisIndex单击导出【下标】
-				BASE.showLoading({text:'正在导出，请耐心等待...'});
 				const that = this;
+				var loadingName = thisIndex!=undefined?'正在导出'+that.zipNames[thisIndex]:(that.zipNames[_index]!=undefined?'正在导出'+that.zipNames[_index]:'正在合成压缩包');
+				BASE.showLoading({text: loadingName +'，请耐心等待...'});
 				if (that.stations[_index]) {
 					that.API.requestData({
 						method: "GET",
@@ -247,7 +248,7 @@
 					if (deepIndex!=undefined) {
 						setTimeout(() => {
 							that.export(data, _index, zipName, deepIndex);
-						}, 500);
+						}, 1000);
 						if (dataKey.length == _index) { //当长度一致时，向zip塞值
 							var thisPath = that.paths,
 								thisPathName = that.pathName;
@@ -258,7 +259,7 @@
 					} else {
 						setTimeout(() => {
 							that.export(data, _index, zipName);
-						}, 500);
+						}, 1000);
 						if (dataKey.length == _index) { //当长度一致时，向zip塞值
 							var thisPath = that.paths,
 								thisPathName = that.pathName;

src/views/sisView/index.vue

@@ -367,6 +367,11 @@ export default {
 
     &:first-child {
       margin: 0;
+	  .contentItem {
+		  .itemNum {
+			width: 157px !important;
+		  }
+	  }
     }
 
     .viewTitle {