From 7052c187ac3d774bed2d4d85771ef0b3ee471ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E8=B6=85?= <943480861@qq.com> Date: Mon, 22 May 2023 16:18:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=A8=A1=E6=8B=9F=E9=80=89?= =?UTF-8?q?=E6=8B=A9=EF=BC=8C=E5=9C=BA=E6=99=AF=E7=AD=89=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/show/close.png | Bin 0 -> 1021 bytes src/router.ts | 7 ++ src/styles/framework/base/flexbox.scss | 15 ++- src/view/tabs/fixed-time.vue | 8 +- src/view/tabs/scene.vue | 122 +++++++---------------- src/view/tabs/tabs.vue | 110 ++++++++++---------- src/view/timing/timing-add.vue | 24 +++-- src/view/timing/timing-select-device.vue | 13 +-- src/view/timing/timing-select-time.vue | 15 ++- src/view/timing/timing-sure-delete.vue | 3 - src/view/ui/env-select.vue | 103 +++++++++++++++++++ 11 files changed, 256 insertions(+), 164 deletions(-) create mode 100644 src/assets/imgs/show/close.png create mode 100644 src/view/ui/env-select.vue diff --git a/src/assets/imgs/show/close.png b/src/assets/imgs/show/close.png new file mode 100644 index 0000000000000000000000000000000000000000..066ff96fbb75fb59594d40c13de0e4c1c3883a7b GIT binary patch literal 1021 zcmVPx&w@E}nRCr$PolB0?Kn#X|@7W-3fZ#+NUPD?rPg1Tbm+i#8c9m1#7gsu!bQd8%rUb||dnQK;Fg^)VKngG>V4OZHAO#o`FixKp zkOGVe7^lw)NCCzKjMHZYL=(WwPXK%a@Cv{m05?SR!+0Df>6!U8fJ*>R0sI2+j)?wB z4n|x7%zO*r%~6tTBD#?zjvmX*9{{{R8pkaWy_JluM!>_)_;H@iNMPn`03T0)ejuV} z+5+wYJbxs~6%l=w96+?#8Tivs?uqDyWK1;`a1P-6Op?`B!UFsW$vF|-sS21nXXXn4 zb7%VMDuJ1=0DPK(dqG5BCGe+MaRuxXY)OI^{3ZcgsRT{<%>vdgK^uM-0c({o0)96E zYm+bvepdl&kuVZ|cLC8QjE1iwU?*W(pqg77a(AC#0bfl(GznJlRRu(mPyqjuh`vbg za7*K>?}SSeFtgj~$Qr(S1sp6}xRc-k{xAXFrXw%#hYIi_!4v%90<0x?gKr|hN`goD zW&%b_@Cx5lz$gix;hPK4mf#(}3jtaZBEWYeptpo5@LdTgl(4ui6A8XM0j(0E!FMU3 zRzgJhZUsms6s))|PFfC>pA;D-_*kPrrb3TXL;(5bEKZ$XD+Ecixr7#^kyLI@DT--`$#!M%V=_+cct z7El0xdfjCjL*9sWx+eYarUd@}jWtPZ@8fLk&t(PF0Ig}$3a>|dcLG{KwzTa5v!)MM z0(t=K(MJu)+BR+k^aK~_*?eg$qAvZg+Qof>xd09LktCQ3D1hJmQzq}zk(q!I z@FP@$iGY#ty-OG_zyiK!2}1=~!uKj+m;ev(JxUlNz!Q9L64V8Fgzrg$ssPXMy+}|K z5COgi2`U02!MB#sT|h+mmJ+%OhzwsKq3Z7`AA4TVO~4x9TS(|4U`_BxOK29b=09*P zSjujmj+z9l8UCnBs1~pV_#-4#3D^>RZ3$ul%zOr5Zp)J9$B4DBcxbmPxF(zt(ND>7 z)Ck!61`cy?Tl^-Xm)Zgz+rnhEXZ|tJnMxS4g~_Q+d^Q7r;hHdH6QA71YG=V@8!O5D zma)qO#24Y^E;B+xAO%QhDa57#1*noPQ-Fk)LTn09fGX)S1xRQq#HIiRsFE&IfP|Jp rYzk0-D(Nx>NN6d import("@/view/timing/timing-select-device.vue"), }, { + //定时选择时间 name: "timingSelectTime", path: "/timingSelectTime", component: () => import("@/view/timing/timing-select-time.vue"), }, + { + //环境模拟选择 + name: "envSelect", + path: "/envSelect", + component: () => import("@/view/ui/env-select.vue"), + }, // 非哈希路由暂不启用 { name: "notFound", diff --git a/src/styles/framework/base/flexbox.scss b/src/styles/framework/base/flexbox.scss index ec3b711..9ddc4aa 100644 --- a/src/styles/framework/base/flexbox.scss +++ b/src/styles/framework/base/flexbox.scss @@ -256,7 +256,13 @@ Flex, Grow, & Shrink 待确定 text-align: center; font-size: 40px; } - +//card列表父布局 +.zhp-item-bg{ + display: flex; + justify-content: space-between; + padding: 24px; + flex-wrap: wrap; +} //智慧屏背景 .base-bg { display: flex; @@ -265,6 +271,13 @@ Flex, Grow, & Shrink 待确定 background-image: url("@/assets/imgs/show/bg_timing.png"); height: 100vh; width: 720px; + //智慧右侧图片 + .rightImg { + width: 48px; + height: 48px; + position: absolute; + right: 24px; + } //智慧屏返回键 .leftImg { width: 48px; diff --git a/src/view/tabs/fixed-time.vue b/src/view/tabs/fixed-time.vue index ec72544..9d0605c 100644 --- a/src/view/tabs/fixed-time.vue +++ b/src/view/tabs/fixed-time.vue @@ -3,7 +3,7 @@
-
定时
+
定时
{ navList.value.splice(index, 1); }; +/** + * 环境模拟选择 + */ +const envSelect = () => { + router.push("/envSelect"); +}; /** * 切换选中状态 */ diff --git a/src/view/tabs/scene.vue b/src/view/tabs/scene.vue index 1b859fb..cce39a1 100644 --- a/src/view/tabs/scene.vue +++ b/src/view/tabs/scene.vue @@ -1,20 +1,14 @@