From 16c7a7cafcbde4a9fb5754010b59a77eb18d50e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=9A=E7=A5=96=E6=9C=9B?= <573413756@qq.com> Date: Thu, 22 Sep 2022 17:31:01 +0800 Subject: [PATCH] add plc manage page & configuration development page --- xiuosiot-frontend/src/api/terminal/plc.js | 25 + xiuosiot-frontend/src/assets/images/O.png | Bin 0 -> 428 bytes xiuosiot-frontend/src/assets/images/S.png | Bin 0 -> 378 bytes .../src/assets/images/arrow_down.png | Bin 0 -> 328 bytes .../src/assets/images/arrow_up.png | Bin 0 -> 322 bytes .../src/assets/images/basket.png | Bin 0 -> 404 bytes .../src/assets/images/download_orange.png | Bin 0 -> 1506 bytes .../src/assets/images/general.png | Bin 0 -> 2337 bytes .../src/assets/images/import_orange.png | Bin 0 -> 1504 bytes .../src/assets/images/minus_orange.png | Bin 0 -> 1343 bytes xiuosiot-frontend/src/assets/images/mufg.png | Bin 0 -> 774 bytes xiuosiot-frontend/src/assets/images/omron.png | Bin 0 -> 1930 bytes .../src/assets/images/pie-chart.png | Bin 0 -> 1228 bytes xiuosiot-frontend/src/assets/images/plus.png | Bin 0 -> 126 bytes .../src/assets/images/plus_orange.png | Bin 0 -> 1353 bytes .../src/assets/images/remove_orange.png | Bin 0 -> 1538 bytes .../src/icons/svg/arrow_down.svg | 1 + xiuosiot-frontend/src/icons/svg/arrow_up.svg | 1 + xiuosiot-frontend/src/icons/svg/general.svg | 17 + xiuosiot-frontend/src/icons/svg/mufg.svg | 12 + xiuosiot-frontend/src/icons/svg/omron.svg | 14 + xiuosiot-frontend/src/icons/svg/siemens.svg | 14 + xiuosiot-frontend/src/layout/index.vue | 2 +- xiuosiot-frontend/src/router/index.js | 4 +- .../views/configuration/development/index.vue | 2 +- .../src/views/terminal/PLC/index.vue | 988 ++++++++++++++++++ .../src/views/terminal/add/index.vue | 1 + .../src/views/terminal/alarm/index.vue | 64 ++ 28 files changed, 1142 insertions(+), 3 deletions(-) create mode 100644 xiuosiot-frontend/src/api/terminal/plc.js create mode 100644 xiuosiot-frontend/src/assets/images/O.png create mode 100644 xiuosiot-frontend/src/assets/images/S.png create mode 100644 xiuosiot-frontend/src/assets/images/arrow_down.png create mode 100644 xiuosiot-frontend/src/assets/images/arrow_up.png create mode 100644 xiuosiot-frontend/src/assets/images/basket.png create mode 100644 xiuosiot-frontend/src/assets/images/download_orange.png create mode 100644 xiuosiot-frontend/src/assets/images/general.png create mode 100644 xiuosiot-frontend/src/assets/images/import_orange.png create mode 100644 xiuosiot-frontend/src/assets/images/minus_orange.png create mode 100644 xiuosiot-frontend/src/assets/images/mufg.png create mode 100644 xiuosiot-frontend/src/assets/images/omron.png create mode 100644 xiuosiot-frontend/src/assets/images/pie-chart.png create mode 100644 xiuosiot-frontend/src/assets/images/plus.png create mode 100644 xiuosiot-frontend/src/assets/images/plus_orange.png create mode 100644 xiuosiot-frontend/src/assets/images/remove_orange.png create mode 100644 xiuosiot-frontend/src/icons/svg/arrow_down.svg create mode 100644 xiuosiot-frontend/src/icons/svg/arrow_up.svg create mode 100644 xiuosiot-frontend/src/icons/svg/general.svg create mode 100644 xiuosiot-frontend/src/icons/svg/mufg.svg create mode 100644 xiuosiot-frontend/src/icons/svg/omron.svg create mode 100644 xiuosiot-frontend/src/icons/svg/siemens.svg create mode 100644 xiuosiot-frontend/src/views/terminal/PLC/index.vue create mode 100644 xiuosiot-frontend/src/views/terminal/alarm/index.vue diff --git a/xiuosiot-frontend/src/api/terminal/plc.js b/xiuosiot-frontend/src/api/terminal/plc.js new file mode 100644 index 0000000..28376f2 --- /dev/null +++ b/xiuosiot-frontend/src/api/terminal/plc.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + +export function getList(data) { + return request({ + url: '/protocolProduct/selectAll', + method: 'get', + params: data || {} + }) +} + +export function add(data) { + return request({ + url: '/protocolProduct/add', + method: 'post', + data + }) +} + +export function remove(data) { + return request({ + url: '/protocolProduct/delete', + method: 'post', + data + }) +} diff --git a/xiuosiot-frontend/src/assets/images/O.png b/xiuosiot-frontend/src/assets/images/O.png new file mode 100644 index 0000000000000000000000000000000000000000..f2e73b770996557bc4e5916b7557c42e8de06128 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^YCvqt!3-p&7G|ylQjEnx?oJHr&dIz4a*P9fLR^6~ z!+X#JiO zSMI<1`hY=<5ois!r;B5V$MLsQPKq5?;BYl86r1}0|1G_!9;LGT#i!0ad6X>jp#9A! z$%!ix`L1^wF1(bI5voxp)RwmRo!joO(E;;9gzq#etzuv0mR(z=)Daw`T#+)-AZ5PE zsz+8VOdjVA*n?b3+EhcsBUG?D6~a#QJJA=jVsZRi|!!``R)>nk)16_b(NjOIducu2j)p zS9terf7mV7-fz2Z8X4=(z3(-DqfqFXhi&`+@-i^Q`E;v4UJ;iw8x+!>u6{1-oD!M< D*-^fD literal 0 HcmV?d00001 diff --git a/xiuosiot-frontend/src/assets/images/S.png b/xiuosiot-frontend/src/assets/images/S.png new file mode 100644 index 0000000000000000000000000000000000000000..674d880364cd413f9ea809c44921cec1704df4a9 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^GC*v~!3-o*3#uc46k~CayA#8@b22Z19OD3=5LX~w z=Jy(i^8H>H`#vx5eNpWDve55Uk^hTAKOlMzBcDS=fMk~8+Ot4y0wqCy!3?}o>ZVQs z@p&~pbJiZX{K9I2n+f+`zTzNkZ!3#NP&k!F|lkF&h-QD}<1 z=;Rv}w+#zh?>5d{ZPL~1u{eUmL|sg&_kj@eza3t}1uNH_Jlx_HT*&$7>K6e^?R?JZ zlet;N&$m7+6g>BeZL+1MOkQ-J%$7GF1%j?Q1%;OV`MpnmeU7Y9+;VqepeGqTUHx3v IIVCg!0EM=gQ~&?~ literal 0 HcmV?d00001 diff --git a/xiuosiot-frontend/src/assets/images/arrow_down.png b/xiuosiot-frontend/src/assets/images/arrow_down.png new file mode 100644 index 0000000000000000000000000000000000000000..fd093e067ed8938e03bcf02338143a040bedf3ba GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^@<6P>!VDxO*6b?+QjEnx?oJHr&dIz4a?}HSLR^7# zLBRWhfLBGn&x`zD7WzFe^nU>%i~K?CA~0HbG%W$Bl&2)fFPK5VAYuN3{RhrJc>lrl z(St3xWf_3I`q zdAa|F@?;*FzyuX$Wwt3I3yv^On#-*6h_RDh#rDEPxsE6I*bkVn*ME6jn(K44`x(#+ N44$rjF6*2UngCocfY$&3 literal 0 HcmV?d00001 diff --git a/xiuosiot-frontend/src/assets/images/arrow_up.png b/xiuosiot-frontend/src/assets/images/arrow_up.png new file mode 100644 index 0000000000000000000000000000000000000000..29fd03873c90f4efb4371cc2115446ba41303543 GIT binary patch literal 322 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 z z;R7KV#5*DeO0Dr?K1f|fY%GBe_IVKJgQ^FDKv^v0o8U#;@X}atR5+KK5<`V#{9-PU zdjV}6F(`rp%Hv>|5zy{IJYJm#!whk4JYJovZz|Wfozr(+(Ld4Y2Xy+s9^#b>B*3q0 z@EaQZ=25(<9M@^_yXWxks~~+X$YB9>C{S+)$HZtgP?Jx58gy3Z*kcw$nKRtWfaz4UcNgPMMIVZ&W@&J zL=LWLKfGuag=YNH_tg@zmi8%#Q7=37%;GJ`=yhp!*}&v(0ErWSm7aty3O`oNvp0AI0m+Y~< zoyn1E>Q1Y)!HoTl7m`aSZr&;lIIn1?U%Z>K&*@S_cb#~m)ajn}xkP*GR^^>!{*@_u zzw>nc=@I>gkT7cvhi>d(%l0c6Gg{iyI$p7S(@VofPg)7(q9sXJ_4-4bU;4uvNoLv9 z4qTo5Aga`JsKt5s@Ei3jn_GKgwe7we-?L)Eb22&=@$pG{J)~um?me*qjajx`S`c?n z=18kL(>HRpVELU#-Ro&`W*RTcZr$&u332E^aUR;AT$en(%*ay$^GzFLOv O2*%mUW!DDA6#WYhpz{9! literal 0 HcmV?d00001 diff --git a/xiuosiot-frontend/src/assets/images/minus_orange.png b/xiuosiot-frontend/src/assets/images/minus_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..88f304cad2ff82b7540b2e0627f629d30911ca09 GIT binary patch literal 1343 zcmX|A2~bm46#eW32v8^*5oB=~S!GeEfPhL^f)GMB*02jWAge%W*hEo?EFG3mySQR& zunlUJp`v54gQX&}mm*S4!C?u4AX_2-y}l3DGxwi&@45HB`{w`m%NcYZvYNgchGAry zFO`W_YvNH=Kx`4#v=1$ESxlcJnE1KDG=|BCGyK_JNQ7I)!Qdebe&hfQdT%Op4AL-2 z#h?!cgD{9fKMV$LG6RFC%zu-SgHp&xS>&Jsq;N?eM1~^a1Zxrn$U&*C#;q2_$hfM6 z7_Rl91r?((YC92fNH9oovsWGlDiS^tBPj$ULuH7Oj>_orkgE9HhzxC#Y!1+LG#YX89*}GSPC9`i zPf$dKK}wLN0#hsqF~wpl#EYotY#`PEG8BkeTr$xcstv=mL5d~FIRJ{Opf(a0Faetc z;tY`j!*%d-COBbD9PF48NV6f{56YhM2K6zJsf3sK;&n0LJbN=#A%?O^_>Fv!ZVMV> zi9uX7AdH293ZNk#>A0u>2Fl|Nakwa7)+UqduHjuj;yt&B6J|PqJXg?Eh`xyJdrm*PUiVHi=`2i6UO`b=m87PwLDtmL z(cMllG%_|ZGq>7nYiIx20ay1!p1w4{qYM_C6C4r|5q&HnDJ4B4D?9h|yf66q1x3ZB z0)ghA98>FMno8Xg%P{rlDHf5yk(OioQt&&Q2O!6dCr1BFAB}pLP1#Y|e$LZB z15yZSQgiAGm;2|!hW_Ma-V`1>cmLeZ`LT@x_cEcQ zLs}pATKv$nj4|nMF@2yXwOPpgl36>`2k0`_@3=7|-Lkq3 z1E>`yoEq+uz&Su$BpJNva^m2Netn6a!> z<#ZLVTHT;M%N32f8SSTC6siU;q&b&FDCz6fCG5VOyMxpDi|SWzeyDM+JT;NUW=+Ut zYO*SelUaT(O7ObdO zNA~PJlj$;$+h}ZF&`kIFecd>IjqW0f{O*kQuuNJJXq8&}sNZRwQhj6QEOba4?7!IR zOp(0gM-Ei2-0?8I-pw~o66F;6P>+5+QP35#e#Nmn#)MCksCf5Re``=DpUe}wyDbOw zHoAE*?C#6WUSIu&7dP9sEFCFNezJZ$l$2i6cV)Qu<#QXU$rB^rX)39T@(rF#PufGkn3MAH#nahW`N!{{tER14X>Rvi=PJeZX9xN}z~0m<=Q$;y@9g zEKnm*J%j<2f-oS0a4Co(a9N;wAcCubFd!muL5Lds%HXoddf|dVqu?e31tAC`h%62k zY1UgE0}Ps&k|4ie24)s^b`CBcUVZ^#5eXStIYnhPO>G@reFGyCQ%h@G2S?X{h=jz9 zg5rvX){d_J2~%dwoV#Gr@)c_~Y}~qi$F2j1jvPOA=Iq6*H*Vd#|M1b{7q4Ew{rKtg zx9>lG|LOnmKpYqqrk*a2Arg{r4^~?rN|0fDklrFNwb-)PK&54dqVtK3Pb_Tj|1aK< zon`-Y*S+ok@0$NhdvZ~*`}7NkHOH1~d=d3{wjj6d{vN{&Bd;%_3r{8~FzarVV&)fo zp|K%RRx0hrmst&y0+UX(UE*4565?jtCbu}?l+l#Ns3%>#d?ia>^HdaO+)Pv8wyhQY zm8W!J%EElcTQZYaUr5&_>$dT&xzu#%z@Il?uKdU_vNO4H|MuQ&hs4>JZax2fx_E0* zee}M4dn{%<&wj$rD(%Xpck7189+sdfK3irinZo=apy1*nkB6FE3a%%Q=&Px6+qE}! z$Dh-j!utcLgu{D^m|%g%4i3q3k(@ssfkqco0zU|4Y|z}1@nU7riG`U<{0<)J@9aIh x_RqO{{|-L9`0=Hu$U-JoaWBK*SBLDU>W8ge7xp|p9+bWrJYD@<);T3K0RW?LPnG}x literal 0 HcmV?d00001 diff --git a/xiuosiot-frontend/src/assets/images/omron.png b/xiuosiot-frontend/src/assets/images/omron.png new file mode 100644 index 0000000000000000000000000000000000000000..3706d8f5c209036cce83f37a205bfd92af42d528 GIT binary patch literal 1930 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 TbK7?V6)||a`njxgN@xNA=o%%& literal 0 HcmV?d00001 diff --git a/xiuosiot-frontend/src/assets/images/plus_orange.png b/xiuosiot-frontend/src/assets/images/plus_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..f10f68c8ff5b53386bc4ae533fba493a63340bca GIT binary patch literal 1353 zcmX|A3rv$&6#jV?S|05R1Dqg_3>C^t*d~ra7!+uE^!Zbu4`_?L0t(1mKoI9L%gmB7 zAWO!EjwPV6s6z$CDF)*Ngb^jeP;}_%c*771ga6*$pSpcH|98*%&N=to+}!_+fER5| zdyj@;m^GKf7NOOf{47imdrB_^qQ$6C6djIfhn!|G%$O^P!y}Oh4VHkxFbw|B@feKS zQFs{SVvvo&XbcK5h{6~Q@^@H(K~xsE!^lA?)16*p$TuZ@B&Il$j0}|_Mmj3v8AFLBOtOYT3KW?_ z+#E{ZfvVjwi4K$LP+P{~M6_Aa|HspcD77(XG z5d|phL4qYY0x1bJm}mtv-64*AOSCO0I6#WW0>KwNnB_r=$j~M^`vIDcMkCJI2XZ_? z(MO;<0#vi1&MFCCK*! zO=@zGga#VbkZ%H-4kMjtuY!DIqA87NuiU=XxINah{l`P%s)qPkLv+>=w;G9_CgT2& z#GsZKz6_29fD0$k{g2&NNYP`uRwUwyF(YFWQ;G$ZW@%+@LucALI6Awyx_Rtp`TF@E zI2aTh8WzFf#>5K5ctT>5T&_&d$jZ$xC@d~5D?eUQSyf$gTBB+Fw&mg_t+wOJ^{!jJ zzxMYJ3_N-?JUsl{$mrAYiHXSFRfIPr z))3a$*Y$e+h5?%-{@L0l2m*kT5QP@~Aq!mgr+Co7+0hwUoXU~192_6n$`E&QIB|{P zUNOm6{l+~XO0Pz;gxOwCvfSL=WaHsy^&b}VqIG_&y?9_|)#6vW&8jl3{^k&YY1l{m zLnYo5tNQf&{8K9XrSh_CsSHP5?XoUvb)-13DEm$KQ{Tm11#JhO^XsFWW|-Xp^IHw0 z;wL2$Kis|MUcBeK_Lj$`Aq`!;$<*(c(sj)Xhvf%{I#{2q3`vgK>28nLmlWCt_HDVKzr($2G8)|GpL2zHkTciiIXxuDYJS4sS5DfQV62HCGs{ER&`1ParwJ-M)Y&dLVeG`=Qj>- z2icr{-5hKG(r#C9hU!M0#@vT9@2Xz;fHCVjMc-{CXJ&UjqbUc1nT<3f<)Up=?~!(_ z=F)C`|R1*g9Qs-rFpH2gZGKd%I9OpHoB?yIrsL>vNp~?t_TX4BI@7xtmck5 zq*3A@r0lII)~-#{6|57nqR#T=b1BVxoi8S}er)^8g!7$FZQnxeA*sXuY4&EG$8Fi2 z$yD8SpODRVRhfGCN^E*|R7>xuRdS&+%y$lKZGynf%8XX}AoHfbn@0h63}1Wgvd7or U__Y569(uVLH)7>()2 z;Gorke6-b(whOObix#yMj;|Lc>oOm~FiH_Sfa`-uI43*|dSLK>y%~d>W*HU+nHXeX z&=-S27(}i=1_Ng`8-pkT@kTxQ>nvxm`N<$j)D2+vdd|enygF#x5qXD_|VE6(k zTmnP&VVFJ?7{L%4)t7&0GjUjezu)I%f; z>H}ZD8alL4J@g7tun0yiCQm8O8tz^rrSDRpU$cG>hZT&eQPefGw5d9}^J#keh6_zh zEi9KUx3aZgh{Br9^QUT|DV{wTwX}%mMu}+Vs|7YC8wl{)6z5cW$u?8%+Ad% zEIxDLl1z5Fw&8ly?Ry;^_wRRhc6WC_?CI-&qEING4ZTpQUi~vXGBP?k`sU5scVlDY z2=C|c0b$}B{zdpm;uFH;2^+uP!_7Lky$DPyX@uOXa*F-B>v>|4kyAfRZ$|oT&t=`z=f!C3F=l;s*3nTTCpBsMLFM?zDe>THseF6eqV=V*Q!3%LmkOs}GkZZ2vu(V8w1!Fj zm_pP|EHy4%JbCHmiHy=g*Uti)yQ5RHN>Zz&<$Idf^@$9Zjg6b1Ttd*ppW&Ty8ye6h!I(ZQhRiD}>pzqm8d?AV literal 0 HcmV?d00001 diff --git a/xiuosiot-frontend/src/icons/svg/arrow_down.svg b/xiuosiot-frontend/src/icons/svg/arrow_down.svg new file mode 100644 index 0000000..95bbf3a --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/arrow_down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/xiuosiot-frontend/src/icons/svg/arrow_up.svg b/xiuosiot-frontend/src/icons/svg/arrow_up.svg new file mode 100644 index 0000000..3dddea3 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/arrow_up.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/xiuosiot-frontend/src/icons/svg/general.svg b/xiuosiot-frontend/src/icons/svg/general.svg new file mode 100644 index 0000000..7bf8a35 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/general.svg @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/mufg.svg b/xiuosiot-frontend/src/icons/svg/mufg.svg new file mode 100644 index 0000000..372b25b --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/mufg.svg @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/omron.svg b/xiuosiot-frontend/src/icons/svg/omron.svg new file mode 100644 index 0000000..1b82055 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/omron.svg @@ -0,0 +1,14 @@ + + + + + O + diff --git a/xiuosiot-frontend/src/icons/svg/siemens.svg b/xiuosiot-frontend/src/icons/svg/siemens.svg new file mode 100644 index 0000000..7872ad0 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/siemens.svg @@ -0,0 +1,14 @@ + + + + + S + diff --git a/xiuosiot-frontend/src/layout/index.vue b/xiuosiot-frontend/src/layout/index.vue index 6c13768..f221cad 100644 --- a/xiuosiot-frontend/src/layout/index.vue +++ b/xiuosiot-frontend/src/layout/index.vue @@ -48,7 +48,7 @@ export default { } }, showBreadcrumb() { - const whiteList = ['overview', 'terminal/add', 'data/value', 'configuration/development'] + const whiteList = ['overview', 'terminal/add', 'terminal/plc', 'data/value', 'configuration/development'] return whiteList.every((item) => this.$route.path.indexOf(item) === -1) } }, diff --git a/xiuosiot-frontend/src/router/index.js b/xiuosiot-frontend/src/router/index.js index ee2a4c6..bcf4332 100644 --- a/xiuosiot-frontend/src/router/index.js +++ b/xiuosiot-frontend/src/router/index.js @@ -130,12 +130,14 @@ export const constantRoutes = [ { path: 'alarm', name: 'Alarm', + component: () => import('@/views/terminal/alarm/index'), meta: { title: '设备告警', disabled: true } }, { path: 'plc', name: 'PLC', - meta: { title: 'PLC管理', disabled: true } + component: () => import('@/views/terminal/PLC/index'), + meta: { title: 'PLC管理' } }, { path: 'ota', diff --git a/xiuosiot-frontend/src/views/configuration/development/index.vue b/xiuosiot-frontend/src/views/configuration/development/index.vue index 6825950..628a7a6 100644 --- a/xiuosiot-frontend/src/views/configuration/development/index.vue +++ b/xiuosiot-frontend/src/views/configuration/development/index.vue @@ -154,7 +154,7 @@ export default { } } - + diff --git a/xiuosiot-frontend/src/views/terminal/add/index.vue b/xiuosiot-frontend/src/views/terminal/add/index.vue index 2652d13..9c018d7 100644 --- a/xiuosiot-frontend/src/views/terminal/add/index.vue +++ b/xiuosiot-frontend/src/views/terminal/add/index.vue @@ -202,6 +202,7 @@ export default { remove(device, index) { remove({ no: device.no }).then(res => { if (res.code === '200000') { + console.log('activatedDevice', this.$refs.activatedDevice[index]) this.$refs.activatedDevice[index].classList.add('fadeOut') setTimeout(() => { this.activeList.splice(index, 1) diff --git a/xiuosiot-frontend/src/views/terminal/alarm/index.vue b/xiuosiot-frontend/src/views/terminal/alarm/index.vue new file mode 100644 index 0000000..9a69fc0 --- /dev/null +++ b/xiuosiot-frontend/src/views/terminal/alarm/index.vue @@ -0,0 +1,64 @@ + + + + +