|
@@ -93,7 +93,7 @@
|
|
</div>
|
|
</div>
|
|
<img
|
|
<img
|
|
@click="showFloorHeating(item)"
|
|
@click="showFloorHeating(item)"
|
|
- :style="{ opacity: item.switch ? '1' : '0.3' }"
|
|
|
|
|
|
+ :class="item.switch ? '' : 'img-disabled'"
|
|
:src="lightColorImg"
|
|
:src="lightColorImg"
|
|
alt=""
|
|
alt=""
|
|
/>
|
|
/>
|
|
@@ -125,7 +125,7 @@ import {
|
|
setallLampHttp,
|
|
setallLampHttp,
|
|
setSpaceCondtioners,
|
|
setSpaceCondtioners,
|
|
} from "@/apis/envmonitor";
|
|
} from "@/apis/envmonitor";
|
|
-import { parseImgUrl, setQueryConfig } from "@/utils";
|
|
|
|
|
|
+import { getRelNowTime, parseImgUrl, setQueryConfig } from "@/utils";
|
|
import { type } from "os";
|
|
import { type } from "os";
|
|
import { onDeactivated } from "vue";
|
|
import { onDeactivated } from "vue";
|
|
import { AnyMxRecord } from "dns";
|
|
import { AnyMxRecord } from "dns";
|
|
@@ -142,6 +142,10 @@ export default defineComponent({
|
|
type: String,
|
|
type: String,
|
|
default: () => "",
|
|
default: () => "",
|
|
},
|
|
},
|
|
|
|
+ showFloorBox: {
|
|
|
|
+ type: Boolean,
|
|
|
|
+ default: () => false,
|
|
|
|
+ },
|
|
userIsControl: {
|
|
userIsControl: {
|
|
type: Boolean,
|
|
type: Boolean,
|
|
default: () => false,
|
|
default: () => false,
|
|
@@ -163,12 +167,14 @@ export default defineComponent({
|
|
let floorHeathingStatus: any = null;
|
|
let floorHeathingStatus: any = null;
|
|
const timeOut: any = null;
|
|
const timeOut: any = null;
|
|
const proxyData = reactive({
|
|
const proxyData = reactive({
|
|
|
|
+ distroyFlag: false,
|
|
seviceEquipmentList: props.seviceEquipmentList,
|
|
seviceEquipmentList: props.seviceEquipmentList,
|
|
forceOverTimeFlag: props.forceOverTimeFlag,
|
|
forceOverTimeFlag: props.forceOverTimeFlag,
|
|
spaceId: props.spaceId,
|
|
spaceId: props.spaceId,
|
|
heatingData: heatingData,
|
|
heatingData: heatingData,
|
|
isOpen: false,
|
|
isOpen: false,
|
|
parseImgUrl: parseImgUrl,
|
|
parseImgUrl: parseImgUrl,
|
|
|
|
+ showFloorBox: props.showFloorBox,
|
|
timeOut: timeOut,
|
|
timeOut: timeOut,
|
|
loadingFlag: false,
|
|
loadingFlag: false,
|
|
floorHeatingList: floorHeatingList,
|
|
floorHeatingList: floorHeatingList,
|
|
@@ -442,9 +448,15 @@ export default defineComponent({
|
|
},
|
|
},
|
|
// 定时刷新接口
|
|
// 定时刷新接口
|
|
startfloorHeathingStatus(timerLen: any = 15000) {
|
|
startfloorHeathingStatus(timerLen: any = 15000) {
|
|
|
|
+ let nowTime: any = getRelNowTime();
|
|
|
|
+ if (timerLen == 15000 && nowTime < "070000" && nowTime > "200000") {
|
|
|
|
+ timerLen = 300000;
|
|
|
|
+ }
|
|
proxyData.clearFloorHeathingTimer();
|
|
proxyData.clearFloorHeathingTimer();
|
|
proxyData.floorHeathingStatus = setTimeout(() => {
|
|
proxyData.floorHeathingStatus = setTimeout(() => {
|
|
- proxyData.getFloorHeatingList();
|
|
|
|
|
|
+ if (!proxyData.distroyFlag) {
|
|
|
|
+ proxyData.getFloorHeatingList();
|
|
|
|
+ }
|
|
}, timerLen);
|
|
}, timerLen);
|
|
},
|
|
},
|
|
});
|
|
});
|
|
@@ -454,11 +466,13 @@ export default defineComponent({
|
|
if (newProps[0]) {
|
|
if (newProps[0]) {
|
|
proxyData.forceOverTimeFlag = newProps[0].forceOverTimeFlag;
|
|
proxyData.forceOverTimeFlag = newProps[0].forceOverTimeFlag;
|
|
proxyData.seviceEquipmentList = newProps[0].seviceEquipmentList;
|
|
proxyData.seviceEquipmentList = newProps[0].seviceEquipmentList;
|
|
|
|
+ proxyData.showFloorBox = newProps[0].showFloorBox;
|
|
}
|
|
}
|
|
|
|
|
|
if (newProps[1] && oldProps[1] && newProps[1] != oldProps[1]) {
|
|
if (newProps[1] && oldProps[1] && newProps[1] != oldProps[1]) {
|
|
// 空间id改变的重新获取值调用接口
|
|
// 空间id改变的重新获取值调用接口
|
|
console.log("地暖的spaceId变化了");
|
|
console.log("地暖的spaceId变化了");
|
|
|
|
+ proxyData.distroyFlag = false;
|
|
// 清除原始数据
|
|
// 清除原始数据
|
|
proxyData.floorHeatingList = [];
|
|
proxyData.floorHeatingList = [];
|
|
proxyData.heatingData = {};
|
|
proxyData.heatingData = {};
|
|
@@ -476,11 +490,13 @@ export default defineComponent({
|
|
);
|
|
);
|
|
onBeforeUnmount(() => {
|
|
onBeforeUnmount(() => {
|
|
console.log("灯的组件销毁了--");
|
|
console.log("灯的组件销毁了--");
|
|
|
|
+ proxyData.distroyFlag = true;
|
|
proxyData.clearFloorHeathingTimer();
|
|
proxyData.clearFloorHeathingTimer();
|
|
});
|
|
});
|
|
|
|
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
// proxyData.clearFloorHeathingTimer();
|
|
// proxyData.clearFloorHeathingTimer();
|
|
|
|
+ proxyData.distroyFlag = false;
|
|
proxyData.getFloorHeatingList();
|
|
proxyData.getFloorHeatingList();
|
|
});
|
|
});
|
|
return {
|
|
return {
|
|
@@ -588,10 +604,11 @@ export default defineComponent({
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
padding: 8px 20px;
|
|
padding: 8px 20px;
|
|
|
|
+ // margin-bottom: 16px;
|
|
padding-bottom: 16px;
|
|
padding-bottom: 16px;
|
|
.top-nav {
|
|
.top-nav {
|
|
height: 28px;
|
|
height: 28px;
|
|
- line-height: 28px;
|
|
|
|
|
|
+ // line-height: 28px;
|
|
border-radius: 21px;
|
|
border-radius: 21px;
|
|
background: #f1f4f6;
|
|
background: #f1f4f6;
|
|
span {
|
|
span {
|
|
@@ -601,9 +618,10 @@ export default defineComponent({
|
|
font-style: normal;
|
|
font-style: normal;
|
|
font-weight: 400;
|
|
font-weight: 400;
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
- padding: 5px 8px;
|
|
|
|
|
|
+ // padding: 5px 8px;
|
|
|
|
+ padding: 0px 8px;
|
|
height: 28px;
|
|
height: 28px;
|
|
- line-height: 14px;
|
|
|
|
|
|
+ line-height: 28px;
|
|
color: #424c59;
|
|
color: #424c59;
|
|
}
|
|
}
|
|
.nav-active {
|
|
.nav-active {
|
|
@@ -980,6 +998,10 @@ export default defineComponent({
|
|
height: 20px;
|
|
height: 20px;
|
|
cursor: pointer;
|
|
cursor: pointer;
|
|
}
|
|
}
|
|
|
|
+ .img-disabled {
|
|
|
|
+ opacity: 0.3;
|
|
|
|
+ cursor: no-drop;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</style>
|
|
</style>
|