diff --git a/src/assets/imgs/show/close.png b/src/assets/imgs/show/close.png new file mode 100644 index 0000000..066ff96 Binary files /dev/null and b/src/assets/imgs/show/close.png differ diff --git a/src/router.ts b/src/router.ts index ee97e1e..ee10db2 100644 --- a/src/router.ts +++ b/src/router.ts @@ -73,10 +73,17 @@ const projectRoutes = [ component: () => 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 @@