From cab5c25634e2bce68c9f350fd055227ca7d4f244 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Fri, 13 Oct 2023 07:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/arrow/left.png                             | Bin 0 -> 810 bytes
 src/assets/img/arrow/right.png                            | Bin 0 -> 826 bytes
 src/components/Formula.vue                                |   2 +-
 src/components/Setting/components/Device.vue              |   2 +-
 src/components/Setting/components/History.vue             |   7 ++++---
 src/components/Setting/components/RunInfectionSetting.vue |   2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/img/arrow/left.png
 create mode 100644 src/assets/img/arrow/right.png

diff --git a/src/assets/img/arrow/left.png b/src/assets/img/arrow/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..dabd2f40281ec56e22554a15ef4c709a25bbb95c
GIT binary patch
literal 810
zcmV+_1J(SAP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZr)Ja4^R9J=8n9+6GKoCXW8&QBdh!*+ZNe8$By98VT
zaRr77Y$|{f><UZ=!T;=$I*1yOCLdZ9VPql6LL~QByX-wXv+V2;9f_hS$g=DXz%|K0
zRRaJ%0FaCUB&wRI>Z|8@8)Hn|WgWJZ^0O@aN%B@zzqeY5+^XtEM3!x28wu{k0L<Wa
z=?f$PmLl?Oj7h#MxZCZfB%gW^`$(*+i>s@vb=@GT`)IA5lU$*HIRFSquB^55x<QpY
z=tBAgV0s3zBShpGz@jSTqfh2MVjwvHaQW>6xc~U=D8$y<xtlOF)2eVEgxDR3)nG~$
zsOo+B;1q%`?|uOYF5p!r5fQV`$0Ecotih$MO8DgzBT!shZ}>L^fzmDt0AyJ<LkBsM
z8vt>yYB|L&id$&X;YZfv@%SbTLxcSK>J^f=06-VssI6QWhW9{`9&P70LPU(DX*y{+
z@1xvX|7tl|mfgvID;rWJ7o5c|=UPZMEd+*^1Ib{7W|c}=&QH^HE+R1+o?usPSK-&K
zuc`s9wZH2Ik=%~Q;~z~#x^QCsq_!U159-n9fGCRmQ@>AZZG_XgRD>7+cDvnLM835Z
zst9#$h)HfoB;%SK*)z4)VlU}=-h7~|F%eab8xEdYYgYhZjEP0$2Islv3RE=_0Pij4
z3@WLruOcEZE$3B9p5-8Up0^QWOiXgya_)g-|7!UGF~-CrAm2&=tvUtBB`5BX_5LhX
z)eYdvE%)r}5~e^^C;e#^BqFi|oS>`!muFb0D@FgNxJkaSi+vM27XT$eV@#r|50`QJ
zi>e-U7!K}Y_a0pgEmh*EnN-=EaepDx0fY)%JMJigmDP-hJe2cb0M_^<a<%<I*DHDK
z-{*iu7>4uDJ~nM&KBE81B~jIfQw_}jzXe>zJ(gx9CmoyUuT8}|36_bXC`i+ELh{zV
o4E<8!o47kV2JkK-FI|g@KdbS4WS`$#nE(I)07*qoM6N<$f&_MKbN~PV

literal 0
HcmV?d00001

diff --git a/src/assets/img/arrow/right.png b/src/assets/img/arrow/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac8e70abf624850d6511adf50c72a8ed175fb192
GIT binary patch
literal 826
zcmV-A1I7G_P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZr<Vi$9R9J=8ncY?6Fc5|Bj8lM1urTlJb`UCn5=aF=
z1tb+fDhPByDj*#I?+9xvST$hHK12=<aqL*O!`XXIo+R0y=Z^j+gg|9kmN@4w0h|$0
zA|eTZ7yyXK0I(urMPwO8(Ml<0Lf%6yp<?IU4G~?4$gfr}B6<^%6*JG<z#arxfC0FM
zk5UI&0CQ%3P)ga(fFB<pS44E*1K4*N5t*Hyo<7!f;<`qy^^}Mf=pPOM5+Yh?t*3RJ
zDkJDEy$5hL0N9S0`2oPJ%JR{kF?To;902(IjsZ-*x9wQ0wVwI`$JSMq-CGv>39&dD
zQiVihQl2;)K%aN70FoczD$6pnD)Mn-v9~q(DXNm<a*7eK*|uIW%yJT<O%xdboO6Bb
z5IZ8G6#x@3bQ4AP4;uGI^(A|9a&n%gsRHoWb}$iL004P=v%cxDw&{0qFwj~r&~j~M
zX2p4)kNal>u(s(X%d!Lj(lni*Wh9+*mt2H$ASE3k&zOjYp1Hx0M3jusJbSJGl?R%(
zlzE;{;d3xe(}~s^Xvj$sNl0t`w+7PqL~lG;hUoM2^F>6)HC=4&c@RK66kPHArVb;l
z?c3Ke_7SdxY-6=^?oSj&H^m2Qtrt!A8X__yA~OC)woftkd_cpvvP=|3lQJ9*TN5pd
zh&k{jp)$;T9<pGIh-Cop!?A_K0f2}snVFvlf<qTL0EnV!#Y!ndL~jG|*)DKI^rn<D
zBVZj$0Iezo2PoEBXMPfn+YT0y72uCs{@ORhdY6R2VV%2kzytc}KkpH&tDcJV*z6<&
zMzO7oX8}+GR7zP9x&0ZYFNw%jg<)$i_V>}*v7t)ZDJE6cW<r*QuJYx$9S18<Gt7Kj
z&VwW95qq4gtq=NI$zA_ETbiY5I^EZJXaVyM{Z}2Vh}<?6F#rD&a9REieN9B;z#{tc
zP_Q7tva&2o@;o0C(S^Sm#-#(S^?R@Z@XpN7p?^dC1JAI5(7Wfw&j0`b07*qoM6N<$
Eg3<J7NB{r;

literal 0
HcmV?d00001

diff --git a/src/components/Formula.vue b/src/components/Formula.vue
index fe8cfbc..04d9cf8 100644
--- a/src/components/Formula.vue
+++ b/src/components/Formula.vue
@@ -150,7 +150,7 @@ const props = defineProps({
 
 const topContainer = () => {
   const ele = document.getElementById('set_device_container')
-  ele.scrollTop = ele.scrollTop - 100 < 0 ? 0 : ele.scrollTop - 100
+  ele.scrollTop = ele.scrollTop - 100 < 100 ? 0 : ele.scrollTop - 100
 }
 
 const bottomContainer = () => {
diff --git a/src/components/Setting/components/Device.vue b/src/components/Setting/components/Device.vue
index 1f01ac9..9f5f59f 100644
--- a/src/components/Setting/components/Device.vue
+++ b/src/components/Setting/components/Device.vue
@@ -251,7 +251,7 @@ import {
 
 const topContainer = () => {
   const ele = document.getElementById('set_device_container')
-  ele.scrollTop = ele.scrollTop - 100 < 0 ? 0 : ele.scrollTop - 100
+  ele.scrollTop = ele.scrollTop - 100 < 100 ? 0 : ele.scrollTop - 100
 }
 
 const bottomContainer = () => {
diff --git a/src/components/Setting/components/History.vue b/src/components/Setting/components/History.vue
index d7b1109..7421297 100644
--- a/src/components/Setting/components/History.vue
+++ b/src/components/Setting/components/History.vue
@@ -67,7 +67,7 @@ const webSocketStore = useWebSocketStore()
 
 const topContainer = () => {
   const ele = document.getElementById('set_device_container')
-  ele.scrollTop = ele.scrollTop - 100 < 0 ? 0 : ele.scrollTop - 100
+  ele.scrollTop = ele.scrollTop - 100 < 100 ? 0 : ele.scrollTop - 100
 }
 
 const bottomContainer = () => {
@@ -77,7 +77,7 @@ const bottomContainer = () => {
 
 const topContainer2 = () => {
   const ele = document.getElementById('tabledetail_device_container')
-  ele.scrollTop = ele.scrollTop - 100 < 0 ? 0 : ele.scrollTop - 100
+  ele.scrollTop = ele.scrollTop - 100 < 100 ? 0 : ele.scrollTop - 100
 }
 
 const bottomContainer2 = () => {
@@ -86,11 +86,12 @@ const bottomContainer2 = () => {
 }
 
 const showDetailModal = item => {
+  historyStore.updateDetailData([])
   // 根据这个item获取详细信息
   webSocketStore.sendCommandMsg(getDetailInfoById(item))
   setTimeout(() => {
     showDetailVisible.value = true
-  }, 1000)
+  })
 }
 </script>
 
diff --git a/src/components/Setting/components/RunInfectionSetting.vue b/src/components/Setting/components/RunInfectionSetting.vue
index ea1940e..aa30667 100644
--- a/src/components/Setting/components/RunInfectionSetting.vue
+++ b/src/components/Setting/components/RunInfectionSetting.vue
@@ -218,7 +218,7 @@ const props = defineProps({
 
 const topContainer = () => {
   const ele = document.getElementById('set_device_container')
-  ele.scrollTop = ele.scrollTop - 100 < 0 ? 0 : ele.scrollTop - 100
+  ele.scrollTop = ele.scrollTop - 100 < 100 ? 0 : ele.scrollTop - 100
 }
 
 const bottomContainer = () => {