diff --git a/src/assets/imgs/show/bg_kqhz.png b/src/assets/imgs/show/bg_kqhz.png new file mode 100644 index 0000000..fae4927 Binary files /dev/null and b/src/assets/imgs/show/bg_kqhz.png differ diff --git a/src/assets/imgs/show/bg_xfhqj.png b/src/assets/imgs/show/bg_xfhqj.png new file mode 100644 index 0000000..6705ea7 Binary files /dev/null and b/src/assets/imgs/show/bg_xfhqj.png differ diff --git a/src/assets/imgs/show/icon_kqhz.png b/src/assets/imgs/show/icon_kqhz.png new file mode 100644 index 0000000..41eb5de Binary files /dev/null and b/src/assets/imgs/show/icon_kqhz.png differ diff --git a/src/assets/imgs/show/icon_xfhqj.png b/src/assets/imgs/show/icon_xfhqj.png new file mode 100644 index 0000000..f64c27e Binary files /dev/null and b/src/assets/imgs/show/icon_xfhqj.png differ diff --git a/src/router.ts b/src/router.ts index 1268d06..d5edc2d 100644 --- a/src/router.ts +++ b/src/router.ts @@ -114,6 +114,18 @@ const projectRoutes = [ path: "/messageDetail", component: () => import("@/view/message/messageDetail.vue") }, + { + //空气盒子页面 + name: "airBox", + path: "/airBox", + component: () => import("@/view/device-detail/ait-box.vue") + }, + { + //新风换气机展示页面 + name: "freshAir", + path: "/freshAir", + component: () => import("@/view/device-detail/fresh-air.vue") + }, // 非哈希路由暂不启用 { name: "notFound", diff --git a/src/styles/framework/base/flexbox.scss b/src/styles/framework/base/flexbox.scss index 8c8a44c..e61a348 100644 --- a/src/styles/framework/base/flexbox.scss +++ b/src/styles/framework/base/flexbox.scss @@ -271,6 +271,8 @@ Flex, Grow, & Shrink 待确定 flex-direction: column; position: relative; background-image: url("@/assets/imgs/show/bg_timing.png"); + background-repeat: no-repeat; + background-size: contain; height: 100vh; width: 100vw; //智慧右侧图片 @@ -415,7 +417,9 @@ Flex, Grow, & Shrink 待确定 display: flex; align-items: center; } - + .show-img { + width: 100vw; + } .margin-left-2 { margin-left: 2px; } diff --git a/src/view/data-center/data-center-show.vue b/src/view/data-center/data-center-show.vue index 5475026..54f52a2 100644 --- a/src/view/data-center/data-center-show.vue +++ b/src/view/data-center/data-center-show.vue @@ -48,8 +48,4 @@ onActivated(() => { align-items: center; display: flex; } - -.show-img { - width: 100vw; -} diff --git a/src/view/device-detail/ait-box.vue b/src/view/device-detail/ait-box.vue new file mode 100644 index 0000000..b14fd0e --- /dev/null +++ b/src/view/device-detail/ait-box.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/view/device-detail/fresh-air.vue b/src/view/device-detail/fresh-air.vue new file mode 100644 index 0000000..e0032c3 --- /dev/null +++ b/src/view/device-detail/fresh-air.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/view/tabs/device-control.vue b/src/view/tabs/device-control.vue index b473fcb..dd4eff9 100644 --- a/src/view/tabs/device-control.vue +++ b/src/view/tabs/device-control.vue @@ -147,16 +147,26 @@ const allShutDown = () => { * @param item 点击的设备信息 */ const goToDetail = (item: any) => { - router.push({ + switch (item.deviceType) { + case "02"://空气盒子 + router.push("/airBox"); + break; + case "4D"://新风换气 + router.push("/freshAir"); + break; + default: + router.push({ path: '/device-detail', query: { - setMode: item.setMode, // 模式 0:常规 1:智慧 - name: item.name, - openFlg: item.openFlg, - deviceType: item.deviceType, - smartMode: item.smartMode, + setMode: item.setMode, // 模式 0:常规 1:智慧 + name: item.name, + openFlg: item.openFlg, + deviceType: item.deviceType, + smartMode: item.smartMode, } - }) + }) + break; + } } @@ -292,7 +302,7 @@ const goToDetail = (item: any) => { .close-btn { width: 60px; height: 60px; - + img { width: 100%; } @@ -306,7 +316,7 @@ const goToDetail = (item: any) => { align-items: flex-end; } } - + .air-quality-you { background: url('@/assets/imgs/device-control/air_quality_you@2x.png') no-repeat; background-size: cover; @@ -323,4 +333,4 @@ const goToDetail = (item: any) => { } } } - \ No newline at end of file +