From 4c86d844df5560465edd11f7455aa9d332e571ba Mon Sep 17 00:00:00 2001
From: wgx <31655391@qq.com>
Date: Thu, 20 Nov 2025 19:44:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=80=9F=E5=BA=A6=E5=92=8C=E6=89=93=E5=8C=85=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                              |   8 +-
 src/assets/css/index.css                      |  90 +-
 src/assets/image/icon-blue.png                | Bin 0 -> 3899 bytes
 src/assets/image/icon-yellow.png              | Bin 0 -> 3959 bytes
 src/assets/image/xcd2.png                     | Bin 1080 -> 1271 bytes
 src/assets/image/xcd22.png                    | Bin 0 -> 1080 bytes
 src/pages/Home/index.vue                      | 904 ++++++++----------
 .../{index map.vue => index_map.vue11123}     |  34 +-
 8 files changed, 461 insertions(+), 575 deletions(-)
 create mode 100644 src/assets/image/icon-blue.png
 create mode 100644 src/assets/image/icon-yellow.png
 create mode 100644 src/assets/image/xcd22.png
 rename src/pages/Home/{index map.vue => index_map.vue11123} (98%)

diff --git a/src/api/index.js b/src/api/index.js
index 8cf3096..bb12498 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -69,12 +69,12 @@ export function login(data) {
     })
   }
   // 污染治理效果折线图
-  export function getIndexSummry(stationCode) {
+  export function getIndexSummry(data) {
     return requests({
-      url: '/zh-applet-admin/appmana/bigScreen/getIndexSummry?stationCode='+stationCode,
+      url: '/zh-applet-admin/appmana/bigScreen/getIndexSummry',
       method: 'post',
-      headers: {},
-      stationCode
+      headers: { 'content-type': 'application/json; charset=UTF-8' },
+      data: data? data : {}
     })
   }
 
diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 53425f9..9e0ede0 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -556,6 +556,49 @@
 	margin-left: 3%;
 	font-family: douyuFont;
 }
+.dataTypeEchart{
+	width: 53px;
+	height: 31px;
+	color: #fff;
+	margin-top: 15px;
+	line-height: 32px;
+	background: rgb(14 44 63);
+	border-radius: 0.4vw;
+	border: 1px solid #4b677c;
+	cursor: pointer;
+	float: left;
+	margin-left: 15px;
+	padding: 0px;
+	text-align: center;
+	z-index: 500;
+	position: absolute;
+}
+.dataTypeEchart2{
+	width: 66px;
+	height: 32px;
+	color: #fff;
+	margin-top: 15px;
+	line-height: 32px;
+	background: rgb(14 44 63);
+	border-radius: 0.4vw;
+	border: 1px solid #4b677c;
+	cursor: pointer;
+	float: left;
+	margin-left: 15px;
+	padding: 0px;
+	text-align: center;
+	z-index: 500;
+	position: absolute;
+	left: 13px;
+	top: 30px;
+	.el-input__inner{
+		height:30px;
+		background: #0e2e4f;
+	}
+	.el-input__icon{
+		height:36px;
+	}
+}
 .zywr_titrt{
 	width: 25%;
 	height: 3vw;
@@ -608,48 +651,17 @@
 }
 #chart1{height:12vw;}
 .scdlist{
-	width: 9vw;
+	width: 7vw;
 	height: 2vw;
+	margin-top: 0.4vw;
 	line-height: 2vw;
 	background: rgba(0,0,0,0.8);
 	border-radius: 0.4vw;
 	border: 1px solid #4b677c;
-	position: absolute;
+	/*position: absolute;*/
 	bottom: 16vw;
 	left: 24%;
-}
-.scdlist2{
-	width: 9vw;
-	height: 2vw;
-	line-height: 2vw;
-	background: rgba(0,0,0,0.8);
-	border-radius: 0.4vw;
-	border: 1px solid #4b677c;
-	position: absolute;
-	bottom: 19vw;
-	left: 24%;
-}
-.scdlist3{
-	width: 9vw;
-	height: 2vw;
-	line-height: 2vw;
-	background: rgba(0,0,0,0.8);
-	border-radius: 0.4vw;
-	border: 1px solid #4b677c;
-	position: absolute;
-	bottom: 22vw;
-	left: 24%;
-}
-.scdlist4{
-	width: 9vw;
-	height: 2vw;
-	line-height: 2vw;
-	background: rgba(0,0,0,0.8);
-	border-radius: 0.4vw;
-	border: 1px solid #4b677c;
-	position: absolute;
-	bottom: 25vw;
-	left: 24%;
+	cursor: pointer;
 }
 .scdlistpos{
 	width: 9vw;
@@ -697,13 +709,7 @@
 }
 .xcdimg{
 	width: 0.9vw;
-	/* margin-top: 0.4vw; */
-	margin-left: 0.4vw;
-	margin-right: 0.4vw;
-}
-.xcd2img{
-	width: 0.7vw;
-	/* margin-top: 0.1vw; */
+	margin-top: 0.4vw;
 	margin-left: 0.4vw;
 	margin-right: 0.4vw;
 }
diff --git a/src/assets/image/icon-blue.png b/src/assets/image/icon-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f834ae24c9f5ebb067e371d71a3e1edc6cba1fe
GIT binary patch
literal 3899
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
NmZr8QcZ@Lf{{anS#_s?C

literal 0
HcmV?d00001

diff --git a/src/assets/image/icon-yellow.png b/src/assets/image/icon-yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..83df45844d7fcbe0641a1fbf2f2e4686f6d0ea65
GIT binary patch
literal 3959
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
W)mDFtR`QQuVKXCZRE?oa)c*j)IPe_+

literal 0
HcmV?d00001

diff --git a/src/assets/image/xcd2.png b/src/assets/image/xcd2.png
index 1538dcc55469890f871a7e31d184537da7914c27..f4281ceef0f5d32a9c1eabc09c72bf55fcf16b21 100644
GIT binary patch
literal 1271
zcmV<T1PJ?yP)<h;3K|Lk000e1NJLTq000sI000~a1^@s6Y{c&;00009a7bBm000tn
z000tn0p4aGcmMzdsYygZR5;6>l}l`$M-|6^XJ)?d+P;stj!oSciPI$5joUP$X^~ot
z#DcORs#+-v5GyDWOT<G$us}ixv0z;`MMy!Y2q9GsEfE4ifK5|Gk{T-8b>p~2j%|Wt
z-Ftl>-#2p(3lk@<Q-qlH{2%9k&YThck7L$7peoNfd<~PUc>jw0cYsY0i_;1eQGYQw
zICur1Z|z4MHY~V?CmUB~Dtr)0jQwZKiqEUlXQL!S(8tYgoDsR}<($$h?iojVy(C`7
z1-ql8WY>S7gwKFYLBvQ18ICaLkh3C<Zvd3G@uZRtCiLnaBGZ*~D*h?VS24g6qLJis
z6d_31GSxqaY~<6o<K$KztIr$u6*HSMOBhB>2`8T5a*EdM9_Lx@;V*j6OCsZ2Vm9|l
zY~Xup;qinyFFhnRq1;4r4+M+~{r2WwqWYA1u?r;qRv@K1qJLGiCd6rHEmr>aJ6`?y
z3p{c17^8<~0671vUs4@8z^6X<{H-jdm=|N#N!+(nT0bp*8`5_JP3T@>_3dTi@@w?}
zxr~Wt@Zbr?9{bWRN1^)R?}T3O1*soj58L^?b)?X(eU6AwBEbPLeD8jmvB_Xor+#P>
zeP3zLbsI&kGXkvtXO0RH3K22Tf*5;b;cfnLZH2Lqd=v#%mgX59_z*+m4->796G5ea
zixfcQ(FJj>8_+@MabxL^EL@&v?15><CXTTG{wWd_uFcQVS)C<FLMRDzH*;pM1IWgu
zqfcozF|+^Zsi)1~Gh;fiU7kb`-PVeM_Vssn)Q83&rL%g8fkyNE%EFm*WA)Z~iGLV9
zzqXmChYrt-3?KajxM47liD43Plwgkbda<|t`AdZE+`3Ec3j)yj$-qzhS^l)_Ym9bM
zi4qA8LhvLK9f`P#;ZZ0dYXqwIK&YfuSCp@1*85rj=>IGI&`ERMZ*{&fHa_T!(64Tf
z`?hk;Aipo}w$lgo?nUjyGcw5y2XNO{%Zs^%S3@)XrdVoK|CgO4ffwCYJU1}O{I0hK
zP<)>g=Ka|??eBX(Fh9K8k)jXfO%~-b%ANM_T>d5(P582(O;<nIi_TH%OrEiHlVlGO
zz`)nj+0?Kf`$fIHryTTxDL=}N@h6#}x9hpwNptAr*vsX+n|J#Yt_k2a?FloxX7Jn0
z^Rqi)c8FTbwPTQ`GB2Z8e=TcN*CJigO8IfwCzecJ7m?Lu^0EGcujL{a==4|RI9oem
zw-yGU6|WDdPg(Ay?X&RN+ji#3;Ec3ctWnEfiCtY(b&}z7aF;^hO*yo+=6ZAWQz-X~
zQdCm7mPz)I_u;|Yl6fPldjo)WamrP*;|Y5&L6KAr_al$k?+LCH8&ZcUNNLG;%k*AK
z@ty5`Q+W^|4EcjMY0Dxm3sew^&N~6i8N*3yp*CfvPdbqibFm{T8_B2PEVu*W<z8`8
zQ%fB)u4rj15~XR_aFA@oR2F?9mn+llw*;U&H!z{WO{&@vkUGwqX4Y|@LKSD0)Sx2f
zs@~h6Q(ri9vq|mm)ydAv?qB3DWX-!9^{mU0lK!YuR~2!U(o%3rbT0G+YdO)4<owdF
hFSa*MpC;YJ{~MKfK*uoQBl-XU002ovPDHLkV1iM^YSI7z

literal 1080
zcmV-81jqY{P)<h;3K|Lk000e1NJLTq000gE000~a1^@s6QC5yY000C3Nkl<ZIE{Uj
zU5J!b7{`ClIq&<<?Ci`s?dtkjYniMFwvh>HVr3s1-UdaaAar4r5p~f`bmv7-H%2!>
zkQfA35cH)PBw18okQsewtFGg^o9?>nIx{=-ew-)HJ97~c9XOol9G<W9Jpbn}nw|#<
zfdWVX_#Jj-Kplt$%n+~#aG(eN&+w&=Ve%>>{{0Tn0g#2j#;)6cF0aJvX!1h$aS+X3
z1hpW$K=%WE|BC2Oa}Z=VXxGj=(nH{OgYoyhpr^Zrkv9ww^9kto|IR{>qHaeg?Z~_E
zf($}-5^ZhI3n4u~O0MK($w1rNA^RC^SJ62{(+k@Wa}3nvsiY0mwUOc);5yozK%xqm
zuv1V((fA<)Sp|(h%_Ep9t>e#f<G={<_xosl_9*o?M@VZ&!7KrdedJ>x3q;dDd|JzZ
zam)bepNEJ~y^GHM4q+KPcqfHTFC&%J;AVZql@N{v=)6y1d8cP}f|U>8rhXx5Pa;7d
z!Rnnz-x|m+cYcE|g>=kd`$2jocVG<J<acC~rwNvA!1OI8yYMBnN5Mv*O|WGlxC!H$
z&x5^O!wx`tiS*(LB<d%)c@uWU-MIP<(y^~V1F(INT)gBiK8G|$*<#`ij~CZ`{tR4!
zWTu19px8OH7=i+r1wcRXnH_Iv{m1tLoo0VL`RmqT@nJ-(h{^Jl$+~?s7Lo)_0-V%|
zOK0~*5w}WmkR`1;-|7grIRkpFqu+rnND9u+!ypufp$Na}IQIm4fl1qDZ`R<0a3j{O
zqc@!aX_CV=D}cQPda5+TI`dhLJu1u?7lEm8OsDxUIYO_TglJKxTRH@Vbx`hsaF&w$
zi+5D{AqQ&vl^nCaXbY2!pVAvF50-*`1j1DiTmf3(GR|a8){CL;zhKg#5LXuLEK^a+
z(?OMXGEOTy4#70gU|wV9w8>Kz>PEruVE*AM(##0Ywh3$T$3ZiB%Z2Q75%Zd$(xN2F
zYnd@8Qd<D+%&APD89+lp%LZbq(Nw(39=ZO$>(>>P2T^xT&Na%VZHW{oG6|6Gfala9
ziB@GMyI+yT?M21QJ)7fig7M}qr)VQ8f7F!n`aqJ3)%5Fp7`ld@d>%vT716mu)ObQR
z$}m?=D-}fh8IGpf6Pg;q@FZ{;IPc-U8K`P1qqdT+4Xg1^GOSjkv9we;7xpFh1=VDW
zI%?fXzSjrzh9w}uP;@O*b8S0nBwLJ;h#o2$%WO7p&mx}9h&!x?@u{8yZWpVIT+5Ef
z6UDb}CA~`mt!gICtYJ^NmaU1^{v74-g?Erw6&L}wdcIUAvpDAPKT;e*NvtPg4+BmD
yzCfLJbXNsf3oPl%o}JPh0{Oh*Ip%7v3;Ye4+QXPzD|HG00000<MNUMnLSTYg_5LgX

diff --git a/src/assets/image/xcd22.png b/src/assets/image/xcd22.png
new file mode 100644
index 0000000000000000000000000000000000000000..1538dcc55469890f871a7e31d184537da7914c27
GIT binary patch
literal 1080
zcmV-81jqY{P)<h;3K|Lk000e1NJLTq000gE000~a1^@s6QC5yY000C3Nkl<ZIE{Uj
zU5J!b7{`ClIq&<<?Ci`s?dtkjYniMFwvh>HVr3s1-UdaaAar4r5p~f`bmv7-H%2!>
zkQfA35cH)PBw18okQsewtFGg^o9?>nIx{=-ew-)HJ97~c9XOol9G<W9Jpbn}nw|#<
zfdWVX_#Jj-Kplt$%n+~#aG(eN&+w&=Ve%>>{{0Tn0g#2j#;)6cF0aJvX!1h$aS+X3
z1hpW$K=%WE|BC2Oa}Z=VXxGj=(nH{OgYoyhpr^Zrkv9ww^9kto|IR{>qHaeg?Z~_E
zf($}-5^ZhI3n4u~O0MK($w1rNA^RC^SJ62{(+k@Wa}3nvsiY0mwUOc);5yozK%xqm
zuv1V((fA<)Sp|(h%_Ep9t>e#f<G={<_xosl_9*o?M@VZ&!7KrdedJ>x3q;dDd|JzZ
zam)bepNEJ~y^GHM4q+KPcqfHTFC&%J;AVZql@N{v=)6y1d8cP}f|U>8rhXx5Pa;7d
z!Rnnz-x|m+cYcE|g>=kd`$2jocVG<J<acC~rwNvA!1OI8yYMBnN5Mv*O|WGlxC!H$
z&x5^O!wx`tiS*(LB<d%)c@uWU-MIP<(y^~V1F(INT)gBiK8G|$*<#`ij~CZ`{tR4!
zWTu19px8OH7=i+r1wcRXnH_Iv{m1tLoo0VL`RmqT@nJ-(h{^Jl$+~?s7Lo)_0-V%|
zOK0~*5w}WmkR`1;-|7grIRkpFqu+rnND9u+!ypufp$Na}IQIm4fl1qDZ`R<0a3j{O
zqc@!aX_CV=D}cQPda5+TI`dhLJu1u?7lEm8OsDxUIYO_TglJKxTRH@Vbx`hsaF&w$
zi+5D{AqQ&vl^nCaXbY2!pVAvF50-*`1j1DiTmf3(GR|a8){CL;zhKg#5LXuLEK^a+
z(?OMXGEOTy4#70gU|wV9w8>Kz>PEruVE*AM(##0Ywh3$T$3ZiB%Z2Q75%Zd$(xN2F
zYnd@8Qd<D+%&APD89+lp%LZbq(Nw(39=ZO$>(>>P2T^xT&Na%VZHW{oG6|6Gfala9
ziB@GMyI+yT?M21QJ)7fig7M}qr)VQ8f7F!n`aqJ3)%5Fp7`ld@d>%vT716mu)ObQR
z$}m?=D-}fh8IGpf6Pg;q@FZ{;IPc-U8K`P1qqdT+4Xg1^GOSjkv9we;7xpFh1=VDW
zI%?fXzSjrzh9w}uP;@O*b8S0nBwLJ;h#o2$%WO7p&mx}9h&!x?@u{8yZWpVIT+5Ef
z6UDb}CA~`mt!gICtYJ^NmaU1^{v74-g?Erw6&L}wdcIUAvpDAPKT;e*NvtPg4+BmD
yzCfLJbXNsf3oPl%o}JPh0{Oh*Ip%7v3;Ye4+QXPzD|HG00000<MNUMnLSTYg_5LgX

literal 0
HcmV?d00001

diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue
index c7b3855..be6c3e5 100644
--- a/src/pages/Home/index.vue
+++ b/src/pages/Home/index.vue
@@ -5,7 +5,7 @@
       bgc="transparent"
       :delay="100"
       :isFlat="true"
-	  @scaleChange ="scaleChange"
+	    @scaleChange ="scaleChange"
     >
 		<div
 			class="main"
@@ -20,7 +20,6 @@
 			<div class="nav_btn">
 				<div class="btn_left">
 					<span class="btn_left_time"> {{ nowTime }}</span> <span class="btn_left_tianq" style="z-index: 9999;"></span>
-
 				</div>
 				<div class="btn_right"><hefentianqi />
 					<img src="@/assets/image/quanping.png"  class="quanping" v-if="fullscreen==false" @click="screen" alt="">
@@ -42,38 +41,17 @@
 					</el-button>
 					<img src="@/assets/image/sanjiao.png"  class="sanjiao" alt="">
 				</el-dialog>
-
 			</div>
 
 			<div class="content">
-				<!-- <button @click="isShowBtn" style="position: fixed;top:5.2vw;left:26%;z-index: 999;">切换</button> -->
-				<img src="@/assets/image/qiehuan2.png" @click="isShowBtn" style="position: fixed;top:5.2vw;right:26%;z-index: 999;width:12vw;cursor: pointer;" alt="" v-if="isShow==true" >
-				<img src="@/assets/image/qiehuan.png" @click="isShowBtn" style="position: fixed;top:5.2vw;right:3%;z-index: 999;width:12vw;cursor: pointer;" alt="" v-else>
-				<!-- <img src="@/assets/image/sbdscd.png" @click="sbdscdBtn" style="position: fixed;top:5.2vw;left:26%;z-index: 999;width:12vw;cursor: pointer;" alt="" > -->
-
-<!--				<el-tooltip content="杀虫灯" effect="light" placement="top">-->
-<!--					<el-switch-->
-<!--						v-model="switchValue"-->
-<!--						active-color="#13ce66"-->
-<!--						inactive-color="#ff4949"-->
-<!--						@change="switchBtn"-->
-<!--						v-if="isShow==true"-->
-<!--						style="position: fixed;bottom:17.2vw;right:25%;z-index: 999;">-->
-<!--					</el-switch>-->
-<!--					<el-switch-->
-<!--						v-model="switchValue"-->
-<!--						active-color="#13ce66"-->
-<!--						inactive-color="#ff4949"-->
-<!--						@change="switchBtn"-->
-<!--						v-else-->
-<!--						style="position: fixed;bottom:6.2vw;right:3%;z-index: 999;">-->
-<!--					</el-switch>-->
-<!--				</el-tooltip>-->
-				<div id="container" v-if="fullscreen==false" style="width:98%;height:100%;resize:both; position: absolute;z-index:0;top:0px;left: 1%;transform:scale(1.05,1.05);"></div>
-				<div id="container" v-else style="width:98%;height:100%;resize:both; position: absolute;z-index:0;top:0px;left: 1%;"></div>
-<!--				左上头部-->
+				<img src="@/assets/image/qiehuan2.png" @click="mapTypeSwitch" style="position: fixed;top:5.2vw;right:26%;z-index: 999;width:12vw;cursor: pointer;" alt="" v-if="mapTypeFlag==true" >
+				<img src="@/assets/image/qiehuan.png" @click="mapTypeSwitch" style="position: fixed;top:5.2vw;right:3%;z-index: 999;width:12vw;cursor: pointer;" alt="" v-else>
+<!--				<div id="container" v-if="fullscreen==false" style="width:98%;height:100%;resize:both; position: absolute;z-index:0;top:0px;left: 1%;transform:scale(1.05,1.05);"></div>-->
+<!--				<div id="container" v-else                   style="width:98%;height:100%;resize:both; position: absolute;z-index:0;top:0px;left: 1%;"></div>-->
+				<div id="container" style="width:98%;height:100%;resize:both; position: absolute;z-index:0;top:0px;left: 1%;"></div>
+        <!-- 左上头部 -->
         <transition enter-active-class="animate__animated animate__backInLeft" leave-active-class="animate__animated animate__backOutLeft">
-					<template v-if="isShow" >
+					<template v-if="mapTypeFlag" >
 						<div class="baseBoxLeft left baseBoxHjleft">
 							<img src="@/assets/image/kuang_zuoshang.png" class="in2con_zlf" alt="">
 							<img src="@/assets/image/kuang_youshang.png" class="in2con_zys" alt="">
@@ -97,16 +75,6 @@
 										<span class="in1con_lf_imglf_tit">农田面源污染监测站</span>
 										<span class="in1con_lf_imglf_num"> <animate-number  class="in1con_lf_imglf_num_jix" ref="reNum" from="0" :to="stationCount0" :key="stationCount0" duration="3000"></animate-number>个 </span>
 									</div>
-<!--									<div class="in1con_lf_imglf animate__animated animate__delay-1s animate__infinite animate__slow animate__pulse">-->
-<!--										<img src="@/assets/image/xmgk02.png" class="in1con_lf_imgone" alt="">-->
-<!--										<span class="in1con_lf_imglf_tit">畜禽养殖污染监测站</span>-->
-<!--										<span class="in1con_lf_imglf_num"><animate-number class="in1con_lf_imglf_num_jix" ref="reNum" from="0"  :to="stationCount1" :key="stationCount1" duration="3000"></animate-number>个</span>-->
-<!--									</div>-->
-<!--									<div class="in1con_lf_imglf animate__animated animate__delay-1s animate__infinite animate__slow animate__pulse">-->
-<!--										<img src="@/assets/image/xmgk03.png" class="in1con_lf_imgone" alt="">-->
-<!--										<span class="in1con_lf_imglf_tit">太阳能诱虫灯</span>-->
-<!--										<span class="in1con_lf_imglf_num"><animate-number class="in1con_lf_imglf_num_jix" ref="reNum"  from="0" :to="pestLightCount" :key="pestLightCount" duration="3000"></animate-number>盏</span>-->
-<!--									</div>-->
 								</div>
 							</div>
 							<div style="background: #0d4e62;height: 1px;width: 94%;margin: 0 auto;margin-top: 0.4vw;"></div>
@@ -162,74 +130,19 @@
 						</div>
 					</template>
 				</transition>
-				<!-- 禽畜弹窗 -->
-				<el-dialog :visible.sync="qcdtdialogTableVisible">
-					<div class="jctc" id="modal1" >
-						<div class="in1con_lf_tit ">
-							<img src="@/assets/image/tctiimg.png" class="tctiimg" alt="">
-							<span class="in1con_lf_titshow1" >{{qcdtinfor.stationName}}</span>
-							<img src="@/assets/image/title_bg.png" class="in1con_lf_titimg" alt="">
-						</div>
-						<div class="jctcvban1">
-							<img src="@/assets/image/jctctiao.png" class="jctctiao" alt="">
-						</div>
-						<div class="jctc_add">
-							<img src="@/assets/image/jctcicon1.png" class="jctcicon1" alt="">
-							<span class="jctcvban_tit">站点位置：{{qcdtinfor.stationLocation}}</span>
-						</div>
-						<div class="jctc_add">
-							<img src="@/assets/image/jctcicon2.png" class="jctcicon1" alt="">
-							<span class="jctcvban_tit">建站时间：{{qcdtinfor.buildTime}}</span>
-						</div>
-						<div class="jctc_add">
-							<img src="@/assets/image/jctcicon3.png" class="jctcicon1" alt="">
-							<span class="jctcvban_tit">设备数量：
-								<!-- <span style="color: #f1ff0d;">{{qcdtinfor.deviceCount}}</span>  -->
-								<span style="color: #f1ff0d;">5</span>
-							</span>
-						</div>
-						<div class="jctc_add">
-							<img src="@/assets/image/jctcicon4.png" class="jctcicon1" alt="">
-							<span class="jctcvban_tit">监测指标</span>
-						</div>
-						<div style="margin-left: 3%;">
-							<!-- survItemList -->
-							<span class="jctc_text" v-for="(item,index) in qcdtinfor.survColorItems" :key="index" :style="{background:(item.color)}" >{{item.name}}</span>
-							<!-- <span class="jctc_text" style="background: #445fb4;">总氮</span>
-							<span class="jctc_text" style="background: #52ac2a;">硝钛氨</span>
-							<span class="jctc_text" style="background: #ac4f2a;">空气温度</span>
-							<span class="jctc_text" style="background: #ac4f2a;">空气湿度</span>
-							<span class="jctc_text" style="background: #4c9bb5;">风速</span>
-							<span class="jctc_text" style="background: #6a4cb5;">风向</span>
-							<span class="jctc_text" style="background: #4cb585;">大气压</span>
-							<span class="jctc_text" style="background: #ad8f49;">太阳全辐射</span>
-							<span class="jctc_text" style="background: #52ac2a;">土壤温度</span>
-							<span class="jctc_text" style="background: #4c9bb5;">土壤盐分</span> -->
-						</div>
-						<img src="@/assets/image/ljjr.png" class="ljjr" @click="addTask3(qcdtinfor)" alt="">
-					</div>
-				</el-dialog>
 <!--        地图左下图例-->
-				<div v-if="isShow==true" class="mapTuLi">
-<!--					<div class="scdlist" @click="sbdscdBtn" style="cursor: pointer;">-->
-<!--						<img src="@/assets/image/xcd.png" class="xcdimg" alt="">-->
-<!--						<span class="scdlist_tit">联网式太阳能杀虫灯</span>-->
-<!--					</div>-->
-					<div class="scdlist2">
-						<img src="@/assets/image/xcd2.png" class="xcd2img" alt="">
-						<span class="scdlist_tit">农田面源污染监测站</span>
-					</div>
-					<div class="scdlist3">
-						<img src="@/assets/image/xcd3.png" class="xcdimg" alt="">
-						<span class="scdlist_tit">畜禽养殖污染监测站</span>
-					</div>
-<!--					<div class="scdlist4">-->
-<!--						<img src="@/assets/image/xcd4.png" class="xcdimg" alt="">-->
-<!--						<span class="scdlist_tit">企业站点</span>-->
-<!--					</div>-->
+				<div v-if="mapTypeFlag==true" class="mapTuLi">
+          <div class="scdlist" @click="switchIcon('duizhuhe')">
+            <img src="@/assets/image/icon-blue.png" class="xcdimg" alt="">
+            <span class="scdlist_tit">对竹河监测站</span>
+          </div>
+          <div class="scdlist" @click="switchIcon('tuanbaihe')">
+            <img src="@/assets/image/icon-yellow.png" class="xcdimg" alt="">
+            <span class="scdlist_tit">团百河监测站</span>
+          </div>
 				</div>
 				<transition enter-active-class="animate__animated animate__backInUp" leave-active-class="animate__animated animate__backOutDown">
-					<template v-if="isShow">
+					<template v-if="mapTypeFlag">
 						<div class="zlxg_btm">
 							<img src="@/assets/image/kuang_zuoshang.png" class="in2con_zlf" alt="">
 							<img src="@/assets/image/kuang_youshang.png" class="in2con_zys" alt="">
@@ -239,23 +152,38 @@
 							<img src="@/assets/image/sanguang.png" class="sanguangbt2" alt="">
 							<div>
 								<span class="zywr_titshow">重要污染物治理效果</span>
-								<el-tabs v-model="activeName" type="card" @tab-click="handleClick" >
-									<el-tab-pane v-for="item in stationInfoList" :key="item.id" :label="item.stationName" :name="item.name" lazy >
-										<template v-if="item.name == 0||item.name==1">
-											<div id="myChartDiv"  style="height:12vw;width:100%;" v-if="activeName == item.name"></div>
+                <span class="dataTypeEchart" @click="switchEchartType">
+                  {{dataTypeEchart?'监测值':'对比值'}}
+                </span>
+                <el-select class="dataTypeEchart2"  v-model="dateType" placeholder="请选择" @change="changeDateType">
+                  <el-option
+                      v-for="item in dateTypeOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                  </el-option>
+                </el-select>
+								<el-tabs type="card" @tab-click="handleClick" v-show="dataTypeEchart">
+									<el-tab-pane v-for="(item,index) in stationInfoList" :label="item.stationName" lazy >
+										<template >
+											<div :id="`myChartDiv${index}`" style="height:12vw;width:100%;" ></div>
 										</template>
-										<template v-else>
-											<div id="zlxgChart"  style="height:12vw;width:100%;" v-if="activeName == item.name"></div>
-										</template>
-
 									</el-tab-pane>
 								</el-tabs>
+                <el-tabs  type="card" @tab-click="handleClick" v-show="!dataTypeEchart" >
+                  <el-tab-pane v-for="(item,index) in riverList" :label="item.stationName.split('-')[0]"  lazy >
+                    <template>
+                      <div :id="`myChartDiv2${index}`" style="height:12vw;width:100%;"  ></div>
+                    </template>
+                  </el-tab-pane>
+                </el-tabs>
 							</div>
 						</div>
 					</template>
 				</transition>
+        <!--        右侧展示栏-->
 				<transition enter-active-class="animate__animated animate__backInRight" leave-active-class="animate__animated animate__backOutRight">
-					<template v-if="isShow" >
+					<template v-if="mapTypeFlag" >
 						<div class="leftBox right baseBoxHjleft" style="width:22.5%;overflow: hidden;">
 							<img src="@/assets/image/kuang_zuoshang.png" class="in2con_zlf" alt="">
 							<img src="@/assets/image/kuang_youshang.png" class="in2con_zys" alt="">
@@ -416,6 +344,51 @@
 						</div>
 					</div>
 			</el-dialog>
+
+      <!-- 监测站弹窗 -->
+      <el-dialog :visible.sync="qcdtdialogTableVisible">
+        <div class="jctc" id="modal1123123" >
+          <div class="in1con_lf_tit ">
+            <img src="@/assets/image/tctiimg.png" class="tctiimg" alt="">
+            <span class="in1con_lf_titshow" >{{qcdtinfor.stationName}}</span>
+            <img src="@/assets/image/title_bg.png" class="in1con_lf_titimg" alt="">
+          </div>
+          <div class="jctcvban1">
+            <img src="@/assets/image/jctctiao.png" class="jctctiao" alt="">
+          </div>
+          <div class="jctc_add">
+            <img src="@/assets/image/jctcicon1.png" class="jctcicon1" alt="">
+            <span class="jctcvban_tit">站点位置：{{qcdtinfor.stationLocation}}</span>
+          </div>
+          <div class="jctc_add">
+            <img src="@/assets/image/jctcicon2.png" class="jctcicon1" alt="">
+            <span class="jctcvban_tit">建站时间：{{qcdtinfor.buildTime}}</span>
+          </div>
+          <div class="jctc_add">
+            <img src="@/assets/image/jctcicon3.png" class="jctcicon1" alt="">
+            <span class="jctcvban_tit">设备数量：<span style="color: #f1ff0d;">{{qcdtinfor.deviceCount}}</span> </span>
+          </div>
+          <div class="jctc_add">
+            <img src="@/assets/image/jctcicon4.png" class="jctcicon1" alt="">
+            <span class="jctcvban_tit">监测指标</span>
+          </div>
+          <div style="margin-left: 3%;">
+            <!-- survItemList -->
+            <span class="jctc_text" v-for="(item,index) in qcdtinfor.survColorItems" :key="index" :style="{background:(item.color)}" >{{item.name}}</span>
+            <!-- <span class="jctc_text" style="background: #445fb4;">总氮</span>
+            <span class="jctc_text" style="background: #52ac2a;">硝钛氨</span>
+            <span class="jctc_text" style="background: #ac4f2a;">空气温度</span>
+            <span class="jctc_text" style="background: #ac4f2a;">空气湿度</span>
+            <span class="jctc_text" style="background: #4c9bb5;">风速</span>
+            <span class="jctc_text" style="background: #6a4cb5;">风向</span>
+            <span class="jctc_text" style="background: #4cb585;">大气压</span>
+            <span class="jctc_text" style="background: #ad8f49;">太阳全辐射</span>
+            <span class="jctc_text" style="background: #52ac2a;">土壤温度</span>
+            <span class="jctc_text" style="background: #4c9bb5;">土壤盐分</span> -->
+          </div>
+          <img src="@/assets/image/ljjr.png" class="ljjr" @click="addTask3(qcdtinfor)" alt="">
+        </div>
+      </el-dialog>
 			<!-- 台账禽畜弹窗 -->
 			<el-dialog width="60%"  :visible.sync="qcdialogTableVisible" >
 				<div class="tz_cov">
@@ -579,7 +552,7 @@ import { displayInfo, stationInfo, fwlist, ntfmlist, getNewestData, getPollution
 import vueSeamlessScroll from 'vue-seamless-scroll'
 import hefentianqi from '@/pages/weather/weather.vue'
 export default {
-  name: "Home",
+  name: 'Home',
   components: {
 	vueSeamlessScroll,
 	hefentianqi,
@@ -588,70 +561,76 @@ export default {
   data(){
     return {
       aMap: null,
-	  urlimg:'https://fxnsp.zgzhny.com/lh-api/sys/common/static/',
-	  isShow: true,
+      dataTypeEchart: true,
+      markersOrient: [],
+      markersOther: [],
+      lastClickIcon: '',
+      urlimg:'https://fxnsp.zgzhny.com/lh-api/sys/common/static/',
+      mapTypeFlag: true,
       nowTime: '',
-	  briefconCode:"",
-	  briefconValue:[],
-	  climate_env:[],
-	  water_conser:[],
-	  roll_info:[],
-	  stationInfoList:[],
-	  wrwcode:[],
-	  ntfmnumblist:[],
-	  ntfmnumbtotal:'',
-	  qcfmnumblist:[],
-	  qcfmnumbtotal:'',
-	  getPollutionDictCover:[],
-	  effect_assess0:'',
-	  effect_assess0Value:0,
-	  effect_assess1:'',
-	  effect_assess2:'',
-	  effect_assess3:'',
-	  effect_assess4:'',
-	  pestLightCount:0,
-	  stationCount0:0,
-	  stationCount1:0,
-	//   showData:[],
-	  dialogTableVisible:false,
-	  qcdialogTableVisible:false,
-	  qcdtdialogTableVisible:false,
-	  qyinfordtdialogTableVisible:false,
-	  shipdialogTableVisible:false,
-	  trqxzxdialogTableVisible:false,
-	  trbg:null,
-	  trzx:false,
+      briefconCode:"",
+      briefconValue:[],
+      climate_env:[],
+      water_conser:[],
+      roll_info:[],
+      stationInfoList:[],
+      wrwcode:[],
+      ntfmnumblist:[],
+      ntfmnumbtotal:'',
+      qcfmnumblist:[],
+      qcfmnumbtotal:'',
+      getPollutionDictCover:[],
+      effect_assess0:'',
+      effect_assess0Value:0,
+      effect_assess1:'',
+      effect_assess2:'',
+      effect_assess3:'',
+      effect_assess4:'',
+      pestLightCount:0,
+      stationCount0:0,
+      stationCount1:0,
+      //   showData:[],
+      dialogTableVisible:false,
+      qcdialogTableVisible:false,
+      qcdtdialogTableVisible:false,
+      qyinfordtdialogTableVisible:false,
+      shipdialogTableVisible:false,
+      trqxzxdialogTableVisible:false,
+      trbg:null,
+      trzx:false,
       trbgzhuanq:false,
-	  descriptionValue:null,
-	  timetr: [new Date(), new Date()],
+      descriptionValue:null,
+      timetr: [new Date(), new Date()],
       radiotr: '1',
-	  qyinformation:'',
-	  listData: [],
-	  activeName: '0',
-	  NOSummry:[],
-	  TNSummry:[],
-	  TPSummry:[],
-	  qcdtinfor:'',
-	  resourcedirect:[],
-	  dialogVisible: false,
-	  inforname:'',
-	  loading: true,
-	  zoomData:14,
-	  isShowLightNumber:'1',
-	  switchValue:true,
-	  fullscreen: false, //全屏
-	  dataStr:'',
+      qyinformation:'',
+      listData: [],
+      summryAllData: null,
+      echartInit: {},
+      riverList:[],
+      qcdtinfor:'',
+      resourcedirect:[],
+      dialogVisible: false,
+      inforname:'',
+      loading: true,
+      zoomData:14,
+      isShowLightNumber:'1',
+      switchValue:true,
+      fullscreen: false, //全屏
+      echartIndex: 0,
+      dateType: 'monthDays',
+      dateTypeOptions: [ {
+        value: 'dayhours',
+        label: '日'
+      }, {
+        value: 'monthDays',
+        label: '月'
+      }, {
+        value: 'yearMonth',
+        label: '年'
+      }]
     };
   },
   created(){
-	// 实时时间
-    this.getNowTime();
-	this.indexleft();
-	this.getNewestDataList();
-	this.getPollutionDictList();
-	this.getIndexSummrycover();
-	this.infor();
-	this.indexinfor();
   },
 
 	computed: {
@@ -693,6 +672,7 @@ export default {
 		},
 	},
 	mounted() {
+    console.log('开始初始化！！！！')
 		setTimeout(() =>{
 			this.$nextTick(() => {
 				this.indexinfor();
@@ -704,45 +684,48 @@ export default {
 				this.PestLight(this.zoomData,this.isShowLightNumber);
 			})
 		}, 2000)
+    //初始化数据
+    this.getNowTime();
+    this.indexleft();
+    this.getNewestDataList();
+    this.getPollutionDictList();
+    this.infor();
+    this.indexinfor();
+    this.handleClick({index: this.echartIndex});
 	},
-  methods:{
-	formatter: function (num) {
+  methods: {
+	    formatter: function (num) {
         return num.toFixed(3)
       },
-	sbdscdBtn(){
-		var url = 'https://wlw.zklsfk.com/admin/index?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiLmsrPmtKXluILlhpzkuJrlhpzmnZHlsYAiLCJleHAiOjE2ODk2MjU0ODUsImlhdCI6MTY4ODEzMDI1NiwianRpIjoiNTcxMTY5MTAtODczZC00ZjI1LWFkNzItZjA2NWU3NmFkNDIwIn0.52iF21xidGFllgfcsSgN-cLlysI0W7Ad8ie48LsV9x4'
-		//跳转1
-		window.open(url,"_blank");
-	},
-	isShowBtn(){
-		this.isShow = !this.isShow
-		this.$nextTick(()=> { // 加载echarts图
-			this.zxong()
-			this.zxtwoong()
-		})
-		if (this.isShow==true) {
+      sbdscdBtn(){
+        var url = 'https://wlw.zklsfk.com/admin/index?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiLmsrPmtKXluILlhpzkuJrlhpzmnZHlsYAiLCJleHAiOjE2ODk2MjU0ODUsImlhdCI6MTY4ODEzMDI1NiwianRpIjoiNTcxMTY5MTAtODczZC00ZjI1LWFkNzItZjA2NWU3NmFkNDIwIn0.52iF21xidGFllgfcsSgN-cLlysI0W7Ad8ie48LsV9x4'
+        //跳转1
+        window.open(url,"_blank");
+      },
+	mapTypeSwitch(){
+		this.mapTypeFlag = !this.mapTypeFlag
+		if (this.mapTypeFlag==true) {//正常模式
 			this.zoomData = 14
 			if (this.isShowLight==undefined) {
 				let isShowLight = '1'
 				this.PestLight(this.zoomData,isShowLight);
-
 			} else {
 				let isShowLight = this.isShowLight
 				this.PestLight(this.zoomData,isShowLight);
 			}
-
-		} else {
+      setTimeout(() => {
+        this.$nextTick(()=> {
+          this.handleClick({index: 0});
+        })
+      }, 1000)
+		} else {// 地图模式
 			this.zoomData = 15
 			if (this.isShowLight==undefined) {
-				let isShowLight = '1'
-				this.PestLight(this.zoomData,isShowLight);
-
+				this.PestLight(this.zoomData,'1');
 			} else {
-				let isShowLight = this.isShowLight
-				this.PestLight(this.zoomData,isShowLight);
+				this.PestLight(this.zoomData,this.isShowLight);
 			}
 		}
-
 	},
 	indexleft(){
 		displayInfo().then(res=>{
@@ -764,7 +747,6 @@ export default {
 			this.effect_assess2 = res.result.effect_assess.detailList[2]
 			this.effect_assess3 = res.result.effect_assess.detailList[3]
 			this.effect_assess4 = res.result.effect_assess.detailList[4]
-
 		})
 	},
 	indexinfor(){
@@ -1000,84 +982,35 @@ export default {
 			scale:(2 , 2.5)
 		});
       that.aMap.on('complete',  (e) =>{
-			// 创建 AMap.LabelsLayer 图层
-			var layer = new AMap.LabelsLayer({
-				zooms: [3, 20],
-				zIndex: 1000,
-				collision: false,
-			});
-			// 将图层添加到地图
-			that.aMap.add(layer);
-			var markers = [];
-			var markerData = res.result;
-			let LabelMarker = markerData.filter(ele=>ele.type == 'light');
-			let Marker = markerData.filter(ele=>ele.type != 'light');
-
-			LabelMarker.map((item,index)=>{
-				let curData = {
-					position:[item.longitude,item.latitude],
-					icon:{
-						// type: 'image',
-						image:this.urlimg + item.picUrl,
-						anchor:'bottom-center',
-						type:item.type,
-						name:item.name,
-						ids:item.ids,
-						extPics:item.extPics,
-						notes:item.notes,
-						zIndex: item.type=="orient"?999999:item.type=="cusLocaltion"?888888:1,
-					},
-					offset: new AMap.Pixel(item.width,item.height),//偏移量
-				};
-				var labelMarker = new AMap.LabelMarker(curData);
-
-				markers.push(labelMarker);
-				// else {
-					// mouseover
-					// labelMarker.on("click", (e) => {
-					// 	console.log("eeeeeee",e)
-					// 	 this.$notify({
-					// 		title: item.name,
-					// 		duration:1000
-					// 	 });
-
-					// })
-
-				// }
+        var markerData = res.result;
+        let Marker = markerData.filter(ele=> ele.type != 'light');//其他类型
+        Marker.map(item=>{
+            let marker = new AMap.Marker({
+              zIndex: item.type=='orient'?1000:500,
+              icon: this.urlimg + item.picUrl,
+              position:[item.longitude,item.latitude],
+              offset: new AMap.Pixel(item.width,item.height),//偏移量
+              extData:{
+                ids:item.ids,
+                extPics:item.extPics,
+                notes:item.notes,
+                name:item.name,
+                item: item
+              }
+            });
+          if (item.type=='orient') {//监测站弹窗
+            marker.on('click', e => {
+              let indexnumb = e.target.getExtData().ids.slice(-1);
+              this.qcdtinfor = this.stationInfoList[indexnumb]
+              this.qcdtdialogTableVisible = true
+              console.log('livestock or orient',this.qyinformation)
+            })
+            this.markersOrient.push(marker)
+          } else {
+            this.markersOther.push(marker)
+          }
+				  marker.setMap(that.aMap);
 			})
-			Marker.map(item=>{
-				let marker = new AMap.Marker({
-					icon: this.urlimg + item.picUrl,
-					position:[item.longitude,item.latitude],
-					offset: new AMap.Pixel(item.width,item.height),//偏移量
-					extData:{
-						ids:item.ids,
-						extPics:item.extPics,
-						notes:item.notes,
-						name:item.name,
-					}
-				});
-				if (item.type=="livestock"||item.type=="orient") {
-					marker.on("click", e => {
-						let indexnumb = e.target.getExtData().ids.slice(-1);
-						this.qcdtinfor = this.stationInfoList[indexnumb]
-						this.qcdtdialogTableVisible = true
-					})
-				} else if(item.type=="cusLocaltion"){
-					marker.on("click", e => {
-						this.qyinformation= {
-							extPics:e.target.getExtData().extPics,
-							notes:e.target.getExtData().notes,
-							name:e.target.getExtData().name,
-						}
-						console.log("this.qyinformation",this.qyinformation)
-						this.qyinfordtdialogTableVisible = true
-					})
-				}
-				marker.setMap(that.aMap);
-			})
-			// 一次性将海量点添加到图层
-			layer.add(markers);
 			this.$forceUpdate()
       that.aMap.setFitView();
       setTimeout(() => {
@@ -1249,241 +1182,165 @@ export default {
 			this.getPollutionDictCover = res.result
 		})
 	},
-	 handleClick(tab, event) {
-		let stationCode = ''
-		getIndexSummry(stationCode).then(res=>{
-			if (res.code ='200') {
-				this.NOSummry = res.result[tab.index].NOSummry
-				this.TNSummry = res.result[tab.index].TNSummry
-				this.TPSummry = res.result[tab.index].TPSummry
-				this.NHSummry = res.result[tab.index].NHSummry
-				this.CODSummry = res.result[tab.index].CODSummry
-				this.dataStr = res.result[4].dataStr
-			}
-			this.$nextTick(()=> { // 加载echarts图
-				this.zxong()
-				this.zxtwoong()
-			})
-		})
-      },
-	getIndexSummrycover(){
-		let stationCode = ''
-		getIndexSummry(stationCode).then(res=>{
-			if (res.code ='200') {
-				this.NOSummry = res.result[0].NOSummry
-				this.TNSummry = res.result[0].TNSummry
-				this.TPSummry = res.result[0].TPSummry
-				this.dataStr = res.result[4].dataStr
-				if (this.NOSummry ) {
-					this.$nextTick(()=> { // 加载echarts图
-						setTimeout(() =>{
-							this.zxong()
-						}, 1000)
-					})
-				}
-			}
-		})
-	},
+  changeDateType() {
+    this.summryAllData = null;
+    for(let key in this.echartInit){
+      this.echartInit[key].dispose();
+    }
+    this.echartInit = {};
+    this.handleClick({index: this.echartIndex});
+  },
+  switchEchartType(){
+    this.dataTypeEchart = (!this.dataTypeEchart);
+    this.echartInit = {};
+    this.activeName2 = this.riverList[0].stationName
+    setTimeout(() => {
+      this.handleClick({index: 0});
+    }, 300);
+  },
+  handleClick(tab, event) {
+    this.echartIndex = tab.index - 0;
+   if(this.summryAllData) {
+     this.$nextTick(()=> { // 加载echarts图
+       this.initEchartData(this.echartIndex)
+     })
+   } else {
+     getIndexSummry({summrayMode: this.dateType}).then(res=>{
+       if (res.code === 200) {
+         this.summryAllData = res.result;
+         let len = this.summryAllData.length;
+         this.riverList = [];
+         this.summryAllData.map((item1,index) => {
+           if(index % 2 === 0 && item1['datas'] && (index + 1) < len) {
+             let data1 = item1['datas'];
+             let keys = Object.keys(data1);
+             let data2 = this.summryAllData[index+1]['datas'];
+             let data3 = {}
+             let item3 = JSON.parse(JSON.stringify(item1));
+             if(data2){
+               keys.map(key => {
+                 if(data1[key] instanceof Array) {
+                   data3[key] = []
+                   data1[key].map((itemSub,index) => {
+                     data3[key].push(data2[key][index] - data1[key][index])
+                   })
+                 }
+               })
+               item3['datas'] = data3;
+               this.riverList.push(item3);
+             }
+           }
+         });
+         // console.log('对比数据初始化：', this.riverList)
+         setTimeout(() => {
+           this.$nextTick(()=> { // 加载echarts图
+             this.initEchartData(this.echartIndex)
+           })
+         }, 1000);
+       }
+     })
+   }
+  },
 	// 折线图数据
-	zxong(){
+	initEchartData(index){
 		this.$nextTick(() => {
-      let divDom = document.getElementById('myChartDiv');
-      if(!divDom){return;}
-			var myChartLine = this.$echarts.init(divDom);
-			var optionLine = {
-			tooltip: {
-				trigger: 'axis'
-			},
-			grid: {
-				top:'14%',
-				left: '3%',
-				right: '4%',
-				bottom: '9%',
-				containLabel: true
-			},
-			toolbox: {
-			},
-			legend: {
-				padding:[10,50,0,0],
-					x:'right',      //可设定图例在左、右、居中
-					y:'top',     //可设定图例在上、下、居中
-				data: ['总氮', '总磷', '硝态氮'],
-				textStyle:{
-				fontSize: 12,//字体大小
-				color: '#ffffff'//字体颜色
-				},
-      },
-			xAxis: {
-				type: 'category',
-				boundaryGap:false,
-				// data:['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'],
-				data:this.dataStr,
-				axisLine: {
-				lineStyle: {
-				color: '#2295ee', //x轴的颜色
-				width: 1, //轴线的宽度
-				},
-				},
-			},
-			yAxis: {
-				type: 'value',
-				/*min:0,
-				max:60,
-				splitNumber:6*/
-				splitLine: {
-          lineStyle: {
-          // 设置背景横线
-          color: '#2295ee'
+      let domKey = `myChartDiv${index}`;
+      let data = this.summryAllData[index];
+      if(!this.dataTypeEchart) {// 对比数据
+        domKey = `myChartDiv2${index}`;
+        data = this.riverList[index];
+      }
+      if(this.echartInit[domKey]) {
+        this.echartInit[domKey].dispose()
+      }
+      // console.log('初始化echart：', index, domKey, data, /^\d+$/.test(index) ,this.echartInit[domKey])
+      let divDom = document.getElementById(domKey);
+      if(!divDom){
+        console.log('没找到dom：', domKey, divDom)
+        return;
+      }
+      console.log('开始初始化echart：')
+      let dataObj = [];
+      let i = 0;
+      let colors = ['#2295ee', '#5cdd67', '#c0ca41', '#6115d1', '#ee6922'];
+      for(let key in data['datas']){
+        if(data['datas'][key] instanceof Array) {
+          dataObj[i++] = {
+            name: key,
+            color: colors[i],
+            value: data['datas'][key]
           }
-				},
-				axisLine: {
-          lineStyle: {
-            color: '#2295ee', //x轴的颜色
-            width: 1, //轴线的宽度
+        }
+      }
+      let dataStr = data['dateStr']
+      this.echartInit[domKey] = this.$echarts.init(divDom);
+			var optionLine = {
+        tooltip: {
+          trigger: 'axis'
+        },
+        grid: {
+          top:'14%',
+          left: '3%',
+          right: '4%',
+          bottom: '9%',
+          containLabel: true
+        },
+        toolbox: {},
+        legend: {
+          padding:[10,50,0,0],
+          x:'right',      //可设定图例在左、右、居中
+          y:'top',     //可设定图例在上、下、居中
+          data: dataObj.map(item => item.name),
+          textStyle:{
+            fontSize: 12,//字体大小
+            color: '#ffffff'//字体颜色
           },
-				},
-			},
-			series: [ {
-				name:'总氮',
-				type:'line',
-				stack: '总量1',
-				data:this.TNSummry,
-				lineStyle: {
-					color: '#00FF89' // 设置线的颜色为红色
-				},
-				smooth:true,
-				},
-				{
-				name:'总磷',
-				type:'line',
-				stack: '总量1',
-				data:this.TPSummry,
-				lineStyle: {
-					color: '#FF0D00' // 设置线的颜色为红色
-				},
-				smooth:true,
-				},
-				{
-				name:'硝态氮',
-				type:'line',
-				stack: '总量1',
-				data:this.NOSummry,
-				lineStyle: {
-					color: '#FFC100' // 设置线的颜色为红色
-				},
-				smooth:true,
-				}
-			]
-			};
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: dataStr,
+          axisLine: {
+            lineStyle: {
+              color: '#2295ee', //x轴的颜色
+              width: 1, //轴线的宽度
+            },
+          },
+        },
+        yAxis: {
+          type: 'value',
+          /*min:0,
+          max:60,
+          splitNumber:6*/
+          splitLine: {
+            lineStyle: {
+            // 设置背景横线
+            color: '#2295ee'
+            }
+          },
+          axisLine: {
+            lineStyle: {
+              color: '#2295ee', //x轴的颜色
+              width: 1, //轴线的宽度
+            },
+          },
+        },
+        series: dataObj.map(item => {
+         return {
+           name: item.name,
+           type:'line',
+           stack: '总量1',
+           data: item.value,
+           lineStyle: {
+             color: item.color // 设置线的颜色为红色
+           },
+           smooth:true,
+         }
+        }),
+		  };
 			//为echarts对象加载数据
-			myChartLine.setOption(optionLine);
+      this.echartInit[domKey].setOption(optionLine);
 		})
-
-	},
-	zxtwoong(){ //畜禽数据折线图
-		this.$nextTick(() => {
-      let divDom = document.getElementById('zlxgChart')
-      if(!divDom){return;}
-			var zlxgmyChartLine = this.$echarts.init(divDom);
-			var zlxgoptionLine = {
-			tooltip: {
-				trigger: 'axis'
-			},
-			grid: {
-				top:'14%',
-				left: '3%',
-				right: '4%',
-				bottom: '9%',
-				containLabel: true
-			},
-			toolbox: {
-			},
-			legend: {
-				padding:[10,50,0,0],
-					x:'right',      //可设定图例在左、右、居中
-					y:'top',     //可设定图例在上、下、居中
-				// data: ['总氮', '总磷', '硝态氮'],
-				textStyle:{
-				fontSize: 12,//字体大小
-				color: '#ffffff'//字体颜色
-				},
-				},
-			xAxis: {
-				type: 'category',
-				boundaryGap:false,
-				data:this.dataStr,
-				axisLine: {
-				lineStyle: {
-				color: '#2295ee', //x轴的颜色
-				width: 1, //轴线的宽度
-				},
-				},
-			},
-			yAxis: {
-				type: 'value',
-				/*min:0,
-				max:60,
-				splitNumber:6*/
-				splitLine: {
-				lineStyle: {
-				// 设置背景横线
-				color: '#2295ee'
-				}
-				},
-				axisLine: {
-				lineStyle: {
-				color: '#2295ee', //x轴的颜色
-				width: 1, //轴线的宽度
-				},
-				},
-			},
-			series: [
-			{
-				name:'总氮',
-				type:'line',
-				stack: '总量1',
-				data:this.TNSummry,
-				lineStyle: {
-					color: '#009DB2' // 设置线的颜色为红色
-				},
-				smooth:true,
-			},
-			{
-				name:'总磷',
-				type:'line',
-				stack: '总量1',
-				data:this.TPSummry,
-				lineStyle: {
-					color: '#00FF89' // 设置线的颜色为红色
-				},
-				smooth:true,
-			},
-			{
-				name:' 氨氮',
-				type:'line',
-				stack: '总量1',
-				data:this.NHSummry,
-				lineStyle: {
-					color: '#FF0D00' // 设置线的颜色为红色
-				},
-				smooth:true,
-			},
-			{
-				name:' 化学需氧量',
-				type:'line',
-				stack: '总量1',
-				data:this.CODSummry,
-				lineStyle: {
-					color: '#FFC100' // 设置线的颜色为红色
-				},
-				smooth:true,
-			}
-		]
-			};
-			//为echarts对象加载数据
-			zlxgmyChartLine.setOption(zlxgoptionLine);
-		})
-
 	},
     // 实时时间
      getNowTime () {
@@ -1547,28 +1404,51 @@ export default {
 		let element = document.documentElement;
 		if (this.fullscreen) {
 			if (document.exitFullscreen) {
-			document.exitFullscreen();
+			  document.exitFullscreen();
 			} else if (document.webkitCancelFullScreen) {
-			document.webkitCancelFullScreen();
+			  document.webkitCancelFullScreen();
 			} else if (document.mozCancelFullScreen) {
-			document.mozCancelFullScreen();
+			  document.mozCancelFullScreen();
 			} else if (document.msExitFullscreen) {
-			document.msExitFullscreen();
+			  document.msExitFullscreen();
 			}
 		} else {
 			if (element.requestFullscreen) {
-			element.requestFullscreen();
+			  element.requestFullscreen();
 			} else if (element.webkitRequestFullScreen) {
-			element.webkitRequestFullScreen();
+			  element.webkitRequestFullScreen();
 			} else if (element.mozRequestFullScreen) {
-			element.mozRequestFullScreen();
+			  element.mozRequestFullScreen();
 			} else if (element.msRequestFullscreen) {
 			// IE11
-			element.msRequestFullscreen();
+			  element.msRequestFullscreen();
 			}
 		}
 		this.fullscreen = !this.fullscreen;
 	},
+    switchIcon(flag){
+      let that = this;
+      let arr = [];
+      if(this.lastClickIcon == flag){
+        this.lastClickIcon = ''
+      } else {
+        this.lastClickIcon = flag;
+        if(flag == 'duizhuhe'){
+          arr = this.markersOrient.filter(item => item.getExtData().name.indexOf("对竹河") != -1);
+        } else if (flag == 'tuanbaihe'){
+          arr = this.markersOrient.filter(item => item.getExtData().name.indexOf("团柏河") != -1);
+        }
+      }
+      if(arr && arr.length > 0){
+        that.aMap.setFitView(arr, false, [200,500,300,300], 16);
+        // setTimeout(() => {
+        //   let temp = that.aMap.getCenter();//矫正显示标点位置在正中心
+        //   that.aMap.setZoomAndCenter(that.aMap.getZoom()-2, [temp.lng, temp.lat - 0.15]);
+        // },2000)
+      } else {
+        that.aMap.setFitView(null, false, [100,400,200,200], 16);
+      }
+    }
   },
 }
 </script>
@@ -2442,7 +2322,7 @@ export default {
 
 .mapTuLi{
   position: absolute;
-  bottom: -51px;
+  bottom: 334px;
   left: 456px;
 }
 
diff --git a/src/pages/Home/index map.vue b/src/pages/Home/index_map.vue11123
similarity index 98%
rename from src/pages/Home/index map.vue
rename to src/pages/Home/index_map.vue11123
index 5820c11..0f026ca 100644
--- a/src/pages/Home/index map.vue	
+++ b/src/pages/Home/index_map.vue11123
@@ -208,27 +208,27 @@
 <!--					</div>-->
 					<div class="scdlist2">
 						<img src="@/assets/image/xcd2.png" class="xcd2img" alt="">
-						<span class="scdlist_tit">畜禽养殖污染监测站</span>
+						<span class="scdlist_tit">对竹河监测站</span>
 					</div>
 					<div class="scdlist3">
 						<img src="@/assets/image/xcd3.png" class="xcdimg" alt="">
-						<span class="scdlist_tit">畜禽养殖污染监测站</span>
+						<span class="scdlist_tit">团百河监测站</span>
 					</div>
 				</div>
-				<div v-else>
-<!--					<div class="scdlistpos" @click="sbdscdBtn" style="cursor: pointer;">-->
-<!--						<img src="@/assets/image/xcd.png" class="xcdimg" alt="">-->
-<!--						<span class="scdlist_tit">联网式太阳能杀虫灯</span>-->
+<!--				<div v-else>-->
+<!--&lt;!&ndash;					<div class="scdlistpos" @click="sbdscdBtn" style="cursor: pointer;">&ndash;&gt;-->
+<!--&lt;!&ndash;						<img src="@/assets/image/xcd.png" class="xcdimg" alt="">&ndash;&gt;-->
+<!--&lt;!&ndash;						<span class="scdlist_tit">联网式太阳能杀虫灯</span>&ndash;&gt;-->
+<!--&lt;!&ndash;					</div>&ndash;&gt;-->
+<!--					<div class="scdlist2pos">-->
+<!--						<img src="@/assets/image/xcd2.png" class="xcd2img" alt="">-->
+<!--						<span class="scdlist_tit">畜禽养殖污染监测站</span>-->
 <!--					</div>-->
-					<div class="scdlist2pos">
-						<img src="@/assets/image/xcd2.png" class="xcd2img" alt="">
-						<span class="scdlist_tit">畜禽养殖污染监测站</span>
-					</div>
-					<div class="scdlist3pos">
-						<img src="@/assets/image/xcd3.png" class="xcdimg" alt="">
-						<span class="scdlist_tit">畜禽养殖污染监测站</span>
-					</div>
-				</div>
+<!--					<div class="scdlist3pos">-->
+<!--						<img src="@/assets/image/xcd3.png" class="xcdimg" alt="">-->
+<!--						<span class="scdlist_tit">畜禽养殖污染监测站</span>-->
+<!--					</div>-->
+<!--				</div>-->
 				<transition enter-active-class="animate__animated animate__backInUp" leave-active-class="animate__animated animate__backOutDown">
 					<template v-if="isShow">
 						<div class="zlxg_btm">
@@ -242,7 +242,7 @@
 								<span class="zywr_titshow">重要污染物治理效果</span>
 								<el-tabs v-model="activeName" type="card" @tab-click="handleClick" >
 									<el-tab-pane v-for="item in stationInfoList" :key="item.id" :label="item.stationName" :name="item.name" lazy >
-										<div id="myChart"  style="height:12vw;width:100%;" v-if="activeName == item.name"></div>
+										<div id="myChart2222"  style="height:12vw;width:100%;" v-if="activeName == item.name"></div>
 									</el-tab-pane>
 								</el-tabs>
 							<!-- <ul class="layui-tab-title" style="width:70%;" >
@@ -958,7 +958,7 @@ export default {
 	},
 	// 折线图数据
 	zxong(){
-		var myChartLine = this.$echarts.init(document.getElementById('myChart'));
+		var myChartLine = this.$echarts.init(document.getElementById('myChart2222'));
 		var optionLine = {
 		tooltip: {
 			trigger: 'axis'