Forráskód Böngészése

fix:地暖功能修改

chenzhen2 1 éve
szülő
commit
22b43e478b

+ 1 - 5
src/views/envmonitor/components/FloorHeating/ChildTempSet.vue

@@ -2,11 +2,6 @@
   <div class="light-temp">
     <div class="light-tep-top">
       <span>氛围灯</span>
-      <!-- <Switch
-          v-model="lampSw"
-          inactive-color="rgba(196, 196, 196, 0.4)"
-          class="switch-btn"
-        /> -->
     </div>
     <div class="bright-box" v-if="lightData.bright">
       <div class="bight-text">
@@ -374,6 +369,7 @@ export default defineComponent({
     onBeforeUnmount(() => {});
     onMounted(() => {
       proxyData.barSwiperInit();
+      console.log("proxyData.lightData===",proxyData.lightData)
     });
     return {
       ...toRefs(proxyData),

+ 42 - 9
src/views/envmonitor/components/FloorHeating/index.vue

@@ -53,8 +53,8 @@
       <template v-for="(item, index) in lampList" :key="item.id">
         <div
           class="light-control"
-          @click="showLightColorCtrol(item)"
-          v-if="showFlag ? index < lampList.length : index < 2"
+          @click="showFloorHeating(item)"
+          v-if="loadMore ? index < lampList.length : index < 2"
         >
           <div class="control-top">
             <div class="control-temp">
@@ -77,7 +77,8 @@
               {{ item.localName }}
             </div>
             <img
-              :style="{ opacity: item.switch ? '1' : '0.3' }"
+              @click="showFloorHeating"
+              :style="{ opacity: item.switch ? '1' : '1' }"
               :src="lightColorImg"
               alt=""
             />
@@ -162,7 +163,7 @@ export default defineComponent({
       minTempSet: 16,
       maxTempSet: 35,
     };
-    const proxyData = reactive({
+    const proxyData: any = reactive({
       seviceEquipmentList: props.seviceEquipmentList,
       showLight: props.showLight,
       spaceId: props.spaceId,
@@ -177,7 +178,7 @@ export default defineComponent({
       allowSvg: "down_Arrow.svg",
       timeOut: timeOut,
       lightIcon: "arrow-down",
-      showFlag: false,
+      loadMore: false,
       loadingLight: false,
       loading: false,
       initData: initData,
@@ -191,6 +192,38 @@ export default defineComponent({
       part: 1,
       realTemp: 0,
       navType: "all",
+      showFloorHeating(floorHeatingData: any) {
+        let item: any = {
+          id: "Eq1101080259032a7d37c696489f9cd96186bac1e1ae",
+          name: "设备-D07QP",
+          localName: "调光灯",
+          objType: "equipment",
+          majorCategory: "SE",
+          systemCategory: "SELT",
+          equipmentCategory: "SELTLT",
+          equipQRCode: "Eq1101080259032a7d37c696489f9cd96186bac1e1aeQR",
+          projectId: "Pj1101080259",
+          status: 1,
+          lightType: 4,
+          runStatus: 1,
+          colorTemperature: true,
+          brightMinValue: 1,
+          brightMaxValue: 100,
+          bright: true,
+          colorTempMinValue: 1,
+          colorTempMaxValue: 100,
+          brightValue: 50,
+          colorTempValue: 99,
+          type: "lamp",
+          imgOpen: "/sgipad/images/page-officehome/atmLamp_small_open.png",
+          imgClose: "/sgipad/images/page-officehome/atmLamp_small_close.png",
+          switch: true,
+          loading: false,
+          brightValueRate: 50,
+          colorTempValueRate: 99,
+        };
+        contx.emit("showFloorHeating", item);
+      },
       getElePading(ele: any, elePadingKey: any) {
         let style: any = getComputedStyle(ele, null);
         if (style) {
@@ -292,9 +325,9 @@ export default defineComponent({
       },
       // 点击展示所有的登录
       showAll() {
-        proxyData.showFlag = !proxyData.showFlag;
-        console.log("proxyData.showFlag==", proxyData.showFlag);
-        if (proxyData.showFlag) {
+        proxyData.loadMore = !proxyData.loadMore;
+        console.log("proxyData.loadMore==", proxyData.loadMore);
+        if (proxyData.loadMore) {
           proxyData.lightIcon = "arrow-up";
         } else {
           proxyData.lightIcon = "arrow-down";
@@ -688,7 +721,7 @@ export default defineComponent({
           console.log("灯模块的spaceId变化了");
           // 清除原始数据
           proxyData.clearLightStatusTimer();
-          proxyData.showFlag = false;
+          proxyData.loadMore = false;
           proxyData.lampList = [];
           proxyData.spaceId = newProps[1];
           proxyData.getLampList();

+ 5 - 2
src/views/envmonitor/index.vue

@@ -349,7 +349,7 @@
     >
       <div>
         <ChildTempSet
-          :lightData="lightData"
+          :lightData="floorData"
           v-if="isFloorHeatingTemp"
         ></ChildTempSet>
       </div>
@@ -513,6 +513,7 @@ export default defineComponent({
     const workInfo: any = {};
     const userInfo: any = getUserInfo();
     let lightData: any = {};
+    let floorData: any = {};
     let spaceTimer: any = null;
     let listSen: any = [
       {
@@ -852,8 +853,10 @@ export default defineComponent({
         proxyData.isShowContact = true;
       },
       isFloorHeatingTemp: false,
-      showFloorHeating() {
+      floorData: floorData,
+      showFloorHeating(floorData: any) {
         proxyData.isFloorHeatingTemp = true;
+        proxyData.floorData = floorData;
       },
       isLightColorFlag: false,
       lightData: lightData,