diff --git a/public/assets/imgs/device-detail/normal-mode/loop_pur@2x.png b/public/assets/imgs/device-detail/normal-mode/loop_pur@2x.png new file mode 100644 index 0000000..8a327f0 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/loop_pur@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/loop_pur_select@2x.png b/public/assets/imgs/device-detail/normal-mode/loop_pur_select@2x.png new file mode 100644 index 0000000..c6dfab3 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/loop_pur_select@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/save_air@2x.png b/public/assets/imgs/device-detail/normal-mode/save_air@2x.png new file mode 100644 index 0000000..c84dcad Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/save_air@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/save_air_select@2x.png b/public/assets/imgs/device-detail/normal-mode/save_air_select@2x.png new file mode 100644 index 0000000..7d50ab0 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/save_air_select@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/shut_down_loop_pur@2x.png b/public/assets/imgs/device-detail/normal-mode/shut_down_loop_pur@2x.png new file mode 100644 index 0000000..ad95cd2 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/shut_down_loop_pur@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/shut_down_save_air@2x.png b/public/assets/imgs/device-detail/normal-mode/shut_down_save_air@2x.png new file mode 100644 index 0000000..b746087 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/shut_down_save_air@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/shut_down_smart_auto@2x.png b/public/assets/imgs/device-detail/normal-mode/shut_down_smart_auto@2x.png new file mode 100644 index 0000000..4457bf5 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/shut_down_smart_auto@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/shut_down_ventilation@2x.png b/public/assets/imgs/device-detail/normal-mode/shut_down_ventilation@2x.png new file mode 100644 index 0000000..291dd87 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/shut_down_ventilation@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/smart_auto@2x.png b/public/assets/imgs/device-detail/normal-mode/smart_auto@2x.png new file mode 100644 index 0000000..419444e Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/smart_auto@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/smart_auto_select@2x.png b/public/assets/imgs/device-detail/normal-mode/smart_auto_select@2x.png new file mode 100644 index 0000000..3f46407 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/smart_auto_select@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/ventilation@2x.png b/public/assets/imgs/device-detail/normal-mode/ventilation@2x.png new file mode 100644 index 0000000..d5ad56b Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/ventilation@2x.png differ diff --git a/public/assets/imgs/device-detail/normal-mode/ventilation_select@2x.png b/public/assets/imgs/device-detail/normal-mode/ventilation_select@2x.png new file mode 100644 index 0000000..f456053 Binary files /dev/null and b/public/assets/imgs/device-detail/normal-mode/ventilation_select@2x.png differ diff --git a/public/assets/imgs/show/select_time_bg.png b/public/assets/imgs/show/select_time_bg.png new file mode 100644 index 0000000..fdca7e4 Binary files /dev/null and b/public/assets/imgs/show/select_time_bg.png differ diff --git a/src/assets/imgs/show/select_time_bg.png b/src/assets/imgs/show/select_time_bg.png new file mode 100644 index 0000000..fdca7e4 Binary files /dev/null and b/src/assets/imgs/show/select_time_bg.png differ diff --git a/src/styles/framework/base/flexbox.scss b/src/styles/framework/base/flexbox.scss index 1032b2a..de3febd 100644 --- a/src/styles/framework/base/flexbox.scss +++ b/src/styles/framework/base/flexbox.scss @@ -265,6 +265,11 @@ Flex, Grow, & Shrink 待确定 padding: 24px; flex-wrap: wrap; } +//单行列表父布局 +.zhp-item-one-bg { + display: flex; + flex-wrap: wrap; +} //智慧屏背景 .base-bg { @@ -371,7 +376,11 @@ Flex, Grow, & Shrink 待确定 font-size: 24px; font-weight: 400; } - + .zhp-text-24-white { + color: #fff; + font-size: 24px; + font-weight: 400; + } .zhp-text-28-white { color: #fff; font-size: 28px; @@ -474,4 +483,16 @@ Flex, Grow, & Shrink 待确定 .margin-top-30 { margin-top: 30px; } + .margin-top-34 { + margin-top: 34px; + } + .margin-bottom-20 { + margin-bottom: 20px; + } + .margin-bottom-26 { + margin-bottom: 26px; + } + .margin-bottom-34 { + margin-bottom: 34px; + } } diff --git a/src/view/data-center/data-center-show.vue b/src/view/data-center/data-center-show.vue index 54f52a2..8453f70 100644 --- a/src/view/data-center/data-center-show.vue +++ b/src/view/data-center/data-center-show.vue @@ -1,9 +1,15 @@ @@ -22,9 +59,13 @@ import router from "@/router"; const getImgSrc = $commonService.$imgService.getImgSrc; -let titleText = ref(""); -let showImg = ref(""); - +const titleText = ref(""); +const showImg = ref(""); +const showOver = ref(false); +/** + * 是否为空调 + */ +const isKt = ref(1); onBeforeMount(() => { const query: any = router.currentRoute.value.query; if (query) { @@ -37,8 +78,41 @@ onActivated(() => { if (query) { titleText.value = query.titleText; showImg.value = query.showImg; + isKt.value = query.isKt; } }); +const kqList = ref([ + { + selectState: true, + name: "空气盒子", + id: 1, + }, + { + selectState: false, + name: "全热新风", + id: 2, + }, +]); +const ktList = ref([ + { + selectState: true, + name: "客厅空调", + id: 1, + }, + { + selectState: false, + name: "卧室空调", + id: 2, + }, + { + selectState: false, + name: "儿童房空调", + id: 3, + }, +]); +const onShowOver = () => { + showOver.value = !showOver.value; +}; diff --git a/src/view/data-center/data-center.vue b/src/view/data-center/data-center.vue index 942aba2..826b123 100644 --- a/src/view/data-center/data-center.vue +++ b/src/view/data-center/data-center.vue @@ -44,10 +44,11 @@ const centerList = ref([ path: "/dataCenterShow", query: { titleText: "低碳节能", - showImg: "/assets/imgs/show/datacenter_tb_nhtj.png" - } + showImg: "/assets/imgs/show/datacenter_tb_nhtj.png", + isKt: 1, + }, }); - } + }, }, { isSelect: false, @@ -58,10 +59,11 @@ const centerList = ref([ path: "/dataCenterShow", query: { titleText: "温度曲线", - showImg: "/assets/imgs/show/datacenter_tb_wdbh.png" - } + showImg: "/assets/imgs/show/datacenter_tb_wdbh.png", + isKt: 1, + }, }); - } + }, }, { isSelect: false, @@ -72,10 +74,11 @@ const centerList = ref([ path: "/dataCenterShow", query: { titleText: "空气质量", - showImg: "/assets/imgs/show/datacenter_tb_kqzl.png" - } + showImg: "/assets/imgs/show/datacenter_tb_kqzl.png", + isKt: 0, + }, }); - } + }, }, { isSelect: false, @@ -86,11 +89,12 @@ const centerList = ref([ path: "/dataCenterShow", query: { titleText: "运转状态", - showImg: "/assets/imgs/show/datacenter_tb_wdbh.png" - } + showImg: "/assets/imgs/show/datacenter_tb_wdbh.png", + isKt: 1, + }, }); - } - } + }, + }, ]); diff --git a/src/view/device-detail/device-detail.vue b/src/view/device-detail/device-detail.vue index c728bc0..e58f9c9 100644 --- a/src/view/device-detail/device-detail.vue +++ b/src/view/device-detail/device-detail.vue @@ -49,6 +49,8 @@ :show-wind-dire="showWindDire" :device-type="deviceType" :d-mode="dMode" + :d-tem="tem" + :d-hum="hum" @change-bg="changeBg($event)" @change-switch="changeSwitch($event)" > @@ -124,6 +126,10 @@ const showWindDire = ref(true); const deviceType = ref(); /** 当前选中的模式 */ const dMode = ref(1); +/** 温度 */ +const tem = ref(22); +/** 湿度 */ +const hum = ref(50); onActivated(() => { // 为了刷新dom 用v-if刷新 @@ -134,6 +140,8 @@ onActivated(() => { ifRun.value = query.openFlg === "true" ? true : false; dMode.value = query.dMode; deviceType.value = query.deviceType; + tem.value = query.tem; + hum.value = query.hum; // mode.value=query.mode; if (query.deviceType === "4E") { showTabs.value = false; diff --git a/src/view/device-detail/fresh-air.vue b/src/view/device-detail/fresh-air.vue index d4a1da5..46434b7 100644 --- a/src/view/device-detail/fresh-air.vue +++ b/src/view/device-detail/fresh-air.vue @@ -262,7 +262,7 @@ const changeSwitch = () => { } .setting-control { - margin-top: 43px; + margin-top: 13px; padding: 0 64px; display: flex; justify-content: space-between; diff --git a/src/view/device-detail/mode/normal.vue b/src/view/device-detail/mode/normal.vue index b58da97..3c7e552 100644 --- a/src/view/device-detail/mode/normal.vue +++ b/src/view/device-detail/mode/normal.vue @@ -133,24 +133,28 @@ const props = defineProps<{ deviceType: string; /**默认模式*/ dMode: any; + /**温度*/ + dTem: number; + /**湿度*/ + dHum: number; }>(); const { ifRun } = toRefs(props); /** 温度配置 */ const tempOptions = ref({ titleName: "室内", - value: 25, + value: props.dTem, unit: "℃", - min: 16, - max: 32, + min: 22, + max: 60, current: "temp" }); /** 湿度配置 */ const humiOptions = ref({ titleName: "湿度", - value: 76, + value: props.dHum, unit: "%", - min: 35, - max: 90, + min: 22, + max: 60, current: "humi" }); /** 当前展示可操作性的配置 */ diff --git a/src/view/device-detail/whole-setting.vue b/src/view/device-detail/whole-setting.vue index 21cd6b8..70c9c3f 100644 --- a/src/view/device-detail/whole-setting.vue +++ b/src/view/device-detail/whole-setting.vue @@ -100,8 +100,8 @@ import { getCurrentInstance, onActivated, onBeforeMount, ref } from "vue"; import router from "@/router"; const isAuto = ref(true); -const tem = ref(23); -const hum = ref(56); +const tem = ref(22); +const hum = ref(50); const { proxy } = getCurrentInstance() as any; const queryType = ref(1); @@ -109,30 +109,11 @@ onActivated(() => { const query: any = router.currentRoute.value.query; if (query) { queryType.value = query.type; - setData(); + tem.value = query.tem; + hum.value = query.hum; } }); -const setData = () => { - switch (queryType.value) { - case 1: //春季 - tem.value = 24; - hum.value = 50; - break; - case 2: //夏季 - tem.value = 26; - hum.value = 60; - break; - case 3: //梅雨 - tem.value = 24; - hum.value = 60; - break; - case 4: //冬季 - tem.value = 22; - hum.value = 50; - break; - } -}; /** * 全屋设定，Event通知值变化 */ @@ -173,7 +154,6 @@ const openAuto = () => { isAuto.value = !isAuto.value; if (isAuto.value) { //自动 - setData(); } }; diff --git a/src/view/message/messageDetail.vue b/src/view/message/messageDetail.vue index 23c6e25..e0fb60a 100644 --- a/src/view/message/messageDetail.vue +++ b/src/view/message/messageDetail.vue @@ -8,9 +8,9 @@ />
-
{{time}}
-
{{title}}
-
{{content}}
+
{{ time }}
+
{{ title }}
+
{{ content }}
@@ -18,17 +18,18 @@ diff --git a/src/view/ui/env-select.vue b/src/view/ui/env-select.vue index 3b495a9..6999512 100644 --- a/src/view/ui/env-select.vue +++ b/src/view/ui/env-select.vue @@ -44,7 +44,7 @@ const seasonList = ref([ { id: 1, tem: "26", - season: "春季", + season: "夏季", hum: 0 }, {