From daf7b411de50fa409002c96bf00261eeeca9f265 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 15 Aug 2024 16:43:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/construction/manage/personManage.js | 9 + src/assets/person_img/bloodPressure.png | Bin 0 -> 277 bytes src/assets/person_img/dw.png | Bin 0 -> 548 bytes src/assets/person_img/elec.png | Bin 0 -> 325 bytes src/assets/person_img/elec_warn.png | Bin 0 -> 283 bytes src/assets/person_img/end.png | Bin 0 -> 1010 bytes src/assets/person_img/hat.png | Bin 0 -> 576 bytes src/assets/person_img/heartRate.png | Bin 0 -> 400 bytes src/assets/person_img/idCard.png | Bin 0 -> 617 bytes src/assets/person_img/mj.png | Bin 0 -> 622 bytes src/assets/person_img/person.png | Bin 0 -> 511 bytes src/assets/person_img/phone.png | Bin 0 -> 278 bytes src/assets/person_img/position_nowarn.png | Bin 0 -> 672 bytes src/assets/person_img/position_warn.png | Bin 0 -> 588 bytes src/assets/person_img/sh.png | Bin 0 -> 546 bytes src/assets/person_img/start.png | Bin 0 -> 951 bytes src/assets/person_img/talk.png | Bin 0 -> 489 bytes src/assets/person_img/team2.png | Bin 0 -> 645 bytes src/assets/person_img/temp.png | Bin 0 -> 346 bytes src/assets/person_img/video.png | Bin 0 -> 360 bytes src/assets/svg/no_warn.svg | 6 + src/assets/svg/no_warn2.svg | 14 + src/assets/svg/warn.svg | 14 + src/main.js | 2 +- src/utils/aescbc.js | 4 +- src/views/construction/manage/index.vue | 11 +- .../manage/personManage/personManage.vue | 597 ++++++++++++++---- .../manage/realTimeManage/realTimeManage.vue | 4 +- 28 files changed, 542 insertions(+), 119 deletions(-) create mode 100644 src/assets/person_img/bloodPressure.png create mode 100644 src/assets/person_img/dw.png create mode 100644 src/assets/person_img/elec.png create mode 100644 src/assets/person_img/elec_warn.png create mode 100644 src/assets/person_img/end.png create mode 100644 src/assets/person_img/hat.png create mode 100644 src/assets/person_img/heartRate.png create mode 100644 src/assets/person_img/idCard.png create mode 100644 src/assets/person_img/mj.png create mode 100644 src/assets/person_img/person.png create mode 100644 src/assets/person_img/phone.png create mode 100644 src/assets/person_img/position_nowarn.png create mode 100644 src/assets/person_img/position_warn.png create mode 100644 src/assets/person_img/sh.png create mode 100644 src/assets/person_img/start.png create mode 100644 src/assets/person_img/talk.png create mode 100644 src/assets/person_img/team2.png create mode 100644 src/assets/person_img/temp.png create mode 100644 src/assets/person_img/video.png create mode 100644 src/assets/svg/no_warn.svg create mode 100644 src/assets/svg/no_warn2.svg create mode 100644 src/assets/svg/warn.svg diff --git a/src/api/construction/manage/personManage.js b/src/api/construction/manage/personManage.js index 582c4aa..d5d3c27 100644 --- a/src/api/construction/manage/personManage.js +++ b/src/api/construction/manage/personManage.js @@ -42,4 +42,13 @@ export function checkConfig(data) { method: 'post', data: data }) +} + +/* 人员树选中班组触发的接口 */ +export function getPersonsInfo(query) { + return request({ + url: '/bracelet/consControl/getPersonsInfo', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/assets/person_img/bloodPressure.png b/src/assets/person_img/bloodPressure.png new file mode 100644 index 0000000000000000000000000000000000000000..a41b4c51c6290d23a018ddf013c566b00826a76d GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VXMsm#F#`j)FbFd;%$g$s6l5$8 za(7}_cTVOdki(Mh=g0!<%?1Lk@_rB4&Z?bND{bz1 zz;*XP;43y+#k&jg1Z->A14UYP+t(GG=#1MpLHxnHJr6u0R_R_gDRE2A|lBA0OAha+lgR z)urj-2BmF+mpp6}9k#6zyretJO99W4E_p+(RyqlHQ4WkGftkD5`^ U_Sq?4fv#roboFyt=akR{0R44kAOHXW literal 0 HcmV?d00001 diff --git a/src/assets/person_img/dw.png b/src/assets/person_img/dw.png new file mode 100644 index 0000000000000000000000000000000000000000..1a2d027aa79c06f465f177200c9dec58afbdca21 GIT binary patch literal 548 zcmV+<0^9wGP)W(@(Gh=s>9etUx*dJ2-!Fxb^Mc33!7N9Cs$U zWRtwxeftvNpUr)nH6@2Es`Oq!kfUeDHo+WiwB5`HaBn$!kOB_yN}y9j1QiqsT(z|< zM*LY}H$dT`2m{=>GRN=qRIorE4R^`;AOX$!0d}OsLm*fifwbs-;=F(ix;9t8rk^Dh zUVx5i0^`KjBxfhMWn>Oz&aZGMNBllBgQ6c`oN~C9QfU2kQiwf9>uFyRzOfZq$hYXa9-G)BiXCW~j08jTdqt?$a1-`5(_u%> zOzeUl=R;_5GAvd)125Aw0}kU0000Eb1)sevaL zHZbKdTw!r!X`3XPz^ua7;OoJvx^U@+tD)d<58MAkj;Z&0mb717%gt`k zlozNjUVGHpo@e1~kD#66H<$OWnPQ`njxgN@xNA`uvKfVpzNhCeotk^s)@|FH&x#DDwwD}_=>BzDr5oVnGEp^e zjwpw~q&i~Dg7@^KF8 z`U~v&7s&n%WY2xkHFe|Ux_KNCZ;Q82%`_;g(l~M2T>ssRCEp5XT%TP!oZ``*0n`2azNkd70lhlg1bB27{z`7^=I@n(08+p64F;rkOB z9xjMNp=R=45f&h)rV{k>vcd#e4`CQUeoTXdd2w}BrS}Sulao0nUWq{L!yxjaSj+`> z`!zO4eWa}Z7!=rzML#!$FZuKH1>Yv9_#!HmR)Ja_ z-SzrbAIV9*I~M!tZDjVEcG9=%=OLvqEgVuya%DisTe~lv;$91juH9N64A&= zXWPsS(eyM$M4T)O)4Q1hA=X1586DLE{6qn%RQnnqr%(u?(ja)Tad^I8gg%hVajqm$ zK2PL0M5PkZ+?>81AKP(5LqxZ?M9a&euVfJ!i(X&Tp@A5^Z4>S8>JhH460i4q^oNH! z4Y)uGF=uCF1m?C_g%cVGLX2u+f@p0`lkV(jL2v+~+_++q==_|FAVhM2ZB6h^a1cfc z;(A?^c!U7qCmwF*nDQWxwtcC3m-~#D^8<-t%W^S>971DH90Ji~qv0T2Na*bnQG3Ku9w2*YeZQ6i?R0NcK6 zo^FDHDTo(>*d>MKxIZ}1eGqqf*%k>QVY7ixQE=dhZ)d3&p!h(D6hIJa!3+gBu;s2w zU4fi}2p0+uByLdkHZ;k#DraevIBbL&60d z>)kMw`a?nIK8y$p&CN~l%V9k(w=hw#VM37qa(PS(uuR<3AY+EMUuYxAiFGkp*}}e5ZfObKLiXJ`32waiCQf gw)6i1C89_2zadMip6r{%qW}N^07*qoM6N<$g8THq+yDRo literal 0 HcmV?d00001 diff --git a/src/assets/person_img/hat.png b/src/assets/person_img/hat.png new file mode 100644 index 0000000000000000000000000000000000000000..1b973dbb254386d91b504d286abd53e3a3a80011 GIT binary patch literal 576 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 a#P$be5(HOY_Wk$(00005Ri zb4YuWBR?9O^#HECg9zh^F|=%q{_{fr>pbgr=_!WZUSAx&mgv&a$MK^VZ4?HpdH7oUm)^b?kq{T>7EqT}`Yom)?u8o4qKZ@kc-0-e zhH~{V;E*>KdwE0jB$wEsVPm*(NkqO|L|gzT+8B06KpquwJDQ-G*z3!9IYM%VO&pui z2cdwvEYNQOqsIc)WGT2&AsAiU`=L#tnC4I@4|I?-CEs}rOif@=Sh(bEZ)Ck&feHyQ zLhc&Q2(r5bHTHp}_eh2ShoL6$Oy(#Pc9Lw1b3kcUT{D?`q^{RLQSJQ^w=LXK|BG*- zM+f;VDVf*VHTOdzhgMwuphSE-3dID-O`Y{fUl2D7$m#6dE+XfOzRq`wt^E5fGl5njD@MGaTimS)gUr(s?G zLZ7~mU0k^XOutg0cyd!c3s#&2@jUUhOTFT>+J+MA6pCt3t9Dq|x$y9oL2`)$ZejlmHAE)XYaTn*` zo{GFITKx=?kK<)eb>5$7=;V3<3^hS|5gj^TG~{Li0udeBqUPiUtcqx4HjonO1u#~`xb|(BD%U>nius=V>yT?&qMm+2*8rdF)OnEl?XM)6qa%Q`;$^H f<&{__W`leHGNp|78vE?800000NkvXXu0mjfJU`0A literal 0 HcmV?d00001 diff --git a/src/assets/person_img/team2.png b/src/assets/person_img/team2.png new file mode 100644 index 0000000000000000000000000000000000000000..8974ff4afda0da7437443b43468bf4a21eee5719 GIT binary patch literal 645 zcmV;00($+4P)7xkLEr=)cI+@a3QQpmK%o^V zR;=N*BD-Y8u4DFU(||H1pMo!mL-F>?SvX<-lM}XQVMSBagly;Z*Ye->WPgf zw%5=Y7C;1H#Sb2MM&Az}8I}Ev9q!98GB%oo_(%Xem|!o7T{17UZ7=AK@*LejBf17V zn4p`+F0NweYA_99>5R`+zX~Q6PB181QaH$RBxDll0GD-!i-5qc_;fscUq4tBP>9Js zO2^JI^_+31*|K&epwjpuzJ6#n4tN+cOG?JB0MOW92^ge!D`dFUmvunSwrF|km7GBq zz=+R*c!5;?;(E&tlt@MnDx8;9dz6s%InMu#-3wuR72-87_worIR~NHXhnsEN_cts} znM$a`ldG@p)fUH*>tY!ZH-5r-p5ngNG}Z*$-Q8+#`EKCyU|D*dno f81W%k{5SR&!OrDsQp?&n00000NkvXXu0mjf%7_~+ literal 0 HcmV?d00001 diff --git a/src/assets/person_img/temp.png b/src/assets/person_img/temp.png new file mode 100644 index 0000000000000000000000000000000000000000..e1de43511cd4e598b8c89a65eb9f6749768ee45b GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VXMsm#F#`j)FbFd;%$g$s6l5$8 za(7}_cTVOdki(Mh=nBtB&-P?1sn>Y??{MnxH=;PXt%0(sXH9y`gk6Mwx)F$Ay z>Vxbg$N4S^lc$UL*cwVEbFnOVbbY_$@hi@c4+(0B$gfG_Hs|Z%JS6$7?v~)UeOWW! zWX3uA^VVk>TcP(Bz?Eu%^Cp!z}Sr{+p|BCo!>OJG8gsC{I o_C$knb4q=R-bbao%kbO<*r; zkgafEJ1JGk-14uQ~bltWTO>+Op!t`Oas`7rwUf42UUg zXZK%McyOuJheD?~5x!$ZoNrsd6&}9U$KoUTU@6zxtErNgFO+RCtKIshoKgzgB!a&hUKu=8Dq?d1_1IdbjTv z=b3S$u}Riuwds`KU)(kcelA%h^P$-BbBOtY`3>yGUEXRz*IoF40m0zu>gTe~DWM4f D`81C& literal 0 HcmV?d00001 diff --git a/src/assets/svg/no_warn.svg b/src/assets/svg/no_warn.svg new file mode 100644 index 0000000..c84a8a5 --- /dev/null +++ b/src/assets/svg/no_warn.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/svg/no_warn2.svg b/src/assets/svg/no_warn2.svg new file mode 100644 index 0000000..85d249c --- /dev/null +++ b/src/assets/svg/no_warn2.svg @@ -0,0 +1,14 @@ + + + +涟漪 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svg/warn.svg b/src/assets/svg/warn.svg new file mode 100644 index 0000000..31ec561 --- /dev/null +++ b/src/assets/svg/warn.svg @@ -0,0 +1,14 @@ + + + +涟漪 + + + + + + + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 19eaffc..3364454 100644 --- a/src/main.js +++ b/src/main.js @@ -64,7 +64,7 @@ Vue.use(directive) Vue.use(plugins) Vue.use(VueMeta) Vue.use(BaiduMap, { - ak: '' //w9lkX7HeUlFoQRUX74F1RV2uckOQpmnA + ak: 'PM43nB8eDNTBrXkQwGrTQFcmOni3Z9nO' //w9lkX7HeUlFoQRUX74F1RV2uckOQpmnA }) DictData.install() diff --git a/src/utils/aescbc.js b/src/utils/aescbc.js index f093fb9..88096a4 100644 --- a/src/utils/aescbc.js +++ b/src/utils/aescbc.js @@ -6,12 +6,12 @@ const cbc_iv = CryptoJS.enc.Utf8.parse('1234567812345678') * 默认参数需要加密 * @type {boolean} */ -const jia_mi=true; +const jia_mi=false; /** * 默认后台会自动加密 * @type {boolean} */ -const jie_mi=true; +const jie_mi=false; /** * 加密 * @param word diff --git a/src/views/construction/manage/index.vue b/src/views/construction/manage/index.vue index 14a4eac..487e0b6 100644 --- a/src/views/construction/manage/index.vue +++ b/src/views/construction/manage/index.vue @@ -1,9 +1,9 @@ diff --git a/src/views/construction/manage/realTimeManage/realTimeManage.vue b/src/views/construction/manage/realTimeManage/realTimeManage.vue index 397ae7d..b562464 100644 --- a/src/views/construction/manage/realTimeManage/realTimeManage.vue +++ b/src/views/construction/manage/realTimeManage/realTimeManage.vue @@ -88,7 +88,7 @@