From 28fdf3a6bf2de723dda354fa55e2c740e842d364 Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Thu, 25 Jan 2024 11:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=83=85=E6=8A=A5=E6=9D=BF?= =?UTF-8?q?=E9=99=84=E8=BF=91=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/camera/camera.js | 12 + .../assets/jihe/images/button/btnClose.svg | 8 + .../src/assets/jihe/images/button/delete.png | Bin 654 -> 0 bytes .../src/assets/jihe/images/button/delete.svg | 15 + .../src/assets/jihe/images/button/edit.png | Bin 720 -> 0 bytes .../src/assets/jihe/images/button/edit.svg | 12 + .../src/assets/jihe/images/button/edit2.png | Bin 859 -> 0 bytes .../src/assets/jihe/images/button/edit4.png | Bin 754 -> 0 bytes .../src/assets/jihe/images/button/toLeft.png | Bin 766 -> 0 bytes .../src/assets/jihe/images/button/toLeft.svg | 15 + .../src/assets/jihe/images/button/toLeft2.png | Bin 939 -> 0 bytes .../src/assets/styles/JiHeExpressway.scss | 44 +- ruoyi-ui/src/assets/styles/ruoyi.scss | 2 +- ruoyi-ui/src/main.js | 3 + .../CameraShower/CameraController.vue | 235 +++++ .../components/CameraShower/images/add.svg | 14 + .../components/CameraShower/images/bottom.svg | 11 + .../components/CameraShower/images/left.svg | 11 + .../components/CameraShower/images/right.svg | 11 + .../components/CameraShower/images/sub.svg | 6 + .../components/CameraShower/images/top.svg | 11 + .../components/CameraShower/index.vue | 213 ++++ .../components/Decorations/bg-2.vue | 4 +- .../views/JiHeExpressway/components/empty.vue | 38 + ruoyi-ui/src/views/JiHeExpressway/index.vue | 2 +- .../components/ConditionStatistics/index.vue | 78 +- .../Home/components/Dialogs/Camera/index.vue | 1 - .../Home/components/InfoBoard/addinfo.vue | 955 ------------------ .../Home/components/InfoBoard/editInfo.vue | 917 ----------------- .../pages/Home/components/InfoBoard/index.vue | 589 ++--------- .../components/RoadAndEvents/utils/map.js | 10 +- .../pages/service/board/index.vue | 95 +- .../views/JiHeExpressway/utils/moveable.js | 45 + ruoyi-ui/vue.config.js | 6 +- 34 files changed, 856 insertions(+), 2507 deletions(-) create mode 100644 ruoyi-ui/src/api/camera/camera.js create mode 100644 ruoyi-ui/src/assets/jihe/images/button/btnClose.svg delete mode 100644 ruoyi-ui/src/assets/jihe/images/button/delete.png create mode 100644 ruoyi-ui/src/assets/jihe/images/button/delete.svg delete mode 100644 ruoyi-ui/src/assets/jihe/images/button/edit.png create mode 100644 ruoyi-ui/src/assets/jihe/images/button/edit.svg delete mode 100644 ruoyi-ui/src/assets/jihe/images/button/edit2.png delete mode 100644 ruoyi-ui/src/assets/jihe/images/button/edit4.png delete mode 100644 ruoyi-ui/src/assets/jihe/images/button/toLeft.png create mode 100644 ruoyi-ui/src/assets/jihe/images/button/toLeft.svg delete mode 100644 ruoyi-ui/src/assets/jihe/images/button/toLeft2.png create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/add.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/bottom.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/left.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/right.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/sub.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/top.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/empty.vue delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/addinfo.vue delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/editInfo.vue create mode 100644 ruoyi-ui/src/views/JiHeExpressway/utils/moveable.js diff --git a/ruoyi-ui/src/api/camera/camera.js b/ruoyi-ui/src/api/camera/camera.js new file mode 100644 index 00000000..bae3cf72 --- /dev/null +++ b/ruoyi-ui/src/api/camera/camera.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +// 查询附近相机 +export function getNearbyCameraByPileNum(pileNum) { + return request({ + url: '/video/nearCamListPileNum', + method: 'get', + params: { + pileNum + } + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/assets/jihe/images/button/btnClose.svg b/ruoyi-ui/src/assets/jihe/images/button/btnClose.svg new file mode 100644 index 00000000..b0d8c7f6 --- /dev/null +++ b/ruoyi-ui/src/assets/jihe/images/button/btnClose.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/ruoyi-ui/src/assets/jihe/images/button/delete.png b/ruoyi-ui/src/assets/jihe/images/button/delete.png deleted file mode 100644 index f24976779100c56ddeaa169bfd310d2609bbc502..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 654 zcmV;90&)F`P)Px%NJ&INRA@u(n?Xw(K@`V-lSl;*MZ8GGgP)*+Ai;~|U@5fJizh!uE~Q8hIf#fC zzlC1ZgVI82523eEDCj5XK^l4~;z6+3th}yELdfpCn8`BP&ca@@Z!+)ye*c--S#}LT z%0?*{PF+N%t8tsU;%?)#D{)vNgU}lU(^-KMC8y3yVNpwKOX2Hb8atw!N z>w;5_ujF2zn04nqDAiEs^H| z&IwMGpdH2MAV=ANF>u!&q?J9^slfFGs4c?nU)cQ)4cTcbj@3D+J%{N@*guEUABslG z5N85~+~+qiS&n-ag7t6kA?<3A0ljK{k=S;-uyE zA9(d)aEqsv(V0N$K&-Y?>Cng`*-xAl~`(uNpzUF(VO}B~q>>6UwN?$^VZ`V4BG83fm^3#}LbnVA4^)@s4w;Yn>bWWkR!vYhs3RPj_3VlT39Ewuih`+iJpBKztCGvto?2&-b;GB;Z2PB*hdy(aXGzy zWT6@KdB-@LWb#g2+g}i + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/assets/jihe/images/button/edit.png b/ruoyi-ui/src/assets/jihe/images/button/edit.png deleted file mode 100644 index 64b27b06f11de36fe8c09420474684a988dc8c4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmV;>0x$iEP)Px%ib+I4RA@u(o6k!WVHn3hv#z>pX3N%AMg;-DowGwVw93JLfPV^sg#+_L>7y^ z<8mZqa2}3Bx6{z$ehNWaF62*E0lJ}d?>CeMEOmFSgVwme3}jv?qBmsQLtV0{WMG(u&W2lZnb_Ge&5a06!y zaB~ta?S^>tk7EjOUk37}4!AJ^mz$xwTu;aL7myh(@f2NG1D$DDQlW!fc?I2XW#MLD z%LMt#V(nt+N<*?z2f6VYZoZL+3lwnGBDj`@R9pwSH3HX%{ecS%a77%t_CRfw4sz!m zbiDKrE)c+_F)uCGRO=x3KET;Qf8l%wOjN+tG}P7TAos`M%yST|1`8_X+ajY%KxZ>- zNa(R2e1y{jvbFACdEg6RRn#luoBsOR(U*l&{V<*PKQ-qfhy%vT;9?VOU8X|}e1^7X zFcl!2_#7;c!1+elv0R56`~s~{VR9xo=foY1MxcEcG_BMjhI4Sd&wG$I(Zo`;Z5te{ z(-B6#!m%eXF=YbHizx=!djQnpGS}XJhog_-+fQ?FqJXL-sQsO4V-wKw2y&BV;Y0yd zQ9rz1eN^>!1*V-7Uu4XCHU9|2=AZ>Mq=0qMknmz*t%G7x8tTY8Xh?Xmu+~8_DGhaG z9W*4oSXk?zn3RS(`VS7ohW$u$=nti + + + + + + + + + + + diff --git a/ruoyi-ui/src/assets/jihe/images/button/edit2.png b/ruoyi-ui/src/assets/jihe/images/button/edit2.png deleted file mode 100644 index fcffeb4a7b89ce5f9cd20dd5f1ce2149c25e01e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 859 zcmV-h1ElPx&6-h)vRA@u(o7+niQ5?s=vpZ|17*QA*TV^6rRCXamqmrzUFhMLtyI>(@B}x~& zL9I%$>Q=gGA`}=sSpPr|^{?6i!H)vF#ZV1|Y4>$9_8 z9W0=a{S+S`t7>z9hVSm~^B*FBYSl^%s?}T|H!(;ID!c<^iYi=C(0IgP&=x7YfEZM` zprG*-W3a8mipHj9c-(H}=N(5%($1ja7gL}J!1m71FxE7{S-|H{Owedl4%lPsM}?_w_OZgeQF!(Q4(v_-Z+q+sWHZ=r zA3%Af852`e9FS8vSvZ=WCJ3BtfCJwKQD&^g*!TnoBqu8a*_r8r!N~&n-8qE2##)Sw zj&VS;G7cj*J5x|N$pME(Mqx14!Z|d|0XcFg75RC`1c#FpaO}r848|Hb2Av#`gZua3 zTz;-7aFPK|OirS#(u^-(9UPE-DM`3ga1s0?J`bIa z7HwM2Kd~r)UN3_xb0a>scXA*$Z%n}LD;E(KrjrCtl$#7QGlPe9Pw~Oh#(_xK5QjUZ zMgAYsQVzilK6~*BZ(H7T7~j@56QS}&YomT(JV^*(1`K`-XzAQ=>I8gxEMg8@g7Wm*pMtYiT<^mlR+@Nf#{&8Uf zs5B#d^ALl4JEpXHVo+&D_~s!7`F2cc^~9jkjPT7v4D#)m(&~vpr5WLyXTHG@-w+$> lTbe_DQ#w1hL-}t7zX9M9FjdaW^}GN8002ovPDHLkV1j^&hjjn| diff --git a/ruoyi-ui/src/assets/jihe/images/button/edit4.png b/ruoyi-ui/src/assets/jihe/images/button/edit4.png deleted file mode 100644 index 26a56067a328b6794a69227caaf1d62d98b8ef86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 754 zcmVPx%tVu*cRA@u(o6TzzK^VrL*=!=#C|K=52;|Va@dFilDB}OnL!pOQg+kGSD8-}R z#1Dj83Kd%;6np6ZAR<_(QeyF&itA5#h z2^*t*eFrfxa16ShNwiMGFtNS;9lN`K0ET5&{k-{=Y*{Q85--jrLn7<-27TQkfi`^_ z94sc9-2UJd0(id-O(D^K1+tKD|y)ie!L6J-pYKhrbV)ps8-GhcyaSx&oLHjB#KLvE6h z3nYtOpT2`{J3saW`H6hHwvH!HU+jsaj`{o{EX>>sZE-0DFInx;?6dy@?j~|SIhXp4 z$??F}mTFOVvTlKU?HZ&F?;?!cqTYad37~e~H5X>Rh7m1PAO+G*B>m=YD5AvCxWWZ? z6X~Vkw+V$ICS{Z96i_FUBFVWiNFmsZqDXqmqCDRBJ1$bO$)x(22y%!AX~XLxA)CzF z`bRvTTMTs0brX5>+Etu8eUevS^yi>$+qg1y8_nkLzz^G})yirEKuooa;Vikx8T z%O%RTTksw^oX6#{k-%0XYtL7f(fZqpZ^7%@iAZW13vDs7xM^D4g|74`8J=~-(>L-p z$PPx%xJg7oRA@u(n@wmFK@`V-o3yblwY4o(i&0zrKtZYBF{Xm(#giVygW%1Z7c14M zh!jy20%|;{SHZ7SJ&0!!Z0(0wsaB}PL!fF5C6UrnYiqNzPL>pDOpB8x8E0>AGt9i- z`@eZJvrG&CUz_Q58H6y|1JqgX3iyd)@H}Y}>^@|CGJeBBA5dMuP_wz7NJ69Ge{4R) z|Ky;cqj)D3F$!^od%4rjqKVpfq5itE&~%3g&qPbc*J=Kv~_>3T6#ao;T16 z=D9#w-O~zY4N;yq&E9{vs|+95J356LIu}ouUs0;g%{XYNy!VWzf1EivLn%thKSe z5Q~frsq`{oL;ktY_r&0=Dhs_0X>HYR1fZrwyy;IsO9zaquvN1mmELUIkV+qyY)GXK zyt&w=%%xAMJDIr*=yV$m=yb$okEa!s9Z{$I(+WBraoOW(1!YIn>Hf5WPDfn!cv?Z( w5p}x1|3X2TrCIq)>DHuI`ELck01M!Iv}0bcx&QzG07*qoM6N<$f(VCR$^ZZW diff --git a/ruoyi-ui/src/assets/jihe/images/button/toLeft.svg b/ruoyi-ui/src/assets/jihe/images/button/toLeft.svg new file mode 100644 index 00000000..d5adc9d8 --- /dev/null +++ b/ruoyi-ui/src/assets/jihe/images/button/toLeft.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/assets/jihe/images/button/toLeft2.png b/ruoyi-ui/src/assets/jihe/images/button/toLeft2.png deleted file mode 100644 index 3dce1fadf0a0b67812c1b5523c8fbd5cf1cc2b82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 939 zcmV;c162HpP)Px&Wl2OqRA@u(n{7x_Q5eVn*ETbUW}1{~ni`g|Tz>F_MQJAln*!@Zh^c-quL>b7rAM8>H!egO7=GvZRA8pc5r zaX4aSC@$ulLBL{vVq2{Ma39uQrorl)bUv;wa*Z;0*V6uQR(ak5CDZd7P*?N|rYzI~5EbvdSfP7x;(6XKDjOt)`r zna9RZaN{<*zVwjmflC6Ae=ZZDE0+H=9P3G@t^GCBWmT|Pt;E?KTQ@;@;;20f#`}ZUv?Qn`+6~h3XaEdW#8X|S8 z!b5Q(Cldkwer{2Y>4X))`i4eS*VWq{J$5J=DSLO??d~2u3REQ+F*{B;?j&RhunE<5 zkA(|JlRax`McHptGYqtQrABXGKmU>p z11ado1OqwuK_4fNMV?R|^b90fs$DO^@W?2siiwUSOEsCym)N{ssxgp)UTiavuDmW) z);_|M#%6L0uU?lJNI}2wx^tD{N?)w3WLz1Tt2QDaSCM9G98p2GBFk03qJmsSnyqm} z1=)%$SN)0#ausQ|#t{`{E3#bm`(G(2@B^_zKhiAtL+SLNUdW#n`~o;I!BrO`>;C`% N002ovPDHLkV1oRQsO10v diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss index b07d258c..663ba31b 100644 --- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss +++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss @@ -43,10 +43,11 @@ color: $textColor; } &[disabled] { - color: #667 !important; + color: #9dd !important; } } + // 多选框组 .el-checkbox-group { .el-checkbox__label { color: $textColor; @@ -75,7 +76,7 @@ } } } - +//数字输入框 .el-input-number { margin-right: 10px; height: $inputHeight; @@ -100,7 +101,7 @@ margin: 0; } } - +// 单选按钮 .el-radio-button { margin-right: 10px; @@ -188,4 +189,41 @@ .el-menu--popup-bottom-start { margin-top: 16px; } + + .el-button--add, .el-button--publish { + color: #fff; + width: 96px; + height: 24px; + padding: 0; + border-radius: 50px; + line-height: 23px; + &.is-disabled { + background-color: #AAA; + color: #DDD; + + &:hover { + background-color: #AAA; + color: #DDD; + } + } + } + + .el-button--add { + background-color: #00B3CC; + border: none; + transition: all linear 0.3s; + &:hover{ + background-color: #008bbb; + } + } + + .el-button--publish { + background-color: #C87800; + border: none; + transition: all linear 0.3s; + &:hover { + background-color: #A86600; + } + } + } diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 1a3fcd09..b1f83ea0 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -124,7 +124,7 @@ h6 { padding-bottom: 5px; } .el-form-item__label{ - font-size: 0.7vw; + // font-size: 0.7vw; } // .el-form-item--medium .el-form-item__label{ // line-height: 4vh; diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index fe5e221b..01793689 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -81,6 +81,9 @@ if (process.env.NODE_ENV == 'development'){ window.IS_TESTING = false; } +import Empty from "@screen/components/empty"; +Vue.component("Empty", Empty); + // 全局方法挂载 Vue.prototype.dayjs = dayjs; Vue.prototype.getDicts = getDicts diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue new file mode 100644 index 00000000..20959107 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/add.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/add.svg new file mode 100644 index 00000000..c2f714eb --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/add.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/bottom.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/bottom.svg new file mode 100644 index 00000000..bfc60815 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/bottom.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/left.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/left.svg new file mode 100644 index 00000000..dba61caf --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/left.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/right.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/right.svg new file mode 100644 index 00000000..b6470c01 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/right.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/sub.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/sub.svg new file mode 100644 index 00000000..18cd3dcf --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/sub.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/top.svg b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/top.svg new file mode 100644 index 00000000..ec7f2a0d --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/images/top.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue new file mode 100644 index 00000000..0310662e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/bg-2.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/bg-2.vue index b5f06766..882414be 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/bg-2.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/bg-2.vue @@ -1,8 +1,8 @@ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js index 25d637c7..dfb282be 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js @@ -63,11 +63,11 @@ export async function setMarkerCluster(map, points, markerFun) { const offset = new AMap.Pixel(0, 0); context.marker.setContent(content); context.marker.setAnchor("bottom-center"); - console.log( - "%c [ context.marker ]-62-「map.js」", - "font-size:15px; background:#7d477f; color:#c18bc3;", - context.marker - ); + // console.log( + // "%c [ context.marker ]-62-「map.js」", + // "font-size:15px; background:#7d477f; color:#c18bc3;", + // context.marker + // ); context.marker.setOffset(offset); context.marker.setExtData(extData); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue index b6669549..0bfcca83 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -3,11 +3,12 @@
-
- -
情报板列表
- -
+ + + + + + @@ -47,20 +48,21 @@
-
{{ selectedDevice.deviceName }}
+ +
待下发信息
【 {{ selectedSize }}】
- 添加信息 - 发布信息 + 添加信息 + 发布信息
- +
@@ -75,7 +77,7 @@
-

请从设备回读或从模板添加信息...

+
@@ -84,14 +86,15 @@
-
信息模板[{{ selectedSize }}]
+
信息模板【{{ selectedSize }}】
- 添加模板 + 添加模板 +
@@ -168,34 +171,12 @@ import infoBoardUtils from "@screen/utils/infoBoard.js" import testDeviceList from "@screen/testData/deviceList.js" import testDeviceInfo from "@screen/testData/infoBoard.js" -// 对象深拷贝 -export const deepClone = data => { - // 封装的判断数据类型的方法 - var type = typeof data - var obj - if (type === 'array') { - obj = [] - } else if (type === 'object') { - obj = {} - } else { - // 不再具有下一层次 - return data - } - if (type === 'array') { - for (var i = 0, len = data.length; i < len; i++) { - obj.push(deepClone(data[i])) - } - } else if (type === 'object') { - for (var key in data) { - obj[key] = deepClone(data[key]) - } - } - return obj -} +import WgtTitle from "@screen/pages/perception/widgets/title"; export default { name: 'Device', components: { + WgtTitle, BoardInfoEditor, editInfo, BoardPreview, @@ -255,7 +236,8 @@ export default { tpl: {} }, scrollOptions, - boardItemEdtingIndex: -1 + boardItemEdtingIndex: -1, + isHideCtt:false } }, watch: { @@ -442,16 +424,22 @@ export default { if (IS_TESTING) { + this.selectedBdMsg = []; this.selectedBdMsg = _.cloneDeep(testDeviceInfo.data["3A"].content); } else{ if (!deviceFrom.iotDeviceId) { + this.$message.warning("该设备缺少iotDeviceId字段！") return; } - + this.selectedBdMsg = []; getBoardDeviceInfo(deviceFrom.iotDeviceId).then(res => { this.selectedBdMsg = res.data["3A"].content; + this.isHideCtt = true; + this.$nextTick(()=>{ + this.isHideCtt = false; + }) }).catch(err => { }) @@ -1085,7 +1073,6 @@ export default { }