|
@@ -1568,16 +1568,15 @@ export default defineComponent({
|
|
|
queryCustomAndScence(str)
|
|
|
.then((res) => {
|
|
|
let resData: any = res?.data ?? [];
|
|
|
- // 手动控制的情况下走新的服务定制
|
|
|
- proxyData.workkArr = resData;
|
|
|
- for (let i = 0; i < proxyData.workkArr.length; i++) {
|
|
|
- let customSceneList: any =
|
|
|
- proxyData.workkArr[i]?.customSceneList ?? [];
|
|
|
+
|
|
|
+ for (let i = 0; i < resData.length; i++) {
|
|
|
+ let customSceneList: any = resData[i]?.customSceneList ?? [];
|
|
|
customSceneList = customSceneList.sort(proxyData.compare);
|
|
|
}
|
|
|
- if (proxyData.controlMode == 1) {
|
|
|
- proxyData.formateManualWorkTime();
|
|
|
- }
|
|
|
+ // 手动控制的情况下走新的服务定制
|
|
|
+ proxyData.workkArr = resData;
|
|
|
+ proxyData.formateManualWorkTime();
|
|
|
+
|
|
|
proxyData.queryCustomAndScenceTimer();
|
|
|
})
|
|
|
.catch(() => {
|
|
@@ -1742,6 +1741,7 @@ export default defineComponent({
|
|
|
proxyData.roomType = "";
|
|
|
proxyData.officeData.temperature = "";
|
|
|
proxyData.spaceExistenceDevice = spaceExistenceDevice;
|
|
|
+ proxyData.workkArr = [];
|
|
|
// 切换空间的时候把加班按钮平板
|
|
|
proxyData.setForceOverTimeFlag(false);
|
|
|
},
|