From 0a2f2ac8103b668f63d86e68c90a497ed3214d89 Mon Sep 17 00:00:00 2001 From: donghao Date: Tue, 13 Aug 2024 17:45:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/modelSetting/video_type_1.png | Bin 0 -> 1022 bytes src/assets/modelSetting/video_type_2.png | Bin 0 -> 965 bytes src/assets/modelSetting/video_type_3.png | Bin 0 -> 781 bytes src/views/deviceSetting/components/add.vue | 5 +- .../deviceSetting/components/deviceAttr.vue | 270 +++++--- .../deviceSetting/components/deviceSelect.vue | 98 ++- .../hooks/{useWatchModels.ts => useDe.ts} | 0 .../deviceSetting/hooks/useDeviceObject.ts | 509 +++------------ .../deviceSetting/hooks/useDeviceObject1.ts | 581 ++++++++++++++++++ .../deviceSetting/hooks/usePointObject.ts | 93 +++ src/views/deviceSetting/index.scss | 73 ++- src/views/deviceSetting/index.vue | 309 +++++++--- src/views/deviceSetting/testData/bg01.json | 85 --- src/views/deviceSetting/testData/room2.png | Bin 265376 -> 0 bytes .../testData/房间平面图 (4).png | Bin 402216 -> 0 bytes .../testData/房间平面图.png | Bin 179802 -> 0 bytes 16 files changed, 1257 insertions(+), 766 deletions(-) create mode 100644 src/assets/modelSetting/video_type_1.png create mode 100644 src/assets/modelSetting/video_type_2.png create mode 100644 src/assets/modelSetting/video_type_3.png rename src/views/deviceSetting/hooks/{useWatchModels.ts => useDe.ts} (100%) create mode 100644 src/views/deviceSetting/hooks/useDeviceObject1.ts create mode 100644 src/views/deviceSetting/hooks/usePointObject.ts delete mode 100644 src/views/deviceSetting/testData/bg01.json delete mode 100644 src/views/deviceSetting/testData/room2.png delete mode 100644 src/views/deviceSetting/testData/房间平面图 (4).png delete mode 100644 src/views/deviceSetting/testData/房间平面图.png diff --git a/src/assets/modelSetting/video_type_1.png b/src/assets/modelSetting/video_type_1.png new file mode 100644 index 0000000000000000000000000000000000000000..beb41016c635eb1b1be50226f1b7daa33a42ee39 GIT binary patch literal 1022 zcmVtrQt zfXS>87*xY0$rKY$XDRU~(Ii<)q$ehvJW)+vBgp_4z@#u> zjS`rfYO@P~q5z{Yy#T9d!1;YQ;AHJNFoH;Y8V16hs$+x#+73Jbqi|Q9hCtMhLPFb) z5egUxcY&v7=N4$NxuD!y2@9)VA^K|;vLO^3SDie;F1_C`Lmqf~Vgekcbujp)2mG^- zAzu`;kkJ$c7)?=t(dOI+35#P+=*IyJ-?YEAL9K zxQGUun;!~3M=Sq6cRB2B^hQ%J9UL92DO{?6v)3F`fwcue4D zxj?Z)$>8D9mzozsD8N;j?iSlU*oIlhrc>rwSzE>qG6K@TXaP)un_48j<2XQWRuG5P$>kEh@a7B^a{z=9t-4)vzFS}rKDL2lYTb6s_; zss$XS^;^13JHF^&b9V7_ds!VkYJ9`zSa9o^9HPrzU zLWPD7g8b8IJHiW`)+#LGZ89-)u+|(lSwy~88iP$cFsIT(l=9e-?>16L?YodjM z2uLM0eyDk)ox5BpxB$H=ZmSqgQGn5)0Ja1s27jqfOo2&}K^~T5i`-^TE3hS;`z>k6 sJ0D3{)|(i>Fqi^dY?-~IIn&(#0tydRLlH~V*#H0l07*qoM6N<$f=p!Ee*gdg literal 0 HcmV?d00001 diff --git a/src/assets/modelSetting/video_type_2.png b/src/assets/modelSetting/video_type_2.png new file mode 100644 index 0000000000000000000000000000000000000000..785c9d1350f22c8a28ad3aa92bb2ddac76aab371 GIT binary patch literal 965 zcmV;$13LVPP)8!b5=35$;(sQtpc>*#J7SMOZ2{+F?gaNyo={OWJ6Tb@Cy-y&5 zPz_-4cRf#;gGU?($M&_I1QECe=)pS#0+1nsTR_M;B^104iWomV54>;*z)llz1VI*_ zEGiw7=(^$L%wOAao7vSx_hyAz zK)Z?4Ch5pftP&`0OBUlbk2Q1gYDgdEIyiz5fmuMt#QI${#j3SLG(NN9$AOO(W&v+^ z%%{omQ}^Lq&q(<@`UX0#85xebh`9@8_R`vwa@8nibk|#hkIJ=BPi|w|{U>(-iEXdd zwI2pvZ(-ty%>$Q!)h~;}W3Umt`ccmH0ha(wjRk{IiL&rv5_sWmqX}Bf;pA-)Whs46 zI~OlPYvR?(QzkyyWbNsg{liL^yM^4RyzbkxB5 zxxP6FvXJ&z1VMe%%7#B9PbU?F97@x6Tcx!??g|KMtl4gHA7cbl?6wNNvhq$BKoG${V z)`p?LS&`}kjiC7lN26&9Xf#v+$%BQV|J0Y>fJIS3T~Sn+00000NkvXXu0mjf>Wr|n literal 0 HcmV?d00001 diff --git a/src/assets/modelSetting/video_type_3.png b/src/assets/modelSetting/video_type_3.png new file mode 100644 index 0000000000000000000000000000000000000000..380ce7464424f6ef8d24d85e08a9b1fc12aee6c8 GIT binary patch literal 781 zcmV+o1M>WdP)Vt6AqQB($|_b~dxF)9wcY%VgO3|JivnZzc?!3%UJWtc{H^ zgY|$Rg8v<6WNSZ+TiMiNiII3MsJ&A{_(m$VwOX$hXwx1jD4vMWtkDeMJQRh2^=MF= zi0TI58}J(6fY&H*ASlxKSVuq72L|CLlMADm`TE>;dm#hoxcEf)B;19$XCS9PK`0nT zJ1=fAweVP|J-hfiWjVA_H zel9~6|J=Zr?`2${J&qf*C!`n=3gTvvAW8*_)jX>FnF4-u&=;!(^EWEguGO7gngJTw zJNZk{S3frD3VcP$=@|@nKW)?{JI>(d;ro;^NJ&eiO`-Af$OiFs>L%8c+BYC=ITkXY z^HH{9ddYh2e!KJxZXsr1ixIX%bkPX{aFJk79z=Dl4Cf9Yc@1iwJp zvI7dt_TZjB>N|HI5;BlqcF_Q_IUwsqxzLd#FK{Y)*)$T}br5Iy0f_48+19&1XN30# zN9Tb@N2k$gQ^>Ivb;Z8Tk z^+>;!NQC>$b8|e@-Ke9?Q(yhSv(I_V@U)^T@jT#Pt9XrXz-xR1Ub7txunH80|5IO^ zgQ6HPCNv{pTv78YunN~cq-FaSOSQnSUVcq80VUvrZLn9QnY8}~2UZ4Q`8=VI00000 LNkvXXu0mjf%MD@Z literal 0 HcmV?d00001 diff --git a/src/views/deviceSetting/components/add.vue b/src/views/deviceSetting/components/add.vue index b7089ba..c157fac 100644 --- a/src/views/deviceSetting/components/add.vue +++ b/src/views/deviceSetting/components/add.vue @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-08-07 14:47:44 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-08-09 16:25:09 + * @LastEditTime: 2024-08-12 15:34:22 * @FilePath: \General-AI-Platform-Web-Client\src\views\deviceSetting\components\add.vue * @Description: 新建位置 --> @@ -20,6 +20,8 @@ const formData = ref({ name: "", file: null as File | null }); +const formRef = ref(null); + const dialogVisible = ref(false); const fileList = ref([]); const rules = { @@ -55,7 +57,6 @@ const beforeUpload = (file: File) => { }; const submitForm = () => { - const formRef = form.value; formRef.validate((valid: boolean) => { if (valid) { message("提交成功", { type: "success" }); diff --git a/src/views/deviceSetting/components/deviceAttr.vue b/src/views/deviceSetting/components/deviceAttr.vue index f353365..cba63be 100644 --- a/src/views/deviceSetting/components/deviceAttr.vue +++ b/src/views/deviceSetting/components/deviceAttr.vue @@ -1,75 +1,64 @@ - - - - - + diff --git a/src/views/deviceSetting/components/deviceSelect.vue b/src/views/deviceSetting/components/deviceSelect.vue index a5042ce..8275308 100644 --- a/src/views/deviceSetting/components/deviceSelect.vue +++ b/src/views/deviceSetting/components/deviceSelect.vue @@ -4,12 +4,17 @@