From eea94ccd12a85c4cec44a18f5d2e6b0e36e6213c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E8=B6=85?= <943480861@qq.com>
Date: Fri, 26 May 2023 14:33:24 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BB=BF=E5=AE=9A=E6=97=B6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/device-detail/whole-setting.vue |  2 +-
 src/view/tabs/fixed-time.vue             | 29 ++++++++++++++++++------
 src/view/tabs/home-screen.vue            | 15 ++++++++++++
 src/view/timing/timing-add.vue           | 25 ++++++++++++--------
 src/view/ui/env-select.vue               |  6 +++--
 5 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/view/device-detail/whole-setting.vue b/src/view/device-detail/whole-setting.vue
index 1137a5b..aec056e 100644
--- a/src/view/device-detail/whole-setting.vue
+++ b/src/view/device-detail/whole-setting.vue
@@ -137,7 +137,7 @@ const setData = () => {
  * 全屋设定，Event通知值变化
  */
 const wholeSetting = () => {
-  proxy.$eventBusService.emit("selectNumEvent", tem);
+  proxy.$eventBusService.emit("queryData", tem.value, hum.value);
   router.back();
 };
 const temSetting = (type: String) => {
diff --git a/src/view/tabs/fixed-time.vue b/src/view/tabs/fixed-time.vue
index fcd1933..045da4f 100644
--- a/src/view/tabs/fixed-time.vue
+++ b/src/view/tabs/fixed-time.vue
@@ -70,6 +70,19 @@ const router = useRouter();
 const runFun = (index: any) => {
   navList.value.splice(index, 1);
 };
+/**
+ * 添加定时
+ * @param index
+ */
+const addTiming = (data: any) => {
+  navList.value.unshift({
+    id: 0,
+    time: data.time,
+    name: data.name,
+    state: false,
+    selectState: false
+  });
+};
 /**
  * 切换选中状态
  */
@@ -100,12 +113,14 @@ const onItemDelete = (index: number) => {
       pageType: "timingSureDelete",
       index: index,
       hintText: "确定要删除该定时吗？",
-      hintImg: "/assets/imgs/show/icon_delete.png",
-    },
+      hintImg: "/assets/imgs/show/icon_delete.png"
+    }
   });
 };
+
 onBeforeMount(() => {
   proxy.$eventBusService.on("timingDelete", runFun);
+  proxy.$eventBusService.on("timingAdd", addTiming);
 });
 
 const navList = ref([
@@ -114,22 +129,22 @@ const navList = ref([
     time: "2.5",
     name: "主卧空调",
     state: false,
-    selectState: false,
+    selectState: false
   },
   {
     id: 1,
     time: "3.0",
     name: "次卧空调",
     state: true,
-    selectState: false,
+    selectState: false
   },
   {
     id: 2,
     time: "4.0",
     name: "餐厅空调",
     state: false,
-    selectState: false,
-  },
+    selectState: false
+  }
 ]);
 </script>
 
@@ -194,7 +209,7 @@ const navList = ref([
 
 .delete {
   position: absolute;
-  right:36px;
+  right: 36px;
   width: 60px;
   height: 60px;
 }
diff --git a/src/view/tabs/home-screen.vue b/src/view/tabs/home-screen.vue
index cf320fe..93f8449 100644
--- a/src/view/tabs/home-screen.vue
+++ b/src/view/tabs/home-screen.vue
@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
     <div id="home-screen-wrapper">
         <div class="bg-video" @click="changeAnimation()">
             <!-- 关机动画循环 -->
@@ -35,6 +36,20 @@
                 v-show="currentAnimation === 3"
                 ref="animationExit"
             ></video>
+=======
+  <div id="home-screen-wrapper">
+    <div class="nav-top">
+      <div class="wifi-icon">
+        <img src="@/assets/imgs/home-screen/WIFI@2x.png" alt="">
+      </div>
+      <div class="weather">雪天</div>
+      <div class="temp">-26℃</div>
+    </div>
+    <div class="content">
+      <div class="content-left">
+        <div class="time" @c="envSelect">
+          {{ hour }}<span>:</span>{{ minutes }}
+>>>>>>> 267250d (定时添加)
         </div>
 
         <div class="nav-top">
diff --git a/src/view/timing/timing-add.vue b/src/view/timing/timing-add.vue
index a16b014..7595cf3 100644
--- a/src/view/timing/timing-add.vue
+++ b/src/view/timing/timing-add.vue
@@ -4,7 +4,7 @@
       <img
         class="leftImg"
         src="@/assets/imgs/show/back.png"
-        @click="onClickLeft()"
+        @click="router.back()"
       />
       <div class="zhp-title-text">定时</div>
     </div>
@@ -67,6 +67,7 @@
 import { getCurrentInstance, onBeforeMount, ref } from "vue";
 import { useRouter } from "vue-router";
 import { $commonService } from "@/services/framework/dependency-injection-service";
+
 const getImgSrc = $commonService.$imgService.getImgSrc;
 let selectNum = 0;
 let time = 0;
@@ -88,9 +89,6 @@ const selectNumEvent = (index: any) => {
 const selectTimeEvent = (index: any) => {
   time = index;
 };
-const onClickLeft = () => {
-  onSaveClick();
-};
 const onOpenClick = (b: boolean) => {
   isOpen.value = b;
 };
@@ -113,10 +111,12 @@ onBeforeMount(() => {
 });
 
 const onSaveClick = () => {
-  router.push({
-    path: "/tabs",
-    query: { pageType: "tabs", time: time, device: "主卧空调" }
-  });
+  proxy.$eventBusService.emit("timingAdd", { time: time, name: "主卧空调" });
+  router.back();
+  // router.push({
+  //   path: "/tabs",
+  //   query: { pageType: "tabs", time: time, device: "主卧空调" },
+  // });
 };
 </script>
 
@@ -128,8 +128,8 @@ const onSaveClick = () => {
   padding-right: 24px;
   margin-bottom: 12px;
   flex-wrap: wrap;
-
 }
+
 .time-center-item {
   display: flex;
   align-items: center;
@@ -139,13 +139,14 @@ const onSaveClick = () => {
   background-position: center;
   background-repeat: no-repeat;
   background-image: url("@/assets/imgs/show/bg_add_timing_unselect.png");
-
 }
+
 .layout-horizontal {
   display: flex;
   align-items: stretch;
   box-sizing: border-box;
 }
+
 .time-center-item-unselect {
   color: #ffffff;
   opacity: 0.4;
@@ -153,17 +154,20 @@ const onSaveClick = () => {
   font-size: 32px;
   font-weight: 400;
 }
+
 .time-center-item-select {
   color: #ffffff;
   text-align: center;
   font-size: 32px;
   font-weight: 700;
 }
+
 .selectImg {
   width: 60px;
   height: 60px;
   margin-left: 26px;
 }
+
 .item-content {
   margin-bottom: 12px;
   position: relative;
@@ -195,6 +199,7 @@ const onSaveClick = () => {
   font-size: 28px;
   font-weight: 400;
 }
+
 .bottom-btn {
   bottom: 30px;
   position: absolute;
diff --git a/src/view/ui/env-select.vue b/src/view/ui/env-select.vue
index 61ae575..d9472bf 100644
--- a/src/view/ui/env-select.vue
+++ b/src/view/ui/env-select.vue
@@ -31,12 +31,14 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue";
+import { getCurrentInstance, ref } from "vue";
 import router from "@/router";
 import { Toast } from "vant";
+const { proxy } = getCurrentInstance() as any;
 
 const itemOnClick = (item: any) => {
-  Toast("获取的id" + item.id);
+  proxy.$eventBusService.emit("queryType", item.id);
+  router.back();
 };
 const seasonList = ref([
   {