|
@@ -146,6 +146,7 @@
|
|
|
v-if="roomType === '开放' && isWork && controlMode !== 1"
|
|
|
:scenarioArr="scenarioArr"
|
|
|
:workkArr="workkArr"
|
|
|
+ @closeWork="closeWork"
|
|
|
@triggerWork="triggerWork"
|
|
|
@setForceOverTimeFlag="setForceOverTimeFlag"
|
|
|
></work-config>
|
|
@@ -155,6 +156,7 @@
|
|
|
v-if="roomType === '开放' && isWork && controlMode === 1"
|
|
|
:scenarioArr="scenarioArr"
|
|
|
:workkArr="workkArr"
|
|
|
+ @closeWork="closeWork"
|
|
|
@triggerWork="triggerWork"
|
|
|
@setForceOverTimeFlag="setForceOverTimeFlag"
|
|
|
></manual-config>
|
|
@@ -1554,6 +1556,7 @@ export default defineComponent({
|
|
|
// 手动控制的情况下走新的服务定制
|
|
|
if (proxyData.controlMode === 1) {
|
|
|
proxyData.formateManualWorkTime();
|
|
|
+ proxyData.checkDeviceShowWork()
|
|
|
}
|
|
|
proxyData.queryCustomAndScenceTimer();
|
|
|
})
|