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

src/assets/icon/svg/weather/01.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/02.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M157.176,53.332c-3.314,0-6-2.687-6-6V5.933c0-3.313,2.686-6,6-6c3.313,0,6,2.687,6,6v41.399

src/assets/icon/svg/weather/03.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M157.176,53.332c-3.314,0-6-2.687-6-6V5.933c0-3.313,2.686-6,6-6c3.313,0,6,2.687,6,6v41.399

src/assets/icon/svg/weather/04.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/05.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M157.328,53.332c-3.313,0-6-2.687-6-6V5.933c0-3.313,2.687-6,6-6c3.314,0,6,2.687,6,6v41.399

src/assets/icon/svg/weather/06.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st0" d="M91.658,65.527c-3.313,0-6-2.687-6-6V32.322c0-3.313,2.687-6,6-6s6,2.687,6,6v27.205
 		C97.658,62.84,94.972,65.527,91.658,65.527z"/>

src/assets/icon/svg/weather/07.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st1" d="M157.176,90.517c19.059,0,37.258,8.195,49.932,22.484l4.035,4.55l6.055-0.564

src/assets/icon/svg/weather/08.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st1" d="M198.144,223.983H71.987c-18.593,0-33.719-15.126-33.719-33.719c0-18.593,15.126-33.719,33.719-33.719
 		c1.798,0,3.634,0.15,5.459,0.447l11.939,1.939l1.844-11.955c2.402-15.566,10.327-29.85,22.315-40.221

src/assets/icon/svg/weather/11.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <path class="st1" d="M38.885,157.458c2.997-15.544,16.696-27.324,33.102-27.324c1.798,0,3.635,0.15,5.46,0.447l11.938,1.939
 	l1.845-11.955c2.401-15.566,10.327-29.85,22.315-40.221c12.105-10.472,27.601-16.239,43.631-16.239
 	c19.059,0,37.259,8.195,49.933,22.484l4.035,4.55l6.055-0.564c1.773-0.165,3.425-0.246,5.049-0.246

src/assets/icon/svg/weather/12.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/13.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M91.658,38.861c-3.313,0-6-2.687-6-6V5.657c0-3.313,2.687-6,6-6s6,2.687,6,6v27.204

src/assets/icon/svg/weather/14.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M137.539,47.947c-3.314,0-6-2.687-6-6V5.933c0-3.313,2.686-6,6-6c3.313,0,6,2.687,6,6v36.014

src/assets/icon/svg/weather/15.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <path class="st1" d="M222.247,78.33c-2.079,0-4.132,0.108-6.161,0.297c-14.424-16.262-35.464-26.522-58.91-26.522
 	c-39.367,0-71.983,28.894-77.806,66.631c-2.404-0.391-4.869-0.602-7.383-0.602c-25.51,0-46.14,20.893-45.712,46.5
 	c0.419,25.068,21.393,44.937,46.465,44.937h57.905c2.106,0,4.059-1.105,5.143-2.911l0,0c2.402-3.999-0.479-9.089-5.143-9.089H72.658

src/assets/icon/svg/weather/16.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M91.658,38.861c-3.313,0-6-2.687-6-6V5.657c0-3.313,2.687-6,6-6c3.313,0,6,2.687,6,6v27.204

src/assets/icon/svg/weather/17.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M137.539,47.947c-3.313,0-6-2.687-6-6V5.933c0-3.313,2.687-6,6-6c3.313,0,6,2.687,6,6v36.014

src/assets/icon/svg/weather/18.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/19.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/20.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M91.658,38.861c-3.313,0-6-2.687-6-6V5.657c0-3.313,2.687-6,6-6c3.313,0,6,2.686,6,6v27.204

src/assets/icon/svg/weather/21.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M137.539,47.947c-3.313,0-6-2.687-6-6V5.933c0-3.314,2.687-6,6-6c3.313,0,6,2.687,6,6v36.014

src/assets/icon/svg/weather/22.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/23.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st0" d="M91.658,38.861c-3.313,0-6-2.687-6-6V5.657c0-3.313,2.687-6,6-6s6,2.686,6,6v27.204

src/assets/icon/svg/weather/24.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st3" d="M183.143,250.057c-0.001,0-0.003,0-0.004,0c-2.053-0.002-3.963-1.053-5.063-2.787l-55.271-87.174
 		c-1.243-1.961-1.244-4.463,0-6.425l55.202-87.106c1.099-1.733,3.007-2.785,5.06-2.788c0.002,0,0.005,0,0.008,0

src/assets/icon/svg/weather/25.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/26.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/29.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/30.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <path class="st0" d="M162.744,216.429V48.962c0-3.313-2.686-6-6-6c-3.313,0-6,2.687-6,6V216.41
 	c-11.575,2.698-20.2,13.073-20.2,25.47c0,14.448,11.712,26.16,26.16,26.16c14.448,0,26.16-11.712,26.16-26.16
 	C182.863,229.513,174.278,219.156,162.744,216.429z M156.704,256.04c-7.808,0-14.16-6.353-14.16-14.16s6.352-14.159,14.16-14.159

src/assets/icon/svg/weather/31.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <path class="st3" d="M162.96,216.43v-27.191c0-3.313-2.686-6-6-6c-3.313,0-6,2.687-6,6v27.172c-11.575,2.698-20.2,13.073-20.2,25.47
 	c0,14.448,11.712,26.16,26.16,26.16c14.448,0,26.16-11.712,26.16-26.16C183.079,229.513,174.494,219.156,162.96,216.43z
 	 M156.919,256.04c-7.808,0-14.16-6.353-14.16-14.16s6.352-14.159,14.16-14.159c7.808,0,14.16,6.352,14.16,14.159

src/assets/icon/svg/weather/32.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st1" d="M236.121,241.483c-3.313,0-6-2.686-6-6c0-18.331-14.914-33.245-33.246-33.245H6c-3.314,0-6-2.686-6-6
 		c0-3.313,2.686-6,6-6h190.875c24.949,0,45.246,20.297,45.246,45.245C242.121,238.797,239.435,241.483,236.121,241.483z"/>

src/assets/icon/svg/weather/33.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st2" d="M117.06,45.312c-19.352,41.776-17.454,90.684,5.883,131.105c12.733,22.053,31.122,40.293,53.18,52.75

src/assets/icon/svg/weather/34.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st2" d="M31.351,176.445l5.97,0.969l0.922-5.977c0.218-1.414,0.518-2.799,0.879-4.159
 		c-1.078-13.778,0.223-27.606,3.896-41.168c4.044-14.931,10.726-28.696,19.859-40.913c9.44-12.629,21.069-22.989,34.562-30.794

src/assets/icon/svg/weather/35.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<path class="st2" d="M36.683,180.677c1.425,0,2.874,0.122,4.317,0.327c-0.621-3.146-1.122-6.33-1.488-9.551

src/assets/icon/svg/weather/36.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<g>
 		<g>

src/assets/icon/svg/weather/37.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <path class="st2" d="M249.615,235.602c-0.046,0-0.092,0.001-0.138,0.002c-1.024,0.025-2.055,0.036-3.079,0.036
 	c-45.073,0-88.907-23.383-113.064-65.223c-24.705-42.791-22.399-93.759,1.618-133.176c2.199-3.608-0.487-8.005-4.416-8.005
 	c-0.375,0-0.761,0.04-1.156,0.125c-13.01,2.79-25.811,7.633-37.952,14.655C30.39,79.324,8.498,160.129,43.382,221.412

src/assets/icon/svg/weather/38.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st2" d="M235.729,137.714c2.14-0.348,4.301-0.523,6.421-0.523c8.86,0,17.052,2.918,23.666,7.841
 		c9.461-1.179,18.847-4.226,27.623-9.293c6.827-3.941,12.779-8.814,17.795-14.363c1.731-1.916,0.36-4.941-2.198-4.941

src/assets/icon/svg/weather/39.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st2" d="M91.359,104.053c0.52-2.539,1.114-5.073,1.798-7.597c4.044-14.932,10.727-28.696,19.859-40.914
 		c9.44-12.628,21.069-22.988,34.561-30.793c6.289-3.638,12.851-6.677,19.621-9.091c-15.799,34.108-17.428,72.969-4.794,108.084

src/assets/icon/svg/weather/40.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st2" d="M309.33,104.862c-0.023,0-0.046,0-0.07,0.001c-0.52,0.012-1.043,0.018-1.563,0.018
 		c-22.875,0-45.121-11.866-57.38-33.101c-12.538-21.717-11.368-47.583,0.821-67.588c1.116-1.831-0.248-4.062-2.241-4.062

src/assets/icon/svg/weather/41.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <path class="st2" d="M78.327,108.915c5.651-38.36,27.874-74.095,63.243-94.554c12.141-7.023,24.941-11.865,37.952-14.655
 	c0.395-0.085,0.781-0.124,1.156-0.124c3.928,0,6.614,4.396,4.415,8.004c-21.68,35.581-25.661,80.572-8.061,120.466
 	c-4.516-2.193-9.44-3.667-14.622-4.295c-12.639-35.12-11.013-73.985,4.788-108.099c-6.77,2.414-13.332,5.453-19.621,9.091

src/assets/icon/svg/weather/42.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <path class="st2" d="M309.33,104.862c-0.023,0-0.046,0-0.069,0.001c-0.521,0.012-1.044,0.018-1.564,0.018
 	c-22.875,0-45.121-11.866-57.38-33.101c-12.538-21.717-11.368-47.583,0.821-67.588c1.115-1.831-0.248-4.062-2.241-4.062
 	c-0.19,0-0.386,0.02-0.587,0.063c-6.603,1.416-13.099,3.873-19.261,7.438c-22.237,12.863-34.235,37.624-32.688,62.078

src/assets/icon/svg/weather/43.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st2" d="M309.33,104.862c-0.023,0-0.046,0-0.069,0.001c-0.521,0.012-1.043,0.018-1.564,0.018
 		c-22.875,0-45.121-11.866-57.38-33.101c-12.538-21.717-11.368-47.583,0.821-67.588c1.115-1.831-0.248-4.062-2.241-4.062

src/assets/icon/svg/weather/44.svg

@@ -1,11 +1,5 @@
 <svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 313.92 313.92" style="enable-background:new 0 0 313.92 313.92;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF9838;}
-	.st1{fill:#B6BBBF;}
-	.st2{fill:#888A8C;}
-	.st3{fill:#00AEBD;}
-</style>
 <g>
 	<path class="st2" d="M309.33,104.862c-0.023,0-0.046,0-0.069,0.001c-0.521,0.012-1.043,0.018-1.563,0.018
 		c-22.875,0-45.12-11.866-57.38-33.101c-12.538-21.717-11.368-47.583,0.821-67.588c1.116-1.831-0.248-4.062-2.241-4.062

src/assets/icon/svg/风机.svg

@@ -23,6 +23,6 @@
 		c-0.615,0.271-1.052,0.836-1.158,1.5c-0.886,5.22-3.695,9.918-7.875,13.166c-0.533,0.42-0.823,1.074-0.775,1.75
 		c0.05,0.668,0.45,1.275,1.041,1.634c26.25,14.267,57.268,29.524,66.15,29.75c0.967-0.024,2.283-0.158,3.233-1.476
 		c0.267-0.469,0.407-1,0.408-1.541C182.537,133.341,174.862,127.999,163.604,119.332L163.604,119.332z" />
-		<animateTransform attributeType="XML" attributeName="transform" begin="0s" dur=".5s" type="rotate" from="0 99 90" to="360 99 90" repeatCount="indefinite" />
+		<animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="3s" type="rotate" from="0 99 90" to="360 99 90" repeatCount="indefinite" />
 	</g>
 </svg>

src/router/index.js

@@ -119,7 +119,7 @@ const routes = [
     component: () => import('../views/HealthControl/Health2.vue'),
   },
   {
-    path: '/health/health3/:wpId',
+    path: '/health/health3/:wpId', // 场站健康管理
     name: 'health3',
     component: () => import('../views/HealthControl/Health3.vue'),
   },
@@ -134,7 +134,7 @@ const routes = [
     component: () => import('../views/HealthControl/Health5.vue'),
   },
   {
-    path: '/health/health6',
+    path: '/health/health6', // 健康总览
     name: 'health6',
     component: () => import('../views/HealthControl/Health6.vue'),
   },

src/views/HealthControl/Health2.vue

@@ -112,8 +112,7 @@ export default {
       wpmap:[],
       lineData:[],
       tableData: {
-        column: [
-          {
+        column: [{
             name: "",
             field: "",
             is_num: false,

src/views/HealthControl/Health3.vue

@@ -21,7 +21,7 @@
       </div>
       <div class="info-chart">
         <panel class="info-chart-panel" :title="'损失电量分析'">
-          <vertival-bar-line-chart :height="'310px'" />
+          <vertival-bar-line-chart :bardata="bardata" :lineData="lineData" :height="'310px'" />
         </panel>
       </div>
     </div>
@@ -30,41 +30,41 @@
         <panel title="预测电量" class="mg-b-16">
           <list-bar-chart :list="listBarData1" :colors="listBarData1Color" :height="'9.5vh'" />
           <div class="dashboard">
-            <dashboard-2 :height="'7.5vh'" :width="'115px'" :value="25" />
+            <dashboard-2 :height="'7.5vh'" :width="'115px'" :value="sourceMap.rfdl" />
             <div class="lengends">
               <div class="item">
-                <span class="label">本日预测电量</span>
+                <span class="label">本日发电量</span>
                 <span class="lengend gary"></span>
-                <span class="value">123</span>
+                <span class="value">{{sourceMap.rfdl}}</span>
               </div>
               <div class="item">
-                <span class="label">本日已发电量</span>
+                <span class="label">本日预测电量</span>
                 <span class="lengend green"></span>
-                <span class="value">123</span>
+                <span class="value">{{sourceMap.ycdl1day}}</span>
               </div>
             </div>
           </div>
           <div class="dashboard">
-            <dashboard-2 :height="'7.5vh'" :width="'115px'" :value="34" />
+            <dashboard-2 :height="'7.5vh'" :width="'115px'" :value="sourceMap.yfdl" />
             <div class="lengends">
               <div class="item">
-                <span class="label">本日预测电量</span>
+                <span class="label">本月发电量</span>
                 <span class="lengend gary"></span>
-                <span class="value">123</span>
+                <span class="value">{{sourceMap.yfdl}}</span>
               </div>
               <div class="item">
-                <span class="label">本日已发电量</span>
+                <span class="label">本月预测电量</span>
                 <span class="lengend green"></span>
-                <span class="value">123</span>
+                <span class="value">{{sourceMap.yczqlmonth}}</span>
               </div>
             </div>
           </div>
         </panel>
         <panel title="设备健康度" class="mg-b-16">
-          <thermometer-v-chart :height="'5.5vh'" :value="100" />
+          <thermometer-v-chart :height="'5.5vh'" :value="sourceMap.jkd" />
         </panel>
         <panel title="隐患等级" class="mg-b-16">
-          <normal-pie-chart :height="'14vh'" />
+          <normal-pie-chart :list="dangerData" :height="'14vh'" />
         </panel>
       </div>
       <div class="right-info">
@@ -73,26 +73,23 @@
             <div class="tools">
               <span class="level">
                 <span class="text green">优</span>：
-                <span class="value white">98</span>
+                <span class="value white">{{sourceMap.ysl}}</span>
                 <span class="unit gray">台</span>
               </span>
               <span class="level">
                 <span class="text purple">良</span>：
-                <span class="value white">98</span>
+                <span class="value white">{{sourceMap.lsl}}</span>
                 <span class="unit gray">台</span>
               </span>
               <span class="level">
                 <span class="text orange">差</span>：
-                <span class="value white">98</span>
+                <span class="value white">{{sourceMap.csl}}</span>
                 <span class="unit gray">台</span>
               </span>
             </div>
           </template>
           <div class="matrix">
-            <div class="item green">1号</div>
-            <div class="item purple">2号</div>
-            <div class="item orange">3号</div>
-            <div class="item" v-for="index of 100" :key="index">{{ index + 3 }}号</div>
+            <div class="item" :class="item[1] === '1' ? 'green' : item[1] === '2' ? 'purple' : 'orange'" v-for="(item, index) in sourceMap.wtIdls" :key="index">{{item[2]}}</div>
             <div class="blank" v-for="index of 20" :key="index"></div>
           </div>
         </toolbar-panel>
@@ -119,89 +116,100 @@ export default {
   components: { SvgIcon, Panel, VertivalBarLineChart, Table, ListBarChart, ThermometerVChart, NormalPieChart, ToolbarPanel, Dashboard2 },
   data () {
     return {
-      sourceMap: {},
+      sourceMap: {
+        wtIdls:[]
+      },
       type: "2",
+      bardata:{
+        area:[],
+        legend:[],
+        data:[[]]
+      },
+      lineData:[],
       listBarData1: [],
+      dangerData:[],
       listBarData1Color: ["purple", "purple"],
       tableData: {
-        column: [
-          {
+        column: [{
             name: "",
-            field: "index",
+            field: "",
             is_num: false,
             is_light: false,
           },
           {
-            name: "项目",
-            field: "name",
+            name: "风机编号",
+            field: "windTurbineId",
             is_num: false,
             is_light: false,
           },
           {
-            name: "项目",
-            field: "lqf",
+            name: "故障时间",
+            field: "stopTime",
             is_num: false,
             is_light: false,
           },
           {
-            name: "项目",
-            field: "yggl",
+            name: "故障类型",
+            field: "stopTypeId",
             is_num: false,
             is_light: false,
           },
           {
-            name: "项目",
-            field: "yyy",
+            name: "报警描述",
+            field: "warningId",
             is_num: false,
             is_light: false,
           },
-          {
-            name: "项目",
-            field: "pcspp",
-            is_num: false,
-            is_light: false,
-          },
-        ],
-        data: [
-          {
-            index: 1,
-            name: "MG01-01",
-            lqf: "0.1000",
-            yggl: "0.1000",
-            yyy: "0.10",
-            pcspp: "0.1000",
-            u1: "0.1000",
-            u2: "0.1000",
-            v1: "0.1000",
-            v2: "0.1000",
-            w1: "0.1000",
-            w2: "0.1000",
-            zca: "0.1000",
-            zcb: "0.1000",
-            clx: "0.1000",
-            clx1: "0.1000",
-            clx2: "0.1000",
-            jc: "0.1000",
-            hh: "0.1000",
-            hj: "0.1000",
-            is_light: false,
-          },
         ],
+        data: [],
       },
     };
   },
   created () {
     this.wpId = this.$route.params.wpId;
-    for (let i = 1; i < 50; i++) {
-      this.tableData.data.push(JSON.parse(JSON.stringify(this.tableData.data[0])));
-      this.tableData.data[i].index = i + 1;
-    }
     this.$nextTick(()=>{
+      this.requestData();
       this.getWpMap();
     });
   },
 
   methods: {
+
+    requestData(){
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "recommen/findAllChartjz",
+        data: {
+          wpId: that.wpId,
+          type: that.type
+        },
+        success (res) {
+          // 顶部图表绿线
+          let lineData = res.data.lvchart;
+
+          let area = res.data.datechart;
+          let legend = ["优数量", "良数量", "差数量"];
+          let data = [];
+
+          let dataLength = res.data.datechart.length;
+
+          for(let i=0;i<dataLength;i++){
+            data.push([res.data.yslchart[i], res.data.lslchart[i], res.data.cslchart[i]]);
+          }
+
+          let bardata = {
+            area,
+            legend,
+            data
+          };
+
+          that.bardata = bardata;
+          that.lineData = lineData;
+        }
+      });
+    },
+
     getWpMap () {
       let that = this;
       that.API.requestData({
@@ -211,11 +219,34 @@ export default {
           wpId: that.wpId
         },
         success (res) {
-          console.log(111, res);
           that.listBarData1= [
             { name: "未来 {c1|15分钟} 预测电量", value: res.data.ycdl15minute },
             { name: "未来 {c1|4小时} 预测电量", value: res.data.ycdl1hour },
           ];
+
+          let dangerData=[{
+            name:"一级隐患",
+            value:0
+          },{
+            name:"二级隐患",
+            value:0
+          },{
+            name:"三级隐患",
+            value:0
+          },{
+            name:"四级隐患",
+            value:0
+          },{
+            name:"五级隐患",
+            value:0
+          }];
+
+          dangerData.forEach((ele,index) => {
+            ele.value=res.data.yhls[index];
+          });
+
+          that.dangerData = dangerData;
+          that.tableData.data = res.data.gzls;
           that.sourceMap = res.data;
         }
       });

src/views/HealthControl/Health6.vue

@@ -2,20 +2,20 @@
   <div class="health-6">
     <div class="header-info mg-b-16">
       <div class="selections">
-        <div class="item" @click="tabSelect(0)" :class="{ active: tabIndex == 0 }">
+        <div class="item" @click="tabSelect('1')" :class="{ active: type === '1' }">
           <i class="svg-icon svg-icon-sm">
             <svg-icon :svgid="'svg-wind-site'" />
           </i>
           <span>风场</span>
         </div>
-        <div class="item" @click="tabSelect(1)" :class="{ active: tabIndex == 1 }">
+        <div class="item" @click="tabSelect('2')" :class="{ active: type === '2' }">
           <i class="svg-icon svg-icon-sm">
             <svg-icon :svgid="'svg-h-project'" />
           </i>
           <span>项目</span>
         </div>
       </div>
-      <div class="state">
+      <div class="state" v-if="false">
         <div class="state-item green">
           <div class="dot "></div>
           <div class="text">良好数量：</div>
@@ -39,12 +39,17 @@
       </div>
     </div>
     <row :type="'flex'" class="mg-b-16">
-      <Col :span="8">
+      <Col :span="12">
         <panel :title="'健康走势图'" :showLine="false">
-          <dual-pie-chart :height="'250px'" />
+          <dual-pie-chart :innerData="healPieData" :outerData="healPieData" :height="'250px'" />
         </panel>
       </Col>
-      <Col :span="16">
+      <Col :span="12">
+        <panel :title="'故障统计图'" :showLine="false">
+          <dual-pie-chart :innerData="stopPieData" :outerData="stopPieData" :height="'250px'" />
+        </panel>
+      </Col>
+      <!-- <Col :span="16">
         <panel :title="'矩阵'" :showLine="false">
           <div class="matrix">
             <div class="item green">1号</div>
@@ -54,24 +59,32 @@
             <div class="blank" v-for="index of 30" :key="index"></div>
           </div>
         </panel>
-      </Col>
+      </Col> -->
     </row>
     <div class="mg-b-16">
-      <panel :title="'健康走势图'" :showLine="false">
-        <bar-line-chart :lineData="[]" :height="'250px'" />
+      <panel :title="'健康状态占比'" :showLine="false">
+        <bar-line-chart :bardata="barData" :lineData="[]" :height="'250px'" />
       </panel>
     </div>
-    <div class="mg-b-16">
-      <panel :title="'健康走势图'" :showLine="false">
-        <normal-line-chart :height="'250px'" />
+    <div class="mg-b-16 curStyle">
+      <panel :title="'健康状态'" :showLine="false">
+        <MultipleLineChart :list="statusData" :units="['']" :height="'250px'" />
       </panel>
+      <div class="selections">
+        <div class="item" @click="changeStatus('1')" :class="{ active: status === '1' }">
+          <span>良好</span>
+        </div>
+        <div class="item" @click="changeStatus('2')" :class="{ active: status === '2' }">
+          <span>注意</span>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import BarLineChart from "../../components/chart/combination/bar-line-chart.vue";
-import NormalLineChart from "../../components/chart/line/normal-line-chart.vue";
+import MultipleLineChart from "../../components/chart/line/multiple-line-chart.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import Col from "../../components/coms/grid/col.vue";
 import Row from "../../components/coms/grid/row.vue";
@@ -79,22 +92,216 @@ import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";
 export default {
   setup() {},
-  components: { SvgIcon, Panel, NormalLineChart, BarLineChart, Row, Col, DualPieChart },
+  components: { SvgIcon, Panel, MultipleLineChart, BarLineChart, Row, Col, DualPieChart },
   data() {
     return {
-      tabIndex: 0,
+      type: "1",
+      status: "1",
+      healPieData: [],
+      stopPieData:[],
+      statusData:[],
+      barData:{
+        area: [],
+        legend: [],
+        data: []
+      }
     };
   },
+  created(){
+    this.requestData();
+  },
   methods: {
-    tabSelect(state) {
-      this.tabIndex = state;
+    requestData(){
+      this.getWpwarn();
+      this.getStop();
+      this.getWpOrProStatus();
+      this.getStatus();
+    },
+
+    // 获取健康走势图
+    getWpwarn(){
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthoperation/countWpwarn",
+        data: {
+          type: that.type
+        },
+        success (res) {
+          let healPieData=[];
+
+          res.data.forEach(ele=>{
+            healPieData.push({
+              value: ele.value,
+              unit: "次",
+              name: ele.name,
+            });
+          });
+
+          that.healPieData = healPieData;
+        }
+      });
+    },
+
+    
+    // 获取故障统计图
+    getStop(){
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthoperation/countStop",
+        data: {
+          type: that.type
+        },
+        success (res) {
+          let stopPieData=[];
+
+          res.data.forEach(ele=>{
+            stopPieData.push({
+              value: ele.value,
+              unit: "次",
+              name: ele.name,
+            });
+          });
+
+          that.stopPieData = stopPieData;
+        }
+      });
+    },
+
+    // 获取健康状态占比
+    getWpOrProStatus(){
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthoperation/countWpOrProStatus",
+        data: {
+          type: that.type
+        },
+        success (res) {
+          let barData = {
+            area: res.data.name,
+            legend: ["良好数量", "正常数量", "注意数量", "严重数量"],
+            data: []
+          };
+
+          let length=res.data.name.length;
+
+          for(let i=0;i<length;i++){
+            barData.data.push([]);
+          }
+
+          for(let i=0;i<length;i++){
+            barData.data[i].push(res.data.lhList[i]);
+            barData.data[i].push(res.data.hgList[i]);
+            barData.data[i].push(res.data.zyList[i]);
+            barData.data[i].push(res.data.yzList[i]);
+          }
+          
+          that.barData=barData;
+        }
+      });
+    },
+
+    // 获取健康状态
+    getStatus(){
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthoperation/findWpOrProStatusForHistory",
+        data: {
+          type: that.type,
+          status: that.status
+        },
+        success (res) {
+
+          let statusData = [];
+
+          const time = res.data.time;
+
+          for(let key in res.data){
+            if(key !== "name" && key !== "time"){
+              let item=res.data[key];
+
+              let statusItem = {
+                title: res.data.name[0][key],
+                yAxisIndex: 0,
+                value: []
+              }
+
+              time.forEach((text, index)=>{
+                statusItem.value.push({
+                  text:res.data.name[0][key],
+                  value:item[index]
+                });
+              });
+
+              statusData.push(statusItem);
+            }
+          }
+
+          that.statusData = statusData;
+          
+        }
+      });
     },
+
+    tabSelect(type) {
+      this.type = type;
+      this.requestData();
+    },
+
+    changeStatus(status){
+      this.status = status;
+      this.getStatus();
+    }
   },
 };
 </script>
 
 <style lang="less">
 .health-6 {
+
+  .curStyle{
+    position: relative;
+
+    .selections{
+      position: absolute;
+      display: flex;
+      right: 0;
+      top: 0;
+      width: 50%;
+      justify-content: flex-end;
+
+      .item{
+        flex: 0 0 80px;
+        text-align: center;
+        line-height: 33px;
+        margin-right: 8px;
+        color: @font-color;
+        font-size: @fontsize-s;
+        background: fade(@gray, 20);
+        border: 1px solid fade(@gray, 20);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+
+        &:hover,
+        &.active {
+          background: fade(@green, 20);
+          border: 1px solid @green;
+          color: @green;
+          cursor: pointer;
+
+          i svg use {
+            fill: @green;
+          }
+        }
+      }
+    }
+  }
+
   .header-info {
     display: flex;
 

src/views/Home/components/power-review.vue

@@ -66,7 +66,7 @@ export default {
     data (res) {
       this.PowerLoad = res;
     },
-    id(){
+    id(res){
       this.wpId = res;
     }
   }

src/views/Status/Status.vue

@@ -2,6 +2,7 @@
   <div class="status">
     <div class="panel-box">
       <StatusPanel class="panel-item" v-for="(data, index) of datas" :key="index" :data="data"></StatusPanel>
+      <StatusPanelStatic class="panel-item" />
     </div>
     <div class="table-box">
       <ComTable :data="tableData"></ComTable>
@@ -11,6 +12,7 @@
 
 <script>
 import StatusPanel from "./components/status-panel.vue";
+import StatusPanelStatic from "./components/static.vue";
 import ComTable from "@com/coms/table/table.vue";
 import util from "@/helper/util.js";
 
@@ -23,6 +25,7 @@ export default {
   components: {
     StatusPanel,
     ComTable,
+    StatusPanelStatic
   },
   // 数据
   data() {

src/views/Status/components/static.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="status-panel">
+    <div class="pause" v-if="true">中断</div>
+    <ComPanel class="status-com-panel" :title="'海子井光伏电站'">
+      <div class="p-body">
+        <div class="category-box">
+          <div class="score">
+            <span>0</span>
+          </div>
+          <div class="box">
+            <div class="category-item">
+              <div>001</div>
+              <div class="green">0</div>
+            </div>
+          </div>
+        </div>
+        <div class="item-box">
+          <div class="data-item">
+            <div class="f1">0</div>
+            <div class="f2">0</div>
+            <div class="f3">0</div>
+            <div class="f4">0</div>
+            <div class="f5">0</div>
+          </div>
+        </div>
+      </div>
+    </ComPanel>
+  </div>
+</template>
+
+<script>
+import ComPanel from "@com/coms/panel/panel.vue";
+export default {
+  // 名称
+  name: "StatusPanel",
+  // 使用组件
+  components: {
+    ComPanel,
+  },
+  /**
+   * {
+          title: "某某某风电场",
+          weather: {
+              type: "cloudy",
+              temperature: 11
+          },
+          breakOff: false,
+          category: {
+              score: 66,
+              datas: [
+                  { text: "运行", num: 30, color: 'green' },
+                  { text: "待机", num: 27, color: 'purple' },
+                  { text: "限电", num: 30, color: 'yellow' },
+                  { text: "检修", num: 30, color: 'orange' },
+                  { text: "故障", num: 13, color: 'red' },
+                  { text: "受累", num: 30, color: 'blue' },
+                  { text: "离线", num: 30, color: 'gray' },
+              ]
+          },
+          items: [
+              { f1: 'AGC宋六:', f2: '设定', f3: '66', f4: '出线', f5: '11', is_light: true },
+              { f1: '升压站:', f2: '出线Uab/La', f3: '23/3 23/3', f4: '电压', f5: '103 103', is_light: false },
+              { f1: '风功:', f2: '未来15分钟', f3: '103', f4: '', f5: '', is_light: false },
+              { f1: '测风塔:', f2: '风速', f3: '103KM', f4: '风向', f5: '103 62', is_light: false },
+              { f1: '电能量表:', f2: '', f3: '103 62', f4: '', f5: '', is_light: false },
+          ]
+      }
+   */
+  props: {
+    data: Object,
+  },
+  // 数据
+  data() {
+    return {};
+  },
+  // 函数
+  methods: {
+    jumpPage(wpId) {
+      this.$router.push({
+        path: `/monitor/windsite/home/${wpId}`,
+        // query: { wpId: id },
+      });
+    },
+  },
+  // 生命周期钩子
+  beforeCreate() {
+    // 创建前
+  },
+  created() {
+    // 创建后
+  },
+  beforeMount() {
+    // 渲染前
+  },
+  mounted() {
+    // 渲染后
+  },
+  beforeUpdate() {
+    // 数据更新前
+  },
+  updated() {
+    // 数据更新后
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.status-panel {
+  position: relative;
+  height: 22.315vh;
+
+  .pause {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+    left: 0;
+    top: 0;
+    background-color: fade(@darkgray, 50%);
+    color: fade(@write, 60%);
+    font-size: 5.556vh;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    opacity: 0.9;
+    backdrop-filter: blur(0.37vh);
+  }
+
+  .status-com-panel {
+    width: 100%;
+    height: 100%;
+
+    .p-body {
+      width: 100%;
+      height: 19.074vh;
+      display: flex;
+      flex-direction: column;
+      margin-top: -0.926vh;
+
+      .category-box {
+        width: 100%;
+        background-color: fade(@darkgray, 30%);
+        display: flex;
+        margin-bottom: 0.37vh;
+
+        .score {
+          padding: 0.833vh 1.481vh;
+
+          span {
+            width: 3.889vh;
+            height: 3.889vh;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            color: @green;
+            border: 0.093vh solid @green;
+            background-color: fade(@green, 20%);
+            font-size: @fontsize;
+          }
+        }
+
+        .box {
+          flex-grow: 1;
+          display: flex;
+
+          .category-item {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            font-weight: 600;
+
+            div {
+              flex: 1;
+              font-size: @fontsize-s;
+
+              &:first-child {
+                display: flex;
+                align-items: flex-end;
+                color: @gray;
+              }
+            }
+          }
+        }
+      }
+
+      .item-box {
+        flex-grow: 1;
+        display: flex;
+        flex-direction: column;
+
+        .data-item {
+          flex: 1;
+          display: flex;
+          flex-direction: row;
+          background-color: fade(@darkgray, 20%);
+          margin-top: 0.278vh;
+
+          div {
+            font-size: @fontsize-s;
+            overflow: hidden;
+            display: flex;
+            align-items: center;
+          }
+
+          .f1,
+          .f2,
+          .f4 {
+            text-align: right;
+            color: @gray;
+            justify-content: flex-end;
+          }
+
+          .f3,
+          .f5 {
+            font-family: "Bicubik";
+            text-align: left;
+            color: @green;
+            justify-content: flex-start;
+          }
+
+          .f1 {
+            flex: 2;
+          }
+
+          .f2 {
+            flex: 3;
+            margin-right: 0.556vh;
+          }
+
+          .f3 {
+            flex: 3;
+          }
+
+          .f4 {
+            flex: 1;
+            margin-right: 0.556vh;
+          }
+
+          .f5 {
+            flex: 2;
+            margin-right: 0;
+          }
+
+          &.light {
+            background-color: fade(@darkgray, 50%);
+            position: relative;
+
+            &::after {
+              content: "";
+              position: absolute;
+              height: 100%;
+              width: 0.278vh;
+              background-color: @green;
+              top: 0;
+              left: 0;
+            }
+
+            .f1,
+            .f2,
+            .f4 {
+              color: @write;
+            }
+
+            .f3,
+            .f5 {
+              color: fade(@write, 60%);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>