Browse Source

fix: 修复ts报错校验

anxiaoxia 2 months ago
parent
commit
85164e5355

File diff suppressed because it is too large
+ 11 - 0
src/assets/taiguv1/svg/curtain_icon.svg


+ 12 - 17
src/views/envmonitor/components/Air/manualIndex.vue

@@ -231,25 +231,20 @@
 </template>
 
 <script lang="ts">
-import {
-  defineComponent,
-  onMounted,
-  reactive,
-  toRefs,
-  computed,
-  watch,
-  onUnmounted,
-  onBeforeMount,
-  onBeforeUnmount,
-  nextTick,
-} from "vue";
-import { Switch, Dialog, Toast } from "vant";
-import { swiper } from "@/utils/swiper";
 import { querySpaceConditioners, setSpaceCondtioners } from "@/apis/envmonitor";
 import { fix, getRelNowTime, parseImgUrl, setQueryConfig } from "@/utils";
+import { swiper } from "@/utils/swiper";
+import { Dialog, Switch, Toast } from "vant";
+import {
+    defineComponent,
+    nextTick,
+    onBeforeUnmount,
+    onMounted,
+    reactive,
+    toRefs,
+    watch
+} from "vue";
 import any = jasmine.any;
-import { parse } from "url";
-import { number } from "echarts";
 
 export default defineComponent({
   props: {
@@ -296,7 +291,7 @@ export default defineComponent({
   },
   components: {
     Switch,
-    [Dialog.Component.name]: Dialog.Component,
+    [(Dialog.Component.name) as string]: Dialog.Component,
   },
   setup(props, contx) {
     const propsVal = props;

+ 21 - 23
src/views/envmonitor/components/Air/manualIndexOld.vue

@@ -310,22 +310,20 @@
 </template>
   
   <script lang="ts">
-import {
-  defineComponent,
-  onMounted,
-  reactive,
-  toRefs,
-  computed,
-  watch,
-  onUnmounted,
-  onBeforeMount,
-  onBeforeUnmount,
-  nextTick,
-} from "vue";
-import { Switch, Dialog, Toast } from "vant";
-import { swiper } from "@/utils/swiper";
 import { querySpaceConditioners, setSpaceCondtioners } from "@/apis/envmonitor";
 import { getRelNowTime, parseImgUrl, setQueryConfig } from "@/utils";
+import { swiper } from "@/utils/swiper";
+import { Dialog, Switch, Toast } from "vant";
+import {
+    defineComponent,
+    nextTick,
+    onBeforeUnmount,
+    onMounted,
+    reactive,
+    toRefs,
+    watch
+} from "vue";
+
 import any = jasmine.any;
 
 export default defineComponent({
@@ -369,7 +367,7 @@ export default defineComponent({
   },
   components: {
     Switch,
-    [Dialog.Component.name]: Dialog.Component,
+    [(Dialog.Component.name) as string]: Dialog.Component,
   },
   setup(props, contx) {
     const propsVal = props;
@@ -1130,10 +1128,10 @@ export default defineComponent({
         text-overflow: ellipsis;
         white-space: nowrap;
       }
-      .child-switch {
+    //   .child-switch {
         // height: 20px;
         // width: 50px;
-      }
+    //   }
     }
     .adjust-box {
       box-sizing: border-box;
@@ -1449,16 +1447,16 @@ export default defineComponent({
   .van-switch--disabled {
     opacity: 0.5;
   }
-  .child-control-box {
-    .child-switch {
+//   .child-control-box {
+    // .child-switch {
       // position: relative;
-      .van-switch__node {
+    //   .van-switch__node {
         // margin-top: -6px;
         // width: 20px !important;
         // height: 20px !important;
-      }
-    }
-  }
+      //   }
+    // }
+  //    }
 }
 </style>
   

+ 63 - 67
src/views/envmonitor/index.vue

@@ -17,6 +17,7 @@
         @touchend="showDeleteButton"
       >
         <!--
+      
         <div class="logo-box">
           <img class="logo-icon" v-if="logImg" :src="logImg" alt="" />
           <img
@@ -418,77 +419,72 @@
 
 <script lang="ts">
 import {
-  defineComponent,
-  reactive,
-  toRefs,
-  ref,
-  onBeforeMount,
-  onMounted,
-  nextTick,
-  onBeforeUnmount,
-  getCurrentInstance,
-} from "vue";
-import WorkOvertime from "./components/workOvertime/index.vue";
-import ManualOvertime from "./components/ManualWork/index.vue";
-import Contact from "./components/Contact/index.vue";
-import WorkConfig from "./components/workOvertime/WorkConfig.vue";
-import ManualConfig from "./components/ManualWork/WorkConfig.vue";
-import ScenarioConfig from "./components/Scenario/ScenarioConfig.vue";
-import MapBox from "@/views/envmonitor/components/Map/MapBox.vue";
-import Header from "@/components/header/Index.vue";
+    changeSetTimeHttp,
+    getCompanyInfo,
+    getMeetingSceneHttp,
+    getPadImg,
+    getSpaceEquipList,
+    getSpaceEquipType,
+    getSpaceInfo,
+    getSpaceMode,
+    getSpaceTemp,
+    getUserControlAuth,
+    getWeather,
+    queryCustomAndScence,
+    queryCustomerservice,
+    querySpaceSceneConfig,
+    queryWorkSpace
+} from "@/apis/envmonitor";
 import Comheader from "@/components/header/Comheader.vue";
+import Header from "@/components/header/Index.vue";
+import Keys from "@/constant/key";
+import { SpaceInfoModel } from "@/model/userModel";
+import { store } from "@/store";
+import {
+    formatDate,
+    formatDateStr,
+    getHours,
+    getNowWeek,
+    getRelNowTime,
+    getUserInfo,
+    parseImgUrl,
+    setQueryConfig
+} from "@/utils";
+import { getCookieMac } from "@/utils/cookies";
+import { getWorkType } from "@/utils/mapIcon";
+import ChildAirControl from "@/views/envmonitor/components/Air/ChildAirControl.vue";
 import Air from "@/views/envmonitor/components/Air/index.vue";
-import FloorHeating from "@/views/envmonitor/components/FloorHeating/index.vue";
 import ManualIndex from "@/views/envmonitor/components/Air/manualIndex.vue";
-import Light from "@/views/envmonitor/components/Light/index.vue";
-import Curtain from "@/views/envmonitor/components/Curtain/index.vue";
 import CurtainOpening from "@/views/envmonitor/components/Curtain/CurtainOpening.vue";
-import TimeBox from "@/views/envmonitor/TimeBox.vue";
-import NavBar from "@/views/envmonitor/NavBar.vue";
-import ScenarioDailog from "@/views/envmonitor/components/Scenario/scenarioDailog.vue";
-import Detail from "@/views/envmonitor/detail.vue";
-import ComMap from "@/views/envmonitor/components/Map/index.vue";
-import LightTemp from "@/views/envmonitor/components/Light/LightTemp.vue";
+import Curtain from "@/views/envmonitor/components/Curtain/index.vue";
 import ChildTempSet from "@/views/envmonitor/components/FloorHeating/ChildTempSet.vue";
-import ChildAirControl from "@/views/envmonitor/components/Air/ChildAirControl.vue";
+import FloorHeating from "@/views/envmonitor/components/FloorHeating/index.vue";
+import Light from "@/views/envmonitor/components/Light/index.vue";
+import LightTemp from "@/views/envmonitor/components/Light/LightTemp.vue";
+import ComMap from "@/views/envmonitor/components/Map/index.vue";
+import MapBox from "@/views/envmonitor/components/Map/MapBox.vue";
+import ScenarioDailog from "@/views/envmonitor/components/Scenario/scenarioDailog.vue";
 import Socket from "@/views/envmonitor/components/Socket/index.vue";
-import { Icon, Popup, Dialog, Toast } from "vant";
-import { useRouter, useRoute } from "vue-router";
-import {
-  getCompanyInfo,
-  getWeather,
-  getSpaceInfo,
-  getMeetingSceneHttp,
-  getSetTimeHttp,
-  changeSetTimeHttp,
-  getSpaceEquipType,
-  getPermanentSpace,
-  getUserControlAuth,
-  getSpaceMode,
-  getSpaceTemp,
-  querySpaceSceneConfig,
-  queryCustomAndScence,
-  queryWorkSpace,
-  getPadImg,
-  getSpaceEquipList,
-  queryCustomerservice,
-} from "@/apis/envmonitor";
-import Keys from "@/constant/key";
+import Detail from "@/views/envmonitor/detail.vue";
+import NavBar from "@/views/envmonitor/NavBar.vue";
+import TimeBox from "@/views/envmonitor/TimeBox.vue";
+import { Dialog, Icon, Popup, Toast } from "vant";
 import {
-  formatDate,
-  formatDateStr,
-  getHours,
-  getLocalNewSpaceInfo,
-  getNowWeek,
-  getRelNowTime,
-  getUserInfo,
-  parseImgUrl,
-  setQueryConfig,
-} from "@/utils";
-import { store } from "@/store";
-import { SpaceInfoModel } from "@/model/userModel";
-import { getWorkType } from "@/utils/mapIcon";
-import { getCookieMac } from "@/utils/cookies";
+    defineComponent,
+    getCurrentInstance,
+    nextTick,
+    onBeforeUnmount,
+    onMounted,
+    reactive,
+    toRefs
+} from "vue";
+import { useRoute, useRouter } from "vue-router";
+import Contact from "./components/Contact/index.vue";
+import ManualOvertime from "./components/ManualWork/index.vue";
+import ManualConfig from "./components/ManualWork/WorkConfig.vue";
+import ScenarioConfig from "./components/Scenario/ScenarioConfig.vue";
+import WorkOvertime from "./components/workOvertime/index.vue";
+import WorkConfig from "./components/workOvertime/WorkConfig.vue";
 
 export default defineComponent({
   components: {
@@ -516,7 +512,7 @@ export default defineComponent({
     ChildTempSet,
     CurtainOpening,
     Socket,
-    [Dialog.Component.name]: Dialog.Component,
+    [(Dialog.Component.name) as string]: Dialog.Component,
     VanPopup: Popup,
     VanIcon: Icon,
   },
@@ -2459,7 +2455,7 @@ export default defineComponent({
         border-radius: 25px;
       }
       // 暂时去掉,不然直接能看到超标
-      .env-color {
+    //   .env-color {
         // background: linear-gradient(
         //   180deg,
         //   rgba(205, 11, 0, 0) 0%,
@@ -2467,7 +2463,7 @@ export default defineComponent({
         // );
         // opacity: 0.8;
         // border-radius: 25px;
-      }
+    //   }
     }
   }
 

+ 9 - 13
src/views/envmonitor/taiguv1/components/Air/index.vue

@@ -68,21 +68,17 @@
 </template>
 
 <script>
+import { fix, parseImgUrl } from "@/utils";
+import { swiper } from "@/utils/swiper";
+import { Dialog, Loading, Switch } from "vant";
 import {
-  defineComponent,
-  onMounted,
-  reactive,
-  toRefs,
-  computed,
-  nextTick,
-  watch,
-  onUnmounted,
-  onBeforeMount,
-  onBeforeUnmount,
+    defineComponent,
+    nextTick,
+    onBeforeUnmount,
+    onMounted,
+    reactive,
+    toRefs
 } from "vue";
-import { Switch, Dialog, Loading, Toast } from "vant";
-import { parseImgUrl, fix } from "@/utils";
-import { swiper } from "@/utils/swiper";
 
 export default defineComponent({
   components: {

+ 212 - 0
src/views/envmonitor/taiguv1/components/Curtain/CurtainMore.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="more-box">
+    <div class="light-more-top">
+      <div class="left">
+        <div class="light-box">
+          <img :src="parseImgUrl('taiguv1/envmonitor', 'active/lamp.svg')" alt="" />
+        </div>
+        <div class="light-name">窗帘</div>
+      </div>
+      <div class="right">
+        <div class="control">全开</div>
+        <div class="control">全关</div>
+      </div>
+    </div>
+    <div class="light-bottom">
+      <div
+        class="item-box"
+        :class="item.isOpen ? 'light-box-active ' : ''"
+        v-for="(item, index) in childLights"
+      >
+        <div class="name">{{ item.name }}</div>
+        <Switch
+          class="switch-btn"
+          inactive-color="rgba(0, 0, 0, 0.08)"
+          v-model="item.isOpen"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import {
+  defineComponent,
+  onMounted,
+  reactive,
+  toRefs,
+  computed,
+  watch,
+  onUnmounted,
+  onBeforeMount,
+  onBeforeUnmount,
+} from "vue";
+import { Switch, Dialog, Loading, Toast } from "vant";
+import { parseImgUrl } from "@/utils";
+import any = jasmine.any;
+
+export default defineComponent({
+  components: {
+    Switch,
+    [Dialog.Component.name]: Dialog.Component,
+    Loading,
+  },
+  setup(props, contx) {
+    const proxyData = reactive({
+      parseImgUrl: parseImgUrl,
+      isOpen: false,
+      childLights: [
+        {
+          name: "主灯",
+          isOpen: false,
+        },
+        {
+          name: "氛围灯",
+          isOpen: false,
+        },
+        {
+          name: "吸顶灯",
+          isOpen: false,
+        },
+        {
+          name: "吊灯",
+          isOpen: false,
+        },
+        {
+          name: "壁灯",
+          isOpen: false,
+        },
+      ],
+    });
+    onBeforeUnmount(() => {});
+    onMounted(() => {});
+
+    return {
+      ...toRefs(proxyData),
+    };
+  },
+});
+</script>
+<style lang="scss" scoped>
+.more-box {
+  .light-more-top {
+    display: flex;
+    align-items: center;
+    .left {
+      margin-right: 36px;
+      .light-box {
+        width: 110px;
+        height: 110px;
+        background: rgba(255, 255, 255, 0.4);
+        border-radius: 50%;
+        text-align: center;
+        margin-right: 27px;
+        img {
+          width: 36px;
+          height: 36px;
+          margin: 0 auto;
+          margin-top: 37px;
+        }
+      }
+      .light-name {
+        //styleName: Chi/Body Large;
+        margin-top: 12px;
+        font-family: PingFang SC;
+        width: 110px;
+        font-size: 16px;
+        font-weight: 300;
+        line-height: 22px;
+        letter-spacing: 0.02em;
+        text-align: center;
+        color: rgba(0, 20, 40, 1);
+      }
+    }
+    .right {
+      height: 92px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .control {
+        width: 100px;
+        height: 40px;
+        line-height: 40px;
+        border-radius: 50px;
+        backdrop-filter: blur(20px);
+        background: rgba(255, 255, 255, 0.4);
+        box-shadow: 0px 10px 20px 0px rgba(0, 0, 0, 0.05);
+        //styleName: Chi/Body Small;
+        font-family: PingFang SC;
+        font-size: 12px;
+        font-weight: 400;
+        letter-spacing: 0.04em;
+        text-align: center;
+      }
+    }
+  }
+  .light-bottom {
+    margin-top: 36px;
+    .item-box {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      width: 300px;
+      height: 68px;
+      box-sizing: border-box;
+      padding: 20px 24px;
+      border-radius: 24px 24px 44px 24px;
+      background: rgba(255, 255, 255, 0.2);
+      box-shadow: 0px 10px 20px 0px rgba(0, 20, 40, 0.05);
+      margin-bottom: 12px;
+      .name {
+        //styleName: Chi/Body Regular;
+        font-family: PingFang SC;
+        font-size: 14px;
+        font-weight: 400;
+        line-height: 19px;
+        letter-spacing: 0.02em;
+        color: rgba(0, 20, 40, 1);
+      }
+    }
+    .light-box-active {
+      background: rgba(255, 255, 255, 0.6);
+    }
+  }
+  .switch-btn {
+    margin-top: 0;
+    width: 50px !important;
+    height: 28px !important;
+    border: none;
+  }
+}
+</style>
+<style lang="scss">
+.more-box {
+  .van-switch__node {
+    background: rgba(255, 255, 255, 0.6);
+    width: 24px;
+    height: 24px;
+    top: 0.33vh;
+  }
+  .van-switch--on {
+    background: linear-gradient(95.5deg, #99282b 21.44%, #a95459 84.95%) !important;
+    .van-switch__node {
+      background: #fff !important;
+    }
+  }
+  .van-loading__spinner {
+    color: $elActiveColor !important;
+  }
+
+  .van-switch__loading {
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    line-height: 1;
+  }
+
+  .van-switch--disabled {
+    opacity: 0.5;
+  }
+}
+</style>

+ 162 - 120
src/views/envmonitor/taiguv1/components/Curtain/index.vue

@@ -1,159 +1,201 @@
 <template>
-  <div class="volumn-box" :class="isOpen ? 'active' : ''">
-    <div class="top">
-      <img
-        :src="
+    <div
+        class="volumn-box"
+        :class="isOpen ? 'active' : ''"
+        @click="searchMore"
+    >
+        <div class="top">
+            <img
+                :src="
           parseImgUrl('taiguv1/envmonitor', isOpen ? 'active/curtain.svg' : 'curtain.svg')
         "
-        alt=""
-      />
-      <div class="top-right">
-        <Switch class="switch-btn" inactive-color="rgba(0, 0, 0, 0.3)" v-model="isOpen" />
-      </div>
+                alt=""
+            />
+            <div class="top-right">
+                <Switch
+                    class="switch-btn"
+                    inactive-color="rgba(0, 0, 0, 0.3)"
+                    v-model="isOpen"
+                    @click.stop=""
+                />
+            </div>
+        </div>
+        <div class="bottom">
+            <div class="text">窗帘</div>
+            <div class="status">{{ isOpen ? "已开启" : "已关闭" }}</div>
+            <div class="control-box">
+                <div class="control-item">上</div>
+                <div class="control-item">停</div>
+                <div class="control-item">下</div>
+            </div>
+        </div>
     </div>
-    <div class="bottom">
-      <div class="text">窗帘</div>
-      <div class="status">{{ isOpen ? "已开启" : "已关闭" }}</div>
-    </div>
-  </div>
 </template>
 
 <script lang="ts">
 import {
-  defineComponent,
-  onMounted,
-  reactive,
-  toRefs,
-  computed,
-  watch,
-  onUnmounted,
-  onBeforeMount,
-  onBeforeUnmount,
+    defineComponent,
+    onMounted,
+    reactive,
+    toRefs,
+    computed,
+    watch,
+    onUnmounted,
+    onBeforeMount,
+    onBeforeUnmount,
 } from "vue";
 import { Switch, Dialog, Loading, Toast } from "vant";
 import { parseImgUrl } from "@/utils";
 import any = jasmine.any;
 
 export default defineComponent({
-  components: {
-    Switch,
-    [Dialog.Component.name]: Dialog.Component,
-    Loading,
-  },
-  setup(props, contx) {
-    const proxyData = reactive({
-      parseImgUrl: parseImgUrl,
-      isOpen: false,
-    });
-    onBeforeUnmount(() => {});
-    onMounted(() => {});
+    components: {
+        Switch,
+        [Dialog.Component.name]: Dialog.Component,
+        Loading,
+    },
+    setup(props, contx) {
+        const proxyData = reactive({
+            parseImgUrl: parseImgUrl,
+            isOpen: false,
+            searchMore() {
+            contx.emit("showMore",'curtain',true);
+      },
+        });
+        onBeforeUnmount(() => {});
+        onMounted(() => {});
 
-    return {
-      ...toRefs(proxyData),
-    };
-  },
+        return {
+            ...toRefs(proxyData),
+        };
+    },
 });
 </script>
 <style lang="scss" scoped>
 .volumn-box {
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  padding: 16px;
-  width: 100%;
-  height: 100%;
-  border-radius: 24px 24px 44px 24px;
-  background: rgba(255, 255, 255, 0.2);
-  backdrop-filter: blur(40px);
-  box-shadow: 0px 10px 20px 0px rgba(0, 20, 40, 0.1);
-  .top {
+    box-sizing: border-box;
     display: flex;
+    flex-direction: column;
     justify-content: space-between;
-    img {
-      width: 30px;
+    padding: 16px;
+    width: 100%;
+    height: 100%;
+    border-radius: 24px 24px 44px 24px;
+    background: rgba(255, 255, 255, 0.2);
+    backdrop-filter: blur(40px);
+    box-shadow: 0px 10px 20px 0px rgba(0, 20, 40, 0.1);
+    .top {
+        display: flex;
+        justify-content: space-between;
+        img {
+            width: 30px;
+        }
     }
-  }
-  .bottom {
-    // margin-top: 18vh;
-    // margin-top: 109px;
-    .text {
-      //styleName: Chi/Body Large;
-      font-family: PingFang SC;
-      font-size: 16px;
-      font-weight: 300;
-      line-height: 22px;
-      letter-spacing: 0.02em;
-      text-align: left;
-      text-underline-position: from-font;
-      text-decoration-skip-ink: none;
-      color: rgba(255, 255, 255, 1);
-      padding-bottom: 2px;
+    .bottom {
+        // margin-top: 18vh;
+        // margin-top: 109px;
+        .text {
+            //styleName: Chi/Body Large;
+            font-family: PingFang SC;
+            font-size: 16px;
+            font-weight: 300;
+            line-height: 22px;
+            letter-spacing: 0.02em;
+            text-align: left;
+            text-underline-position: from-font;
+            text-decoration-skip-ink: none;
+            color: rgba(255, 255, 255, 1);
+            padding-bottom: 2px;
+        }
+        .status {
+            //styleName: Chi/Body XS;
+            font-family: PingFang SC;
+            font-size: 11px;
+            font-weight: 400;
+            line-height: 15px;
+            letter-spacing: 0.02em;
+            color: rgba(255, 255, 255, 0.4);
+        }
+        .control-box {
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            .control-item {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 36px;
+                height: 36px;
+                border-radius: 60px;
+                opacity: 0.6;
+                background: var(--White-White-40, rgba(255, 255, 255, 0.40));
+                backdrop-filter: blur(30px);
+                font-family: Jost;
+                font-size: 16px;
+                font-style: normal;
+                font-weight: 300;
+                line-height: normal;
+            }
+        }
     }
-    .status {
-      //styleName: Chi/Body XS;
-      font-family: PingFang SC;
-      font-size: 11px;
-      font-weight: 400;
-      line-height: 15px;
-      letter-spacing: 0.02em;
-      color: rgba(255, 255, 255, 0.4);
+    .switch-btn {
+        width: 50px !important;
+        height: 28px !important;
+        border: none;
     }
-  }
-  .switch-btn {
-    width: 50px !important;
-    height: 28px !important;
-    border: none;
-  }
 }
 .active {
-  background: rgba(255, 255, 255, 0.8);
-  backdrop-filter: blur(40px);
-  box-shadow: 0px 10px 20px 0px rgba(0, 20, 40, 0.1);
+    background: rgba(255, 255, 255, 0.8);
+    backdrop-filter: blur(40px);
+    box-shadow: 0px 10px 20px 0px rgba(0, 20, 40, 0.1);
 
-  .bottom {
-    .text {
-      color: rgba(0, 20, 40, 1);
+    .bottom {
+        .text {
+            color: rgba(0, 20, 40, 1);
+        }
+        .status {
+            color: rgba(116, 128, 141, 1);
+        }
     }
-    .status {
-      color: rgba(116, 128, 141, 1);
-    }
-  }
 }
 </style>
 <style lang="scss">
 .volumn-box {
-  .van-switch__node {
-    background: rgba(255, 255, 255, 0.6);
-    width: 24px;
-    height: 24px;
-    top: 0.33vh;
-  }
-  .van-switch--on.switch-btn {
     .van-switch__node {
-      transform: translate(calc(50px - 28px)) !important;
+        background: rgba(255, 255, 255, 0.6);
+        width: 24px;
+        height: 24px;
+        top: 0.33vh;
     }
-  }
-  .van-switch--on {
-    background: linear-gradient(95.5deg, #99282b 21.44%, #a95459 84.95%) !important;
-    .van-switch__node {
-      background: #fff !important;
+    .van-switch--on.switch-btn {
+        .van-switch__node {
+            transform: translate(calc(50px - 28px)) !important;
+        }
+    }
+    .van-switch--on {
+        background: linear-gradient(
+            95.5deg,
+            #99282b 21.44%,
+            #a95459 84.95%
+        ) !important;
+        .van-switch__node {
+            background: #fff !important;
+        }
+    }
+    .van-loading__spinner {
+        color: $elActiveColor !important;
     }
-  }
-  .van-loading__spinner {
-    color: $elActiveColor !important;
-  }
 
-  .van-switch__loading {
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    line-height: 1;
-  }
+    .van-switch__loading {
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        line-height: 1;
+    }
 
-  .van-switch--disabled {
-    opacity: 0.5;
-  }
+    .van-switch--disabled {
+        opacity: 0.5;
+    }
 }
 </style>

+ 1 - 1
src/views/envmonitor/taiguv1/components/Lamp/index.vue

@@ -51,7 +51,7 @@ export default defineComponent({
       parseImgUrl: parseImgUrl,
       isOpen: false,
       searchMore() {
-        contx.emit("showMore");
+        contx.emit("showMore",'lamp',true);
       },
     });
     onBeforeUnmount(() => {});

+ 22 - 5
src/views/envmonitor/taiguv1/index.vue

@@ -140,7 +140,7 @@
         <Air @getStatus="getStatus"></Air>
       </div>
       <div class="box">
-        <Curtain></Curtain>
+        <Curtain @showMore="showMore"></Curtain>
       </div>
     </div>
 
@@ -148,11 +148,13 @@
       v-model:show="isLightColorFlag"
       position="right"
       :close-on-click-overlay="true"
+      @close="closePopup"
       class="taigu-popup"
       teleport="#app"
     >
       <div>
-        <LightMore></LightMore>
+        <LightMore v-if="isLightMoreFlag"></LightMore>
+        <CurtainMore v-if="isCurtainMoreFlag"></CurtainMore>
       </div>
     </van-popup>
   </div>
@@ -167,6 +169,7 @@ import Volumn from './components/Volumn/index.vue'
 import Lamp from './components/Lamp/index.vue'
 import Curtain from './components/Curtain/index.vue'
 import LightMore from './components/Lamp/LightMore.vue'
+import CurtainMore from './components/Curtain/CurtainMore.vue'
 
 import { parseImgUrl } from '@/utils'
 // import "vue3-video-play/dist/style.css";
@@ -180,6 +183,7 @@ export default defineComponent({
     Air,
     Curtain,
     LightMore,
+    CurtainMore,
     videoPlay,
   },
 
@@ -209,7 +213,7 @@ export default defineComponent({
           modeBg:
             'linear-gradient(113.73deg, rgba(47, 36, 28, 0.4) 17.26%, rgba(47, 36, 28, 0.8) 55.71%)',
           bg: 'https://terra-h5.tenants.link/static/WeChat/page-taiguv1/page-pad/pad_room1.png',
-          icon: 'https://terra-h5.tenants.link/static/WeChat/page-taiguv1/page-pad/room_eos.svg',
+          icon: require('@/assets/taiguv1/svg/meting_icon.svg'),
           video:
             'https://terra-h5.tenants.link/static/WeChat/page-taiguv1/page-pad/pad_room_video1.mov',
         },
@@ -274,11 +278,24 @@ export default defineComponent({
         proxyData.airStatus = flag
       },
       isLightColorFlag: false,
+      isLightMoreFlag: false,
+      isCurtainMoreFlag: false,
       lightData: [],
-
-      showMore(lightData) {
+// 打开左弹框
+      showMore(type,showStatus) {
+        console.log(type,showStatus)
         proxyData.isLightColorFlag = true
+        if(type == "curtain"){
+          proxyData.isCurtainMoreFlag = showStatus
+        }else{
+          proxyData.isLightMoreFlag = showStatus
+        }
       },
+    //   关闭左弹框
+    closePopup(){
+      proxyData.isLightMoreFlag = false
+      proxyData.isCurtainMoreFlag = false
+    }
     })
     onBeforeUnmount(() => {})
     onMounted(() => {

+ 1 - 1
tsconfig.json

@@ -10,7 +10,7 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "suppressImplicitAnyIndexErrors":true,
+    // "suppressImplicitAnyIndexErrors":true,
     "noImplicitAny":true,
     "sourceMap": true,
     "baseUrl": ".",