From e737c6fa7ed36800099631070a1f06a5c6375ed3 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 19 Jul 2023 14:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=9B=91=E6=8E=A7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BE=E7=89=87=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/nodatapic.jpg                  |  Bin 0 -> 11031 bytes
 src/assets/img/nodatapic2.jpg                 |  Bin 0 -> 24004 bytes
 src/utils/api/index.js                        |   30 +-
 .../alarmHandling/components/historyimg.vue   |   11 +-
 src/views/alarmHandling/index.vue             |  120 +-
 src/views/components/carouselChart.vue        |   21 +-
 .../realTimeMonitor/components/infoDialog.vue |    3 +-
 src/views/realTimeMonitor/index.vue           | 1085 +++++++++--------
 src/views/realTimeMonitor/picIndex.vue        |    2 +-
 src/views/realTimeMonitor/previewContain.vue  |   94 +-
 10 files changed, 813 insertions(+), 553 deletions(-)
 create mode 100644 src/assets/img/nodatapic.jpg
 create mode 100644 src/assets/img/nodatapic2.jpg

diff --git a/src/assets/img/nodatapic.jpg b/src/assets/img/nodatapic.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..100f935a57f3bfa0d3fb5849d835d357f05a155b
GIT binary patch
literal 11031
zcmeHtc|6qZ-v4(j5iyh{>nMt>2_egnkR*vrku3??vej4zWnU&l!fh~w#H5?-Cc7d_
z_TAW*Fftg7nP<AsIrr~$Ugy4l=ef`Gx}WEdGq2b6`p$Q*Yv%iTU!Uv!S%)%2nF83Z
z=;-MHAP@-n<wd~((%Nvx`v72I0EkmRVgzV30DzYI?w1uBpkJ<kT@3(~Q9uh|VqiGT
zaER$J<6&lIrXye;HZUtISdfeRD36HH=~Kc&!Y9R~l+TKZpO-i(eD2b@^D1f@8XBk1
z>ga2$Ur~l?sD1wt5Hm9~m<24r#wMV4M)-`{fBQxG0I)NHOh6;FppyU%JBXGYL}>yb
zRJrM?=zaxAy{Dn2qd&yJc$kTqx}b~=paId+($LY;)6>yWX9KA703AF1(G#+ohmIN9
zFr0MfI2RnB#VCBSq@MFe4_-v>u1CmWCNA#dJiMn)i;A5QmsdEisHA*B>yoyP?q$6z
z#wIsSVYhCZ+1|6eZ|~svz|+h7(POxe?~|vYVc`*xQ3;99lagPgyiCnT=j6W1%P)BS
z?&s37_vICpRSk_z%`L5MA3uHR?du;H92y?MP0!5E%`Yr2EpL3=By4T(5O?>!;{pM+
ze}VNYvVXwEPQ^t-M@LJ?@EsS3=J9vn>~!=eWDgzHG-9xEKX&q5FeAss_^gup!@_bm
z@SJx&dYHIG<Z-7qzC-&3*}n!X<PRbH71;m7H3A%=1yPkp%ML(+8Is<#IR)UDj86OZ
z<U#1=Zfh~Jy{IV4tYxU?h=(u85aUI3#HC3=8_%Z(2aD9yXi9u)Jf*pa?xlsqI*dO<
zGJi89ZMwDf%%XPZC*v`%@oMzP1w&pabtS1LQUKM_Z}L8(WS{a`r{x;3rVc|UIvxC<
zng8s;|FLs09-YqqWD$-je5gk65vY!Djw{2pSH`gCj+Yup8jA;g$nQM7#wr`d@f0pl
z)bt)EJ7x}jA!+aN9#l_qdPf05%ctFTmmDcTpi>ls5X2}|{7njdfWQ=T_o%$v9s#)v
z>r@~-4uQ^I?!m5nfzBDLg}L@<a{?Sj+JDO6L`{QtxxHofwq8&GO@*x6WFZO=|M&(4
zz}!X<j%h$-MaLjlycN`^_KXW{eou0v|49BX>g><ja|3(E+?3Gk$|6%tfH!C8H1cRY
zZXIl4^(J0V(kUYG@q}kXoQgdv6WuWKb)+kN6|==SRhDW~q4VyZ%U7Qz)D_7?tDL-J
zmuAI3#k6J~k&w3Hc3?aDZsj~vV~FZj*JdV5lte0OS~PTu?tO{tL>te~yG-S{NiN4g
zv3=cblh2~VpCT1cSk}s-va&l^UW?Z@ALM2+dwL!@6{eA(QAt{sSuK(yhnz?393WbP
zq<c)T?@PP(7>6mq<Q4_sh5m2{RBPWLkMu$ph3zQ-VvzKpxwb>mXg7INSKOWtZQZ!Z
z0g~eU>@=a?<FA;15N(v;oo4MXaw-g5v1jT=l3Hh`09}3<62k+@537sC!ep+UPztb6
zJ4mK2gW$_+WGH~z8Wt~*|1)iQb_J4XKEX`^GIp$pto?<!b$$o3SZ%`K)r9-WN~D%a
zcB68k$2%vZ&t4E0E51jZ=!SR0oxc8jkeTjN<Gi0nt`&PLpulm{LT7PksT`)Mm2$$7
zCNXBpe(yT{Yl&pMX!Ptx7|PT0RQBj`JN8xBIO;iM#lnCOFw*Au-C>G|fX-U<VOIvM
z4(J9#?TJsw+T;4<T008RZ2<T;p&kaD>Fe8nvUIKJDd*o?6)UB|o(V=Ov4wT0#J)@c
zk}hrYRBLmX{L{zXRD)d$hxJNJO6y0svZ0?VDXC{{d7vvQq6WBAeU6Gfv-_#Do1roj
z%t`^CYF+Ik`O6#dI)#<I=c%qpxZWz9Z;Z@b@ANZ$i+2khZHdK=J;>IM{=7-<t7aSl
z8`KdCJ&7_O8uU&jHfi$=RlC&0cq<c@?x2^{d66ya_eM%lL+xDaWpA?LRx4Yk)I7x3
z-37BU{Z)FrSj^NeHcYSS&6qO1>)`P@u6nlu8%E~oDWd?ZJ_=4IFS9C`($b4TU0Fpk
zVC|^`*0oKe9)+~D>NIm@fdtc27dMvC=~ICUNmDZ61A(I5vwdY})~4-$N}@YQPse(o
zJd67DBEL&3yk3yATp6iX(pAVZ*;)3+YxP3o$%cUennsq{me+=Z0#2>oNcy2A3c%)7
z%gPu1v(uxjocoCjJmcMDn%ZNHSTJGo$OD&rvpW-dqRBn0sn^>>G?(IPZUkmRo9k#x
zHUd7^?7TSE)O|vm-8MaahclQ0Fd0%cgIbv+d6Fcuscs`0=eBo5lLGjc6OAYUGk3!z
z;rJ8st{Wb0!jMSZtbe4=iR~?NwoAQVMOU5{gG>R%1Q<M;#ODyKcF8pqpcUFs*~Lc;
zzcT3WjW%$DBW>K~c7FyQs{5n5nFv<ITXkF%AhQXw(~bx|KmLq=opeTxkBq<|HoEY|
zjg9Jp<@ma|D({>Gy`$Aij<V?`T@TPd$Wh28sL-vTKlJshx6-SM7b-?tH0~dl&#2UX
zz||PKaZa`ri8H4p+{#cm5~p}**D7CO<Uy5gD8WMAd}US6FpBYoWDEVmko!mVq&6oC
z@a;}1Vs9S1$J~oim7A6kaM}d3t@U~p>Pm3Prmw3-Q2@U|_dSr|TmFH_>DA-JkZ&_)
zCGWzoy6>l%l-%a=1E;Vm&2D{E=tVR*;upxl@f2VRcwJ>TP2?guOi1)*W;B&>RYjDu
zw4&WRp|WerIfJTN+!1S5+IZ7=x_3&WQVYZV7iF#%>(U;eiAQ?JbTx4+>-6x9ZG8hp
zz4CLdkdy{}A+)Q;n%d<zRv;}-Y_k=6Bb^h!QBG9;6Oe974fw%w&9SLMx5Kv;J4EYJ
zz!yAZDFDby18P~;K@=umnT*7aQ{!G8Dd`zC^_nCKFpCx4pWN3NEP_Q6<0g%(h>h-C
zk>~0I-RCa10)Z>2j(ayW{Oo?@xDN%`W@y6hv1n0kAOi(BX7m|{iP&MQk#k~G^*Cc{
zEHulGT<dW=D@kIf0MA%+DS(v(RnJU>s&6c!A2Kd<<KU&W7e_{v`8>tj)6;FM_CPQS
z@K*g4)q*^L>=U8HR2PdihJ2%|5obf`!lgM})d_pgn8dP!esgqfFp#3FUL5$gQy-Mt
z{f5d4L|b(MV(<-i?{FqKC2<X$dm;6^Y3hF)QWuBUB}MWo9{B2#3Kw|yRO%t$L>wl!
zmLT8qGa3~gvZMa_g9=_dzTazk>2C9gS@VMPL)OEbu2I0$dL4u)tnp6KH>om?{)B$J
z{L_1cMJHs`X#EBeS8ULd?ge7)4}JM@vedH_d1t41a(a>!;Yk4o9Vh@nd|p1l3fEz#
zkotgYAQt{MKPBz{T`T_0IG@+Bx9sruhD?@A?xS$08@-aum+3#Sy?ZI#WiYe|R$7l*
z@j~#xp_jh6l<r&Hg`6Izp)L6qpf^*X42`{uaPgO>GFcx=qN9>^-wF4aw0E0&8if&|
zf*RZ~Gy4eg>BYU|v^Tfg-Uempu?j?t!FSy!Ykhry5U`e|l$~dmg}-UfEWXdZ_1+=I
zxN}be`BVjo&3*=_8K_!fDsMm$SfD#(L$Y`(1vsKA%FE@V6iO?S7O6yKeIW*OftWi(
z-}{wMt9Pty>&x_w@RaWDz4EKR0oqJoSq<wm1bS7CX8iE)^Y(ei<V3VbpIz%)P+mwR
z!VEIuejhA_YpYA&_PYAFYeo9ECh6W#QmLHfT~rq!S`+OXBg&cRS9^|jk-M_Vv|Fbu
z-JYVpog*U2RftvHSL18Kc~r|~jx*dlgxaS7q7;DB)T;}C`|0+btSc#z9lNBbBd203
zEO2<IIHA%U!#_F#pMbLJJDy3no_1P?&MsIrt}(9W;EYAgoWE|3zsr}aHu@3I^F@K5
zFnc#KtH_AdmC{GP7IjI2S6-gtN4i&Iro>qgWc_3$c^a`OW1$$MY6lI?E4}6Qay{YZ
z{rE&7-5A?+_QWp1zJ1UKO()#`s;TzI<LF`;Y3oNi(N1rypF9a8%)FPlT?5ALSH^aQ
zs$P?PrN${u3+@hUT`&>ZKm=_m+P;Rn>igW9eJ9j4pTjHkh0Hs7r&*ycPc5ym&^alE
z_DQ-xW7g6@Mz+E#VLg)9?kijDMdo(X_?x*dm@?0g%AhLW`)E9rl!QIziAuf}fPj}R
zZo{@ypQ^hgbttmODPF<_kqSHgsf<14)-<{HkpiH(lGakX3^82T0VyxTSndm<`)|ub
zBkmSf#5BjDj4eAm@^e#yGVdjh)Hu}-Bu~f?6AP^@%v;^<_dn9KRX?8#!OR4w3iq+L
zlDQ^BzsEUU2Sj;9!zdn0+Nq=f*hA$|95a6X0OX8VZ$p#WuvAyx&DBaKMVWyNwKm9+
z(*k<V^1JsPhxLOtIFAeX6sOiaZs6K5Bi+Y_Oen;OrFvh|3_`~-l=*RjHK?}X89j%Q
z#&3=vt(e0PaZEQuhu#jum!Av_E7YGa4{2KI!iC9~V)@9m!sMHqv45W{nHbunl^SXP
z=5zRA&DdSGHRuY}nQ(emDaNX@+h^Y%oftxowKBcQ89vkw$aMw!4Q4y-vE)U{m-lXg
z<=XBa@qa(!q0Ikf*x`bA?DO*_BNsn1(cM_&i4e@=PjxH=HBx{EpDFMjgDwRKV%8;z
zW&l)6=Y=2wWs8vEWa#Fc3pKraK@uZ(lu(&3;kHk};&g(1IExE&Rv?@NzgSkzs6HU~
z(nV;>p|9%b)NNC{OOj3E!3l<%w>*d{dM}zx_qrp|Rporwbw-V`HwAoC$A!)c1!;bD
zaGmnOM%Rgtjvgw(Pe>P!t?p}BwB;Sdlk5q5z5ew0y=jT&!5Y2F^;^5~S|`SCA~&%6
zmg9A0{Y!#O-2@9Arxle`+(#>|yEYj&hZ*q5TrUpGQGn`k?3>u($67}Ec>6qZJlj6J
zlfJwgO&d2Awk$C!9=jd=YT22W+%hs3G}V6mF7(1N+7!3wKyE7ToI4O3P_bd7qRR|8
z+VIV2!-^wKayz(+X7$c~f@c%~MbsieDS(C(cpqPu<!I|<!<}UB!cr6Ps3}-?R;+4~
z;W>Q96sbilu`4h*b|o1v!EyB-zA<KJz6^`=cEl16_d(^U!T(Be&8b(G#3&Y5_^i_q
z!1$Pi29VXn)WLmu=w=Iaf7Zy0;e`ds7{5w9x!LI13AQ??G`gF*u<kucYq>x^<3~JB
zEnXd^J5an^+xoSe8vIl5*W-1Ev#4P`)iY0?jLuX|Y(%lwKyfaTLrZ(tUfDVx3C$6^
zmAI@)00KE>8VxiR+#*KiNDdph9a1OJTi5SdR;*hVZ95<qVh}rRZ+=p2NWGs}Y_U8L
z-&X$EI#SOcBO=J)s*%0OYCDaJIfQ(5KG9*;ay+lIk$k%aF1qXk`RNYP3YXXIuefmM
zReSZ9Q+C2hhB&L@a|qr=Z$t1>)#uMSJKF{F$q8-|Zx;i=`HK(zg3X>={X#H7EgWK3
zY7e!)1Nl<x`_{RJFZUKa%Egs&j=PsjvgIOdex=#X*ma6pIS~3yXZ_ug|0xdp_acTr
zI`_XJxN@4$+<?E6M>fn{K;Y(i2{w_RTJ)5bIo<2mJS`MFCa9-MXG1sg&Fr*Jm40rQ
zsjdc8$Rujn!TKQuU=Jk?UZ8*V((hEx4!85`#ik=qCFSDKLMG*cCj)G80|j2ytKQ5G
zB2m){E=5N^sk`OnZ!5^e7@?XhkBPszxO_y9Hg9d@UEm4Fa^6d@k-9WyJ^F)cv&n{_
z^n|ksK`Kw`x8(;lRMbEthG56eueV1=&UF}yta55y-*Dy{c|O2psyLF=UvbF0G=`na
z_mD_%x@T}AjHJqlUrS{aioO+0XA2Q4hF$G1BAqB&dA~Q(4pi4TRr{gNyu5EpJJ%)v
zJKkCgc$-O=J7R_oia(|~+>J|+9*hmYX)_enQw*y=zxiT7LC-p2Lh1_PGu;hoK5O8R
zaEY@$Xa5aanI@zQcenxr_O@BSwWnC<+d216aFHQ;7dkXxWydPjad<A0PpaIZ#n3Yf
zJ#*H)KDFYy-uVP;P~w-OMF7dVlo`TU7Qv=#_}r-bh!cu`v>B0q+uU&^cCPtJ=u7Ju
z{v-B}JbT|?NcYM|O-rXbH*XbXWO?7s<XO8LKKn!o_s&OHbw+6m-5~pRLpNGq7#M8R
z6vnJI+b+hR^XKX7ZMR<KTxc&1xwg;>Nm2s{N_KkFdbZX*Rbi$A^|LUw*YJAzkHxf(
zyy*i2IlDWu4XS0pz4*lB)-p%97dx&<l1-B<o`$g%&$Rhj-#F0-dFKhNwm&R8!9bwy
zr8BR*Z1A@Pjoo1W1cSq%Wv)Tl33F|C+VHTOtT8Gf=U8keiFM2_*PNL3nGbZF{P~dY
zba-qS;u9`^Y*o=QxP=cAZs5Hv6e4BYCJbqiNbA{(c4JyGo6C6nbMvYG6$|rEC+xYI
zK3LN*h}a&_WJNVjoG9IpdR}fSA>PdY`S2#pQN(+uH-nHm7*Ry9520mg?qB_QlF!L|
zY&|Zo8?@|x3(Jx#x8(b#=vYJ7>uW8F$IqnmLwwOQ62?w5d{Q^o=E=Q=e#WkYrnfr`
ztCgH-Lxr*V*(1Syiy1=Y15JzZhHjqDIMMP73k;92@KA_yn?lhY)RQ8w);esT{OI_V
zt+~VeFSuVe&M1vsiJ8guejYTR>R5{4(*h+;w8LVf(C;r9XMSwWv|C-4$SpQ+f-G6e
z<Hz6Jl41VrMFGBM8ej{oB?_{F{!$UKB}O-mAi^YBI<uq?Pb-DXoFLHd5ja34+BQV{
zX5YtA&QAx9t|n=0S|hNK!9Kq@36CGsi2n`CAy+I9zduk^rtNdGDwOwJo5s-=L};ys
zDpJc#{x?D;e(!Z^1qh~=KTOP8KTYoJBM{1-k-r)^cWk(Ko_#n`GpMBv*ugz7A{$4p
z4CfT7#;i*AD$VO1pG!F~c+m5git+uCCAQHAJHGKgB2|@4p*g}k4i`?&WOf=>D&&5z
zFI`Qz6v;DdXJV9mUkQLE!AGaF0`?GLvnK+-zCdI14apMUwz5utSW<P|INH@HHt;^p
zwd|Y{5-MrAhRCzZg(nxhwscbbX8C}dMRmPD1<#Nv5dQXc)6WSV`f~iqq9Uk`oFWeA
zlg(jh@7#%2A6u1rcb-pGkPgW802V*PkU)_UVtD(zzV~L!77S34$+bPmwjnMRzpTdC
zM$KMZ&Q!c&==Xvli4xP#lLIZO<wZwph`2?@Z8h3GWMEw-=1vH__=H|&{JqGQo6l#@
zZof%&xcB_8mDfM3viiqr^PF0+0cS4>hMGS6TQ-&pg%Ayu#HCwgsf{`mPQ@burM??x
zTduRPJUI@Tg@vt<PxPtk1-fpXiGDk+)Oz?h!RWv@HJ2~Ad`2chapH`p8|#XNyx<9j
zmuh1a;2O%Z?4yykL(<c~bq+XtiCV3`;i0G4W5$-gdTe*NBfZp+<yw1#vf3<nz^~-h
z0vnr5nIFIE5Q)Kmg5Oh*QQ_^yq!3(O_ciLwKc9aTrP(NhuOQfr!7AV?tpkD*5f_Q?
z`%LVLhU<0;jK}=EIn!dpys2A%nf_0T?|(DD_@}wYO~3sWm-C(ag~MMMg?a2fgT!c>
zead44#TxT`QUin96^1_5c9}#k9n9>3edkr3Hl!CUCT(+Gl=a4GLG?}xQh;&6aYMuv
zocN63v`9ro^0JR;Wzt-#R^_Z`LhD$cmysz*o8$Tq<64|<m`O7Cy?EBSdrIN~$fEO6
zz!rwy-$WlNW4OWhG;u9=LEFuqpnjm{Zkc)fEFGKXqPBmbMP3M5*b?rX`_uM*k({cu
z2c7~{XP^&I?VPM?K|8)b+OI@|zEy>2v2{t&+f&aTenMz12E^+A(8i%vzxzuz^&p_0
zkZ0P!^!IfZOuEzJIvt`d9*r2xL43;gJ2IXfB@T#XNBx_l!i|@7xeSj_Xume>UErlk
zdPV_iml4B|II$~JuEaE|p$>JfSy}QF29Il?0<~5b)w(!w8KN7H(9_jj=Qg&@vpP)M
z0xwa^T5E_a?btroE%RaN^#z|b5oLQ%)CXVCqIj(X+J<@xOn%t(e^A09Y#7NnpJ=wT
z%IlA<w%s4%pA!+BDcRwt0OH&FhR2sCB=8wI+nBkr+?-eD_Rw?wd7FYW1PonXv;6yS
zKF==q)G@7TJ$X_Oxu{g&UcvrL1B~M)0Q-j$y8p}%sp_$z`>PyAKOTpFknH!Q{$<YS
zv-~4`&CeHFd5`=o`+;^Me<k%GJlvUg{YJX>ah$HH=OVfi!@7ZpTPML}qorK(3O<>i
z*`HYRL%BZLdX@BHk>s>-O&=>~h~F%I2uap2X@nMcX|50Ua?YnG=zSEKP3&~YF1^w~
z%@0!kWitJJ2L2D-%73rtclq*lJt5FoH_f2v3>b0?ZYsw#y<lYX&Ac#R^5VkV?PY}7
zJjrFlK&m5IP{7+KaAkt^W<X-!K4EV#QC~9g>bH(nk>ba4${%f)4U0@{$C#@+D+4f-
z3iG)t`X_KO;&orKui~K`rXjzZ4*j!i<lo{8I>VtT%O@}1HuBK?eI+KfMVc!i6KfOe
zh~d0AE2${;76vEQ%$Y2V@CLS-$BpzE+PJo1b}(4QFOOQ=0|(}fRA9kG<aPW&rZizG
zDgohh%p(DL5sEP~$^Odlg#c5;L3x+R5@mu~K8g`gKj(#cEB6E38k8TVXZ-d@t-_$w
znB$HU9A%SUWV`m5X6Nt)1YU4q3;j?*LF!ts?z@C<WUmm$){ZrV=5jzN922W9VhMlt
z(LQgztXD2XE<EjEU6b6kklL^z8s!b)n0UE$81X1?=lY2T9kp=JH6QX#q?yk7F->hM
zKmLE+tA95C?{JE<omky^UXY_)Z1#?o(!qFDMqtrF4{6`XDHuadX9NX$M>eUvVVh!o
zv(U{tU!&L}sDj<N(;|~PdCmBFx$#czWZ%9Qr0AZLFSXqmQAYbXzw=&T6nd>ijpGry
z>?bp^q3^grQbm2+FrzWEtN1RSPnW~#4g5qy)KAyH@$n5Ty)i)|706slp~kF5tKHiK
z3|Dqy?1#PLs0|dI|MeGFzYz|6CY)rywR-r#YZVc2zb(P7uckZf78;48ZSR_e#)|V!
zgqQpp!kEAmuMeBoHg^<o$i{ZAJ>-DJ5eKKAj-X!JWLDQZ1i~u!F*3!IYskL+>xtH0
z6AHvMw``weUS<8Cw9tA3N(jibaPKCDue!FPPdcZn=H)_$R&so&9tBwOGm$qf5E06b
zI`h|{`uAIn|C7qn@_tMoTl#|gM$Xw5MU~1AMwSXQh{!?S)|WQfa-&12r1`~7u;xMk
zfnk|^8f^}h7L27`a)#Zv@7F*iUqF0L?jd}zn(JR`0;i|V3uZIsVabksp4I8e>RSSw
z*`{n%SwH;EeM!8+hsU{*&M0Z0o~}>ZN$wa|yW$J!CYN>eXu)WgV!>8#Hv}`vQ=O+T
zcOA(K(^_mS$){?ceTmG|`*|Si{1`sIpuH`CTImvkb@@tH2H^H_K6%%AE-TrQxdmfX
zqL8Nj>)!1<wSD%EuL2jcks2zXC8PFy-U-Q#VyYiYIDMM=lyclKAF>burvTFZojux?
zAO04T{n6_mXy%$;!%nL~8y}rsxt=1VDq_3d7QpeCoP?Z_feaB%h3U*)y-)Mp0^!t{
zGa5$=Fs%Js(W{RR*1gY+IHtXVGpPYz>2JVjVa*xxeX6%T_or>%X{8iB!>f(%x9&bF
z_KlJ-_%+h}qo{uGdz=Kf;5K!}9z3-Ns;$}jrOu;xp&oT~9^W6-yDpWw_W7_ZhYLo~
zM>qqmtX9?c(E_w)0!v3UEPuf+@*sApjR;O%l5~*-IhgvtmQ=*XO)gtC!Kh6n(ZURN
zKuhiRQ;Uq#`P6nre=ef?90k~<_EVzI{wqt4Kg&$epe?}2QqQSK*{1wDYumeP>bIp^
z#WOxG2Ye4D{cSg-H=B&gGBPlB){P5v<Zo7Y;=BD=YY!wMU&r{CuqNoH>L%#g$9K-#
zJ146z45VpuTL0c={7=kzL)g6v)r4E*MjY{yY(AIkInrr#Ydr`?dd}3)!x+ep68qDJ
hn#9Dax&YkLTuCJ0^tsQxCF-_Y!YkUGl3>d4e*yRi%cKAR

literal 0
HcmV?d00001

diff --git a/src/assets/img/nodatapic2.jpg b/src/assets/img/nodatapic2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6a2553869558c8422ed8c473992865f9fa5bd71a
GIT binary patch
literal 24004
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
NX2|l@w}$=ke*noh$dUj6

literal 0
HcmV?d00001

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 43caf8e..7256edb 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -507,14 +507,26 @@ export function setTermGPSJoggle(data) {
 }
 
 //手动拍照
-export function getLatestPhotoJoggle(data) {
+export function takePicJoggle(data) {
   return request({
-    url: "/api/getLatestPhoto",
-    method: "post",
-    data,
+    url: "/api/takePic",
+    method: "get",
+
+    params: data,
+    // data,
+    // headers: {
+    //   "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    // },
+  });
+}
+//手动拍 获取装置状态
+export function getTakePicStatusJoggle(data) {
+  return request({
+    url: "/api/getTakePicStatus",
+    method: "get",
+    params: data,
   });
 }
-
 //获取所有通道列表
 
 export function getAllChannelListJoggle(data) {
@@ -536,11 +548,11 @@ export function getAllTowerJoggle(data) {
 }
 
 //手动拍照获取最新图片
-export function getReturnedPhotoJoggle(data) {
+export function getTakePicPhotoStatusJoggle(data) {
   return request({
-    url: "/api/getReturnedPhoto",
-    method: "post",
-    data,
+    url: "/api/getTakePicPhotoStatus",
+    method: "get",
+    params: data,
   });
 }
 
diff --git a/src/views/alarmHandling/components/historyimg.vue b/src/views/alarmHandling/components/historyimg.vue
index 9ea3750..df3a804 100644
--- a/src/views/alarmHandling/components/historyimg.vue
+++ b/src/views/alarmHandling/components/historyimg.vue
@@ -14,7 +14,16 @@
         indicator-position="none"
       >
         <el-carousel-item v-for="(item, index) in imglist" :key="index">
-          <el-image :src="item.path" fit="contain"></el-image>
+          <el-image
+            :src="item.path"
+            fit="contain"
+            v-if="item.mediaType == 0"
+          ></el-image>
+          <el-image
+            :src="item.thumb"
+            fit="contain"
+            v-if="item.mediaType == 1"
+          ></el-image>
         </el-carousel-item>
       </el-carousel>
     </div>
diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index 599a52d..2732d96 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -343,8 +343,12 @@ import {
   getSearchInfo,
   getAlarmList,
   getAlarmTypeList,
-  getLatestPhotoJoggle,
-  getReturnedPhotoJoggle,
+  // getLatestPhotoJoggle,
+  // getReturnedPhotoJoggle,
+  getTermStatus,
+  takePicJoggle,
+  getTakePicPhotoStatusJoggle,
+  getTakePicStatusJoggle,
   readAlarm,
 } from "@/utils/api/index";
 import historyimg from "./components/historyimg.vue";
@@ -398,6 +402,8 @@ export default {
       zoomD: 1,
       canvansdata: "",
       current: 0,
+      requestId: "", //请求拍照返回的requestid
+      picTime: "", //请求拍照返回的时间
     };
   },
   created() {
@@ -794,33 +800,100 @@ export default {
         this.imgOnload();
       });
     },
-    //手动拍照
+
+    //主动拍照
     handleCommandpic() {
-      this.btnpicloading = true;
-      getLatestPhotoJoggle({
-        captureType: 0,
-        channel: this.selectRow.channelId,
-        termId: this.selectRow.termId,
-        preset: 255,
-      }).then((res) => {
-        this.$message({
-          duration: 1500,
-          showClose: true,
-          message: "手动拍照请求成功！",
-          type: "success",
-        });
-        this.timer = window.setInterval(() => {
-          this.newPicApi(res.data);
-          this.i++;
-        }, 5000);
+      getTermStatus({ termId: this.selectRow.termId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          takePicJoggle({
+            captureType: 0,
+            channel: this.selectRow.channelId,
+            termId: this.selectRow.termId,
+            preset: 255,
+          })
+            .then((res) => {
+              console.log(res);
+              this.requestId = res.data.requestId; //获取requestid 判断装置是否下发
+              this.picTime = res.data.taketime; //获取时间 判断获取最新图片
+              console.log(this.requestId);
+              this.btnpicloading = true;
+              this.statusTimer = window.setInterval(() => {
+                this.getTakePicStatus(this.requestId);
+                this.statusNum++;
+              }, 2000);
+            })
+            .catch((err) => {
+              console.log(err); //代码错误、请求失败捕获
+            });
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
       });
     },
+    //获取装置是否下发状态
+    getTakePicStatus(data) {
+      console.log(data);
+      getTakePicStatusJoggle({
+        requestid: data,
+      })
+        .then((res) => {
+          console.log(res);
+          //res.data  0 状态未知  1 成功 2失败
+          if (res.data == 0 && this.statusNum >= 5) {
+            this.statusNum = 0;
+            clearInterval(this.statusTimer);
+            this.statusTimer = null;
+            this.btnpicloading = false;
+            this.btnvideoloading = false;
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: "下发指令超时，请重试！",
+              type: "warning",
+            });
+          } else if (res.data == 1) {
+            this.statusNum = 0;
+            clearInterval(this.statusTimer);
+            this.statusTimer = null;
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: "下发指令成功！",
+              type: "success",
+            });
+            this.timer = window.setInterval(() => {
+              this.newPicApi();
+              this.i++;
+            }, 8000);
+          } else if (res.data == 2) {
+            this.statusNum = 0;
+            clearInterval(this.statusTimer);
+            this.statusTimer = null;
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: "下发指令失败！",
+              type: "error",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err); //代码错误、请求失败捕获
+        });
+    },
     //获取最新图片
-    newPicApi(val) {
-      getReturnedPhotoJoggle({
-        photoTime: val,
+    newPicApi() {
+      getTakePicPhotoStatusJoggle({
+        photoTime: new Date(this.picTime).getTime(),
         termId: this.selectRow.termId,
       }).then((res) => {
+        console.log(res.data);
         if (res.data == true && this.i < 10) {
           clearInterval(this.timer);
           this.timer = null;
@@ -846,6 +919,7 @@ export default {
         }
       });
     },
+
     //历史图片
     handleHistory() {
       this.$refs.historyimg_ref.display();
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 4407390..584a2a1 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -22,13 +22,6 @@
         <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
         <!-- <img ref="picJpg" class="animImg" :src="bigPicPath + '!1366x768'" /> -->
       </div>
-      <div class="bigimg nopic" v-if="bigPicPath.indexOf('nopic') !== -1">
-        <img
-          class="animImg"
-          :src="bigPicPath.substring(0, bigPicPath.length - 9)"
-        />
-      </div>
-
       <div class="bigimg" v-else-if="bigPicPath.indexOf('videos') !== -1">
         <video
           width="100%"
@@ -39,6 +32,12 @@
           autoplay
         ></video>
       </div>
+      <div class="bigimg nopic" v-if="bigPicPath.indexOf('nopic') !== -1">
+        <img
+          class="animImg"
+          :src="bigPicPath.substring(0, bigPicPath.length - 9)"
+        />
+      </div>
 
       <div
         v-if="
@@ -203,6 +202,7 @@ export default {
         url: "src",
       },
       isshowArrow: true, //判断是否显示切换按钮
+      mediaType: "", //判断图片类型是视频还是图片
       bigPicPath: "", //大图地址
       videopath: "",
       smallPicPath: "", //小图地址
@@ -226,6 +226,7 @@ export default {
   },
   mounted() {
     console.log(this.terminalPhoto);
+    this.mediaType = this.terminalPhoto[0].mediaType;
     this.bigPicPath = this.terminalPhoto[0].path + "!1366x768";
     // this.bigPicPath = this.terminalPhoto[0].path + "!1366x768";
     this.fiveList = this.terminalPhoto.slice(this.page - 1, this.pagesize);
@@ -324,12 +325,14 @@ export default {
         (this.page - 1) * this.pagesize,
         this.page * this.pagesize
       );
+
       this.bigPicPath = this.fiveList[this.activeSmall].path + "!1366x768";
       this.videopath = this.fiveList[this.activeSmall].thumb;
     },
     //大图点击左侧切换图片
     leftClick() {
       this.bigNum--; //执行下一张
+      this.mediaType = this.terminalPhoto[this.bigNum].mediaType;
       this.bigPicPath = this.terminalPhoto[this.bigNum].path + "!1366x768";
       this.activeSmall--;
       console.log("activeSmall", this.activeSmall, "bigNum", this.bigNum);
@@ -356,6 +359,7 @@ export default {
     //点击右侧切换图片
     rightClick() {
       this.bigNum++; //执行下一张
+      this.mediaType = this.terminalPhoto[this.bigNum].mediaType;
       this.bigPicPath = this.terminalPhoto[this.bigNum].path + "!1366x768";
       this.activeSmall++;
       console.log("activeSmall", this.activeSmall, "bigNum", this.bigNum);
@@ -383,6 +387,7 @@ export default {
       console.log(row);
       console.log();
       this.activeSmall = index;
+      this.mediaType = row.mediaType;
       this.bigPicPath = row.path + "!1366x768";
       getCoordinate({
         channelId: row.channelId,
@@ -460,7 +465,7 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
-  height: calc(100% - 0px);
+  height: calc(100% - 32px);
   box-sizing: border-box;
 
   .showPic {
diff --git a/src/views/realTimeMonitor/components/infoDialog.vue b/src/views/realTimeMonitor/components/infoDialog.vue
index 27d679a..06500e9 100644
--- a/src/views/realTimeMonitor/components/infoDialog.vue
+++ b/src/views/realTimeMonitor/components/infoDialog.vue
@@ -52,7 +52,7 @@
     </div>
     <div slot="footer" class="dialog-footer">
       <!-- <el-button @click="isShow = false">取 消</el-button> -->
-      <el-button type="primary" @click="isShow = false">确 定</el-button>
+      <el-button type="primary" @click="handleclose">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -147,6 +147,7 @@ export default {
       this.isShow = false;
     },
     handleclose() {
+      this.isShow = false;
       this.i = 0;
       clearInterval(this.timer);
       this.timer = null;
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index c1b6763..5162906 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -67,7 +67,7 @@
       </div>
       <div class="resize" title="收缩侧边栏"></div>
 
-      <div class="picSetBox previewBox" v-if="towerFlag">
+      <div class="picSetBox previewBox" v-show="LineFlag">
         <!-- 预览图页面 -->
         <previewContain
           ref="previewRef"
@@ -75,8 +75,8 @@
         ></previewContain>
       </div>
       <!-- 带参数的中心内容右侧参数区 -->
-      <div class="picSetBox" v-else>
-        <div class="swiperBox">
+      <div class="picSetBox" v-show="towerFlag">
+        <div class="swiperBox" v-loading="swiperLoading">
           <div class="title">
             <el-breadcrumb separator="/">
               <el-breadcrumb-item> {{ towertitle }}</el-breadcrumb-item>
@@ -87,6 +87,7 @@
             :terminalPhoto="terminalPhoto"
             v-if="terminalPhoto.length > 0"
           ></carouselChart>
+          <!--  -->
         </div>
         <div class="parameterArea">
           <div class="zzbox">
@@ -99,7 +100,6 @@
               type="date"
               placeholder="选择日期"
               format="yyyy 年 MM 月 dd 日"
-              value-format="timestamp"
               :picker-options="pickerOptions"
               @change="changedate"
               :clearable="false"
@@ -132,9 +132,107 @@
               </el-option>
             </el-select>
           </div>
+          <div class="setTimebtn">
+            <h3>操作项</h3>
+            <div class="buttonGroup">
+              <el-dropdown trigger="click" @command="handleCommandpic">
+                <el-button type="primary" :loading="btnpicloading">
+                  主动拍照<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown" class="picdropStyle">
+                  <el-dropdown-item
+                    :command="item.value"
+                    v-for="(item, index) in channelOption"
+                    :key="index"
+                    >{{
+                      item.alias !== null && item.alias !== ""
+                        ? item.alias
+                        : item.label
+                    }}</el-dropdown-item
+                  >
+                </el-dropdown-menu>
+              </el-dropdown>
+              <el-dropdown trigger="click" @command="handleCommandvideo">
+                <el-button type="primary" :loading="btnvideoloading">
+                  主动录像<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown" class="videodropStyle">
+                  <el-dropdown-item
+                    :command="item.value"
+                    v-for="(item, index) in channelOption"
+                    :key="index"
+                    >{{
+                      item.alias !== null && item.alias !== ""
+                        ? item.alias
+                        : item.label
+                    }}</el-dropdown-item
+                  >
+                </el-dropdown-menu>
+              </el-dropdown>
+
+              <el-button type="primary" @click="handleShowInfo">
+                装置信息</el-button
+              >
+              <el-button type="primary" @click.native.stop="handleSetSchedule()"
+                >拍照时间表</el-button
+              >
+
+              <el-dropdown
+                class="dropgps"
+                trigger="click"
+                @command="handleCommandWarn"
+              >
+                <el-button type="primary">
+                  声光报警<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
+                  <el-dropdown-item command="open">开启</el-dropdown-item>
+                  <el-dropdown-item command="close">关闭</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <!-- 线缆显示 -->
+              <el-dropdown
+                class="dropgps"
+                trigger="click"
+                @command="handleCommandLine"
+              >
+                <el-button type="primary">
+                  线缆显示<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
+                  <el-dropdown-item command="open">开启</el-dropdown-item>
+                  <el-dropdown-item command="close">关闭</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <!-- 获取gps位置 -->
+              <el-button type="primary" @click.native.stop="handleShowGPS()"
+                >获取GPS位置</el-button
+              >
+              <!-- gps开关 -->
+              <el-dropdown
+                class="dropgps"
+                trigger="click"
+                @command="handleCommandGps"
+              >
+                <el-button type="primary">
+                  GPS开关<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
+                  <el-dropdown-item command="open">开启GPS</el-dropdown-item>
+                  <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <el-button type="primary" @click="handlehistoryPic">
+                历史图片</el-button
+              >
+            </div>
+          </div>
         </div>
       </div>
     </div>
+    <setschedule ref="setschedule_ref"></setschedule>
+    <info-dialog ref="infodialog_ref"></info-dialog>
+    <gps-position ref="gpsdialog_ref"></gps-position>
   </div>
 </template>
 
@@ -143,13 +241,30 @@ import {
   getdyTreeListJoggle,
   getChannelByTermidJoggle,
   getTerminalPhotoListJoggle,
+  getTermStatus,
+  alarmMarkJoggle,
+  takePicJoggle,
+  getTakePicPhotoStatusJoggle,
+  getTakePicStatusJoggle,
+  setTermGPSJoggle,
 } from "@/utils/api/index";
 import previewContain from "./previewContain.vue";
 import carouselChart from "../components/carouselChart.vue";
+import setschedule from "./components/setschedule.vue";
+import infoDialog from "./components/infoDialog.vue";
+import gpsPosition from "./components/gpsPosition.vue";
 export default {
-  components: { previewContain, carouselChart },
+  components: {
+    previewContain,
+    carouselChart,
+    setschedule,
+    infoDialog,
+    gpsPosition,
+  },
   data() {
     return {
+      btnpicloading: false,
+      btnvideoloading: false,
       onlinestatus: "", //设备状态啊
       onlineNum: "", //在线数
       totalNum: "", //装置总数
@@ -165,473 +280,15 @@ export default {
       currentNodekey: "", //默认选中的节点树,
       previewData: [], //预览图数据
       page: 1, // 当前页数
-      pagesize: 16, //当前多少条数据
-      total: 0, //总条数
       treetimer: null, //轮询状态timer
-      towerFlag: true, //判断是否是图片list
+      LineFlag: true,
+      towerFlag: false, //判断是否是图片list
       towertitle: "", //装置杆塔信息
-      terminalPhoto: [
-        {
-          id: 209654,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 171068,
-          photoTime: "2023-07-17T08:00:02.000+00:00",
-          recvTime: "2023-07-17T07:59:59.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717160002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209646,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 229840,
-          photoTime: "2023-07-17T07:47:36.000+00:00",
-          recvTime: "2023-07-17T07:47:33.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717154736.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209644,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 173700,
-          photoTime: "2023-07-17T07:47:08.000+00:00",
-          recvTime: "2023-07-17T07:47:03.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717154708.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209641,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 231280,
-          photoTime: "2023-07-17T07:44:32.000+00:00",
-          recvTime: "2023-07-17T07:44:28.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717154432.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209638,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 200977,
-          photoTime: "2023-07-17T07:43:34.000+00:00",
-          recvTime: "2023-07-17T07:43:30.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717154334.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209633,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 244618,
-          photoTime: "2023-07-17T07:38:08.000+00:00",
-          recvTime: "2023-07-17T07:38:03.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717153808.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209632,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 227006,
-          photoTime: "2023-07-17T07:37:46.000+00:00",
-          recvTime: "2023-07-17T07:37:42.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717153746.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209631,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 232942,
-          photoTime: "2023-07-17T07:35:44.000+00:00",
-          recvTime: "2023-07-17T07:35:40.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717153544.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209629,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 169296,
-          photoTime: "2023-07-17T07:35:10.000+00:00",
-          recvTime: "2023-07-17T07:35:06.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717153510.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209606,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 225203,
-          photoTime: "2023-07-17T07:00:02.000+00:00",
-          recvTime: "2023-07-17T06:59:57.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717150002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209601,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 276768,
-          photoTime: "2023-07-17T06:46:41.000+00:00",
-          recvTime: "2023-07-17T06:46:37.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717144641.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209595,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 214869,
-          photoTime: "2023-07-17T06:00:02.000+00:00",
-          recvTime: "2023-07-17T05:59:58.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717140002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209580,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 213474,
-          photoTime: "2023-07-17T05:00:02.000+00:00",
-          recvTime: "2023-07-17T04:59:58.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717130002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209549,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 214600,
-          photoTime: "2023-07-17T04:00:02.000+00:00",
-          recvTime: "2023-07-17T03:59:58.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717120002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209535,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 213311,
-          photoTime: "2023-07-17T03:00:02.000+00:00",
-          recvTime: "2023-07-17T02:59:58.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717110002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209529,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 213896,
-          photoTime: "2023-07-17T02:00:05.000+00:00",
-          recvTime: "2023-07-17T02:00:01.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717100005.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209521,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 217319,
-          photoTime: "2023-07-17T01:00:02.000+00:00",
-          recvTime: "2023-07-17T00:59:58.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717090002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209512,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 136386,
-          photoTime: "2023-07-17T00:00:02.000+00:00",
-          recvTime: "2023-07-16T23:59:58.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717080002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209505,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 160791,
-          photoTime: "2023-07-16T23:00:02.000+00:00",
-          recvTime: "2023-07-16T22:59:58.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717070002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209493,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 1315637,
-          photoTime: "2023-07-16T22:00:15.000+00:00",
-          recvTime: "2023-07-16T22:00:11.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717060015.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209490,
-          termId: 10323,
-          channelId: 1,
-          channelName: "通道1",
-          alias: "白天",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 131594,
-          photoTime: "2023-07-16T22:00:02.000+00:00",
-          recvTime: "2023-07-16T21:59:58.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_1_FF_20230717060002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209484,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 164643,
-          photoTime: "2023-07-16T21:00:02.000+00:00",
-          recvTime: "2023-07-16T21:00:00.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717050002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209477,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 53881,
-          photoTime: "2023-07-16T20:00:02.000+00:00",
-          recvTime: "2023-07-16T19:59:59.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717040002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209470,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 50555,
-          photoTime: "2023-07-16T19:00:02.000+00:00",
-          recvTime: "2023-07-16T18:59:59.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717030002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209463,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 902957,
-          photoTime: "2023-07-16T18:00:02.000+00:00",
-          recvTime: "2023-07-16T17:59:57.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717020002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209455,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 57962,
-          photoTime: "2023-07-16T17:00:02.000+00:00",
-          recvTime: "2023-07-16T16:59:59.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717010002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-        {
-          id: 209449,
-          termId: 10323,
-          channelId: 2,
-          channelName: "通道2",
-          alias: "黑夜",
-          presetId: 255,
-          width: 1920,
-          height: 1080,
-          fileSize: 82371,
-          photoTime: "2023-07-16T16:00:02.000+00:00",
-          recvTime: "2023-07-16T16:00:00.000+00:00",
-          path: "http://dev.xinyingpower.com:40080/photos/2023/07/17/00/XYIGQ10D221000100_2_FF_20230717000002.jpg",
-          thumb: null,
-          manualRequest: null,
-          mediaType: 0,
-        },
-      ], //获取装置当前图片数据
+      terminalPhoto: [], //获取装置当前图片数据
+      nopicPath: require("@/assets/img/nopic.jpg"),
+      swiperLoading: false,
       zzCmdid: "",
+      zztermId: "",
       dateValue: "", //选择日期
       pickerOptions: {
         disabledDate(date) {
@@ -639,7 +296,18 @@ export default {
         },
       },
       channelListOption: [], //通道内容
-      selectChannelValue: "", //选中的通道
+      channelOption: [], //主动拍照通道
+      selectChannelValue: null, //选中的通道
+      channelId: "", //选中的通道id
+      btnpicloading: false, //主动拍照按钮loading
+      requestId: "", //请求拍照返回的requestid
+      picTime: "", //请求拍照返回的时间
+      timer: null, //获取最新图片
+      i: 0, //获取最新图片
+      CurrentData: "", //历史图片当前选中数据
+
+      statusNum: 0, //查询下发状态
+      statusTimer: null, //查询下发状态
     };
   },
   watch: {
@@ -665,6 +333,7 @@ export default {
   methods: {
     //获取当前时间
     getDateTime() {
+      console.log(new Date());
       this.dateValue = new Date().getTime();
     },
     //选择时间
@@ -675,22 +344,27 @@ export default {
     handleNodeClick(data) {
       console.log(data);
       this.selectData = data;
+      this.zztermId = data.id;
+      this.CurrentData = data;
       //this.previewData = data;
       if (data.dyValue) {
-        this.towerFlag = true;
+        this.LineFlag = true;
+        this.towerFlag = false;
         console.log("电压");
         this.type = 1;
         //this.getPicList(data.id, this.type);
-        this.$refs.previewRef.getPicList(data.id, this.type);
+        this.$refs.previewRef.getPicList(data.id, this.type, this.page);
       } else if (data.bsManufacturer) {
-        this.towerFlag = true;
+        this.LineFlag = true;
+        this.towerFlag = false;
         console.log("线路");
         this.type = 2;
-        this.$refs.previewRef.getPicList(data.id, this.type);
+        this.$refs.previewRef.getPicList(data.id, this.type, this.page);
         //this.getPicList(data.id, this.type);
       } else {
         console.log("杆塔");
-        this.towerFlag = false;
+        this.LineFlag = false;
+        this.towerFlag = true;
         this.towertitle = data.name;
         this.zzCmdid = data.cmdid;
         this.getChannelList(data.id);
@@ -731,13 +405,18 @@ export default {
             this.emptyText = "暂无数据";
             this.selectData = this.lineTreeData[0]; //第一个选中的数据
             this.currentNodekey = this.lineTreeData[0].id; //第一个数据
+            console.log(this.currentNodekey);
             this.type = 1;
             this.newCurrentId = this.lineTreeData[0].id;
             this.previewData = this.lineTreeData[0]; //预览图数据
             this.$nextTick(() => {
               this.$refs.tree.setCurrentKey(this.currentNodekey); //一定要加这个选中了否则样式没有出来
-
-              this.$refs.previewRef.getPicList(this.currentNodekey, this.type);
+              this.channelId = this.currentNodekey;
+              this.$refs.previewRef.getPicList(
+                this.currentNodekey,
+                this.type,
+                this.page
+              );
             });
           }
         })
@@ -753,10 +432,20 @@ export default {
           console.log(res);
           this.channelList = res.data.list;
           console.log(this.channelList);
+          this.channelOption = [];
+          this.channelList.forEach((item) => {
+            this.channelOption.push({
+              label: item.channelname,
+              value: item.channelid,
+              termid: item.termId,
+              alias: item.alias,
+            });
+          }); // 选择通道一通道二select框
+          console.log(this.channelOption);
           this.channelListOption = [];
           this.channelListOption.push({
             label: "全部",
-            value: "-1",
+            value: -1,
             termid: "",
             alias: "",
           });
@@ -769,17 +458,36 @@ export default {
             });
           });
           this.selectChannelValue = this.channelListOption[0].value; //默认选中所有通道
+          this.getTerminalPhotoList(
+            this.selectChannelValue,
+            this.dateValue,
+            this.channelList[0].termId
+          ); //获取图片列表是传当前设备的 id 和termid
         })
         .catch((err) => {
           console.log(err); //代码错误、请求失败捕获
         });
     },
     //切换通道
-    changeChannelId(val) {},
+    changeChannelId(val) {
+      console.log(val);
+      this.getTerminalPhotoList(val, this.dateValue, this.zztermId);
+    },
+    //选择时间
+    changedate() {
+      console.log(this.dateValue);
+      console.log(this.zztermId);
+      this.getTerminalPhotoList(
+        this.selectChannelValue,
+        this.dateValue,
+        this.zztermId
+      );
+    },
     //获取图片
     getTerminalPhotoList(id, date, termId) {
       this.terminalPhoto = [];
       console.log(id, date, termId);
+      this.swiperLoading = true;
       getTerminalPhotoListJoggle({
         channelid: id,
         time: date,
@@ -787,13 +495,386 @@ export default {
       })
         .then((res) => {
           console.log(res);
-          this.terminalPhoto = res.data.list;
+          this.swiperLoading = false;
+          if (res.data.list.length == 0) {
+            this.terminalPhoto = [
+              {
+                path: this.nopicPath,
+                termId: termId,
+                mediatype: 0,
+              },
+            ];
+          } else {
+            this.terminalPhoto = res.data.list;
+          }
         })
         .catch((err) => {
           console.log(err); //代码错误、请求失败捕获
         });
     },
+    //点击图片列表执行函数
+    jumpTowerPic(data) {
+      console.log("我是从子组件过来的数据");
+      console.log(data);
+      this.LineFlag = false;
+      this.towerFlag = true;
+      this.zzCmdid = data.cmdid;
+      this.towertitle = data.towername;
+      this.zztermId = data.termid;
+      this.selectChannelValue = data.channnelname;
+      this.$refs.tree.setCurrentKey(this.zztermId); //一定要加这个选中了否则样式没有出来
+      if (data.photoTime == "" || data.photoTime == null) {
+        this.getDateTime();
+      } else {
+        this.dateValue = data.photoTime;
+      }
+      console.log(this.selectChannelValue);
+      // this.getChannelList(this.zztermId);
+      getChannelByTermidJoggle({ termid: this.zztermId })
+        .then((res) => {
+          console.log(res);
+          this.channelList = res.data.list;
+          console.log(this.channelList);
+          this.channelOption = [];
+          this.channelList.forEach((item) => {
+            this.channelOption.push({
+              label: item.channelname,
+              value: item.channelid,
+              termid: item.termId,
+              alias: item.alias,
+            });
+          }); // 选择通道一通道二select框
+          console.log(this.channelOption);
+          this.channelListOption = [];
+          this.channelListOption.push({
+            label: "全部",
+            value: -1,
+            termid: "",
+            alias: "",
+          });
+          this.channelList.forEach((item) => {
+            this.channelListOption.push({
+              label: item.channelname,
+              value: item.channelid,
+              termid: item.termId,
+              alias: item.alias,
+            });
+          });
+          this.selectChannelValue = data.channnelname;
+          this.getTerminalPhotoList(
+            data.channelid,
+            this.dateValue,
+            this.zztermId
+          ); //获取图片列表是传当前设备的 id 和termid
+        })
+        .catch((err) => {
+          console.log(err); //代码错误、请求失败捕获
+        });
+      //this.getTerminalPhotoList(data.channelid, this.dateValue, this.zztermId);
+    },
+    //主动拍照
+    handleCommandpic(command) {
+      console.log(command);
+      getTermStatus({ termId: this.zztermId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          takePicJoggle({
+            captureType: 0,
+            channel: command,
+            termId: this.zztermId,
+            preset: 255,
+          })
+            .then((res) => {
+              console.log(res);
+              this.requestId = res.data.requestId; //获取requestid 判断装置是否下发
+              this.picTime = res.data.taketime; //获取时间 判断获取最新图片
+              console.log(this.requestId);
+              this.btnpicloading = true;
+              this.statusTimer = window.setInterval(() => {
+                this.getTakePicStatus(this.requestId);
+                this.statusNum++;
+              }, 2000);
+            })
+            .catch((err) => {
+              console.log(err); //代码错误、请求失败捕获
+            });
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
+      });
+    },
+    //主动拍视频
+    handleCommandvideo(command) {
+      console.log(command);
+      getTermStatus({ termId: this.zztermId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          takePicJoggle({
+            captureType: 1,
+            channel: command,
+            termId: this.zztermId,
+            preset: 255,
+          })
+            .then((res) => {
+              console.log(res);
+              this.requestId = res.data.requestId; //获取requestid 判断装置是否下发
+              this.picTime = res.data.taketime; //获取时间 判断获取最新视频
+              console.log(this.requestId);
+              this.btnvideoloading = true;
+              this.statusTimer = window.setInterval(() => {
+                this.getTakePicStatus(this.requestId);
+                this.statusNum++;
+              }, 2000);
+            })
+            .catch((err) => {
+              console.log(err); //代码错误、请求失败捕获
+            });
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
+      });
+    },
 
+    //获取装置是否下发状态
+    getTakePicStatus(data) {
+      console.log(data);
+      getTakePicStatusJoggle({
+        requestid: data,
+      })
+        .then((res) => {
+          console.log(res);
+          //res.data  0 状态未知  1 成功 2失败
+          if (res.data == 0 && this.statusNum >= 5) {
+            this.statusNum = 0;
+            clearInterval(this.statusTimer);
+            this.statusTimer = null;
+            this.btnpicloading = false;
+            this.btnvideoloading = false;
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: "下发指令超时，请重试！",
+              type: "warning",
+            });
+          } else if (res.data == 1) {
+            this.statusNum = 0;
+            clearInterval(this.statusTimer);
+            this.statusTimer = null;
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: "下发指令成功！",
+              type: "success",
+            });
+            this.timer = window.setInterval(() => {
+              this.newPicApi();
+              this.i++;
+            }, 8000);
+          } else if (res.data == 2) {
+            this.statusNum = 0;
+            clearInterval(this.statusTimer);
+            this.statusTimer = null;
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              message: "下发指令失败！",
+              type: "error",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err); //代码错误、请求失败捕获
+        });
+    },
+    //获取最新图片
+    newPicApi() {
+      getTakePicPhotoStatusJoggle({
+        photoTime: new Date(this.picTime).getTime(),
+        termId: this.zztermId,
+      }).then((res) => {
+        console.log(res.data);
+        // // console.log(this.i);
+        if (res.data == true && this.i < 10) {
+          console.log(res.data);
+          this.i = 0;
+          clearInterval(this.timer);
+          this.timer = null;
+          this.btnpicloading = false;
+          this.btnvideoloading = false;
+          this.getTerminalPhotoList(
+            this.selectChannelValue,
+            this.dateValue,
+            this.zztermId
+          ); //获取图片列表是传当前设备的 id 和termid
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "已返回最新图片！",
+            type: "success",
+          });
+          console.log("返回最新图片");
+        } else if (res.data == false && this.i > 10) {
+          this.i = 0;
+          clearInterval(this.timer);
+          this.timer = null;
+        }
+      });
+    },
+    //声光报警开启关闭
+    handleCommandWarn(command) {
+      switch (command) {
+        case "open": //开启
+          this.handleWarn(1);
+          break;
+        case "close": //关闭
+          this.handleWarn(0);
+          break;
+      }
+    },
+    //声光报警
+    handleWarn(val) {
+      console.log("声光报警");
+      console.log(this.zztermId);
+      getTermStatus({ termId: this.zztermId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          alarmMarkJoggle({
+            cmdId: this.zzCmdid,
+            ctrl: val,
+            termId: this.zztermId,
+          })
+            .then((res) => {
+              console.log(res);
+              if (res.code == 200) {
+                if (val == 1) {
+                  this.$message({
+                    duration: 1500,
+                    showClose: true,
+                    message: "声光报警开启成功",
+                    type: "success",
+                  });
+                } else {
+                  this.$message({
+                    duration: 1500,
+                    showClose: true,
+                    message: "声光报警关闭成功",
+                    type: "success",
+                  });
+                }
+              }
+            })
+            .catch((err) => {
+              this.$message({
+                duration: 1500,
+                showClose: true,
+                message: "声光报警操作失败",
+                type: "error",
+              });
+            });
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
+      });
+    },
+    //设置时间表
+    handleSetSchedule() {
+      this.$refs.setschedule_ref.display();
+      this.$refs.setschedule_ref.getSingleAccess(this.zztermId, this.zzCmdid);
+      this.$refs.setschedule_ref.deviceList();
+    },
+    //线缆显示
+    handleCommandLine(command) {
+      switch (command) {
+        case "open": //开启
+          this.$refs.carouselpic.openline();
+          break;
+        case "close": //关闭
+          this.$refs.carouselpic.handelClear();
+          break;
+      }
+    },
+    //装置信息handleShowInfo
+    handleShowInfo() {
+      getTermStatus({ termId: this.zztermId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          this.$refs.infodialog_ref.display(this.zztermId, this.zzCmdid);
+          this.$refs.infodialog_ref.getinfo();
+          //this.$refs.infodialog_ref.getListData(this.channelId, this.cmdid);
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
+      });
+    },
+    //获取GPS位置
+    handleShowGPS() {
+      this.$refs.gpsdialog_ref.display(this.zzCmdid, this.zztermId);
+      this.$refs.gpsdialog_ref.getgpssql();
+    },
+    //切换gps开启关闭
+    handleCommandGps(command) {
+      switch (command) {
+        case "open": //开启
+          this.changeGPS(1, this.zzCmdid);
+          break;
+        case "close": //关闭
+          this.changeGPS(0, this.zzCmdid);
+          break;
+      }
+    },
+    changeGPS(val, cmdid) {
+      console.log(val, cmdid);
+      setTermGPSJoggle({ gpsstatus: val, cmdId: cmdid })
+        .then((res) => {
+          console.log(res);
+          if (val == 0) {
+            this.$message({
+              duration: 1500,
+              message: "GPS已关闭",
+              type: "warning",
+              showClose: true,
+            });
+          } else {
+            this.$message({
+              duration: 1500,
+              message: "成功开启GPS",
+              type: "success",
+              showClose: true,
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err); //代码错误、请求失败捕获
+        });
+    },
+    handlehistoryPic() {
+      console.log(this.CurrentData);
+      this.$router.push({
+        path: "/realTimeSearch",
+        query: { lineName: this.CurrentData },
+      });
+      // sessionStorage.setItem("keyPath", " realTimeSearch");
+    },
     //拖拽
     dragControllerDiv() {
       var resize = document.getElementsByClassName("resize");
@@ -839,14 +920,18 @@ export default {
   },
 
   destroyed() {
+    //销毁左侧树状图
     clearInterval(this.treetimer);
     this.treetimer = null;
+    //销毁主动拍照
+    clearInterval(this.statusTimer);
+    this.statusTimer = null;
     //离开页面是销毁
-    // if (this.timer) {
-    //   console.log(this.timer);
-    //   clearInterval(this.timer);
-    //   this.timer = null;
-    // } //利用vue的生命周期函数
+    if (this.timer) {
+      console.log(this.timer);
+      clearInterval(this.timer);
+      this.timer = null;
+    } //利用vue的生命周期函数
   },
 };
 </script>
@@ -955,11 +1040,12 @@ export default {
           line-height: 32px;
           color: #fff;
           font-size: 12px;
-          background-color: #169e8cb0;
+          //background-color: #169e8cb0;
+          background: linear-gradient(180deg, #4cdbc8 10%, #128071 100%);
           .el-breadcrumb {
             line-height: 32px;
             color: #fff !important;
-            font-size: 12px;
+            font-size: 14px;
             height: 32px;
             .el-breadcrumb__inner,
             .el-breadcrumb__separator {
@@ -979,11 +1065,12 @@ export default {
           color: #169e8c;
           font-size: 14px;
           font-weight: normal;
-          margin-bottom: 16px;
+          //margin-bottom: 16px;
           //background-color: #169e8cb0;
         }
         .paramsDate,
-        .monitorItemBox {
+        .monitorItemBox,
+        .setTimebtn {
           margin-bottom: 16px;
           position: relative;
           h3 {
@@ -993,8 +1080,28 @@ export default {
             margin-bottom: 8px;
           }
         }
+        .setTimebtn {
+          .buttonGroup {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            .el-button {
+              margin-bottom: 8px;
+              width: 104px;
+            }
+            .el-button + .el-button {
+              margin-left: 0px;
+            }
+          }
+        }
       }
     }
   }
 }
+.picdropStyle,
+.videodropStyle,
+.gpsdropStyle {
+  width: 104px;
+  margin-top: 0px !important;
+}
 </style>
diff --git a/src/views/realTimeMonitor/picIndex.vue b/src/views/realTimeMonitor/picIndex.vue
index 29c7f4a..c1876cf 100644
--- a/src/views/realTimeMonitor/picIndex.vue
+++ b/src/views/realTimeMonitor/picIndex.vue
@@ -375,7 +375,7 @@ export default {
             console.log(this.zzstatus);
             this.$nextTick(() => {
               this.$refs.tree.setCurrentKey(this.currentNodekey); //一定要加这个选中了否则样式没有出来
-              this.channelId = this.currentNodekey;
+
               this.getChannelList(this.channelId); //获取通道id接口
             });
           }
diff --git a/src/views/realTimeMonitor/previewContain.vue b/src/views/realTimeMonitor/previewContain.vue
index c5df55f..cb16500 100644
--- a/src/views/realTimeMonitor/previewContain.vue
+++ b/src/views/realTimeMonitor/previewContain.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="previewContain">
+  <div class="previewContain" v-loading="previewLoading">
     <!-- {{ previewData }} -->
     <!-- {{ previewData.name }}______{{ previewData.id }} -->
     <div class="pictureBox">
@@ -14,24 +14,41 @@
           :key="'col-' + index"
           v-if="index < colNum * i && index >= colNum * (i - 1)"
         >
-          <div class="imgcloum">
-            <!-- <img
-              src="http://180.166.218.222:40080/photos/2023/07/17/03/XYIGQ10C221000003_1_FF_20230717134007.jpg!1366x768"
-            /> -->
-            <img :src="item.path + '!1366x768'" />
+          <div class="imgcloum" @click="handleTowerPic(item)">
+            <!-- 首先判断是否是图片mediatype=0,并且path不为空  展示图片 -->
+            <img
+              :src="item.path + '!1366x768'"
+              v-if="item.mediatype == 0 && item.path !== null"
+            />
+            <!-- 判断是否是视频mediatype=1,并且path不为空  展示图片 -->
+            <img
+              v-else-if="item.mediatype == 1 && item.thumb !== null"
+              :src="item.thumb + '!1366x768'"
+            />
+            <!-- 判断是否是视频mediatype=bull,并且path为空  展示暂无图片 -->
+            <img
+              v-else-if="item.mediatype == null"
+              src="../../assets/img/nodatapic2.jpg"
+            />
+            <div class="picInfo">
+              <p>
+                {{ item.linename }}-{{ item.towername }}-（{{
+                  item.alias !== null && item.alias !== ""
+                    ? item.alias
+                    : item.channnelname
+                }}）
+              </p>
+              <p class="timeinfo" v-if="item.mediatype !== null">
+                {{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }}
+              </p>
+              <p class="timeinfo" v-else>无抓拍</p>
+            </div>
           </div>
         </el-col>
       </el-row>
     </div>
 
-    <div class="pageNation">
-      <!-- <el-pagination
-        @current-change="handleCurrentChange"
-        :current-page="page"
-        layout=" prev, pager, next, jumper,total"
-        :total="total"
-      >
-      </el-pagination> -->
+    <div class="pageNation" v-if="picList.length !== 0">
       <el-pagination
         @current-change="handleCurrentChange"
         :current-page="page"
@@ -45,6 +62,7 @@
 </template>
 <script>
 import { getTowerAndPhotoList } from "@/utils/api/index";
+
 export default {
   props: ["previewData"],
   data() {
@@ -58,22 +76,26 @@ export default {
       picList: [], //图片列表数据
       id: "",
       type: "",
+      previewLoading: false,
     };
   },
   mounted: function () {},
   methods: {
     //获取所有杆塔图片列表
-    getPicList(id, type) {
+    getPicList(id, type, page) {
       this.id = id;
       this.type = type;
+      this.page = page;
       console.log(id, type);
+      this.previewLoading = true;
       getTowerAndPhotoList({
         id: id,
         type: type,
-        pageindex: this.page,
+        pageindex: page,
         pagesize: this.rowNum * this.colNum,
       })
         .then((res) => {
+          this.previewLoading = false;
           console.log(res);
           this.picList = res.data.list;
           this.totalPage = res.data.totalpage;
@@ -83,11 +105,16 @@ export default {
           console.log(err); //代码错误、请求失败捕获
         });
     },
+    handleTowerPic(val) {
+      console.log(val);
+      this.$parent.jumpTowerPic(val);
+      console.log("调用父组件方法");
+    },
     //点击分页
     handleCurrentChange(val) {
       this.page = val;
       this.picList = [];
-      this.getPicList(this.id, this.type);
+      this.getPicList(this.id, this.type, this.page);
     },
   },
 };
@@ -104,19 +131,44 @@ export default {
     //background-color: aquamarine;
     .el-col {
       height: 100%;
-      padding-right: 0.1%;
-      padding-left: 0.1%;
-      padding-top: 0.1%;
-      padding-bottom: 0.1%;
+      padding-right: 0.3%;
+      padding-left: 0.3%;
+      padding-top: 0.3%;
+      padding-bottom: 0.3%;
+      border-radius: 4px;
+      overflow: hidden;
     }
     .imgcloum {
       width: 100%;
       height: 100%;
       //   background: #f00;
+      cursor: pointer;
+      position: relative;
+      border: 1px solid transparent;
+      border-radius: 4px;
+      overflow: hidden;
+      &:hover {
+        border: 1px solid #169e8c;
+      }
       img {
         width: 100%;
         height: 100%;
       }
+      .picInfo {
+        position: absolute;
+        background: #169e8ca1;
+        color: #fff;
+        height: auto;
+        font-size: 14px;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        text-align: center;
+        .timeinfo {
+          margin-top: 4px;
+          margin-bottom: 4px;
+        }
+      }
     }
   }
 }