|
@@ -644,11 +644,17 @@ export default defineComponent({
|
|
|
let isExeSpaceTime: Boolean = proxyData.checkDeviceIsExeSpaceTime([
|
|
|
childItem,
|
|
|
]);
|
|
|
- if (proxyData.forceOverTimeFlag && domAirOpen && isExeSpaceTime) {
|
|
|
+ if (
|
|
|
+ proxyData.forceOverTimeFlag &&
|
|
|
+ domAirOpen &&
|
|
|
+ isExeSpaceTime &&
|
|
|
+ btnType == "switch"
|
|
|
+ ) {
|
|
|
//需要强制加班
|
|
|
contx.emit("triggerWork", 2, childItem);
|
|
|
return;
|
|
|
}
|
|
|
+ // 空调没有开的时候不让调温度和风量
|
|
|
if (!childItem.isOpen && btnType !== "switch") {
|
|
|
return;
|
|
|
}
|
|
@@ -855,6 +861,9 @@ export default defineComponent({
|
|
|
|
|
|
let modelArr: any = ["制冷", "制热", "通风"];
|
|
|
item.modelArr = modelArr;
|
|
|
+ if (item.workMode > 3) {
|
|
|
+ item.workMode = 1;
|
|
|
+ }
|
|
|
let mIndex: any = item.workMode ? item.workMode - 1 : 2;
|
|
|
item.mIndex = mIndex;
|
|
|
|