|
@@ -143,7 +143,7 @@
|
|
|
>
|
|
|
<!--自动控制的加班 start-->
|
|
|
<WorkConfig
|
|
|
- v-if="roomType === '开放' && isWork && controlMode !== 1"
|
|
|
+ v-if="roomType === '开放' && isWork && controlMode ==0"
|
|
|
key="workCkey"
|
|
|
:workkArr="workkArr"
|
|
|
@closeWork="closeWork"
|
|
@@ -152,7 +152,7 @@
|
|
|
></WorkConfig>
|
|
|
|
|
|
<!--手动控制的加班 start-->
|
|
|
- <template v-if="roomType === '开放' && isWork && controlMode === 1">
|
|
|
+ <template v-if="roomType === '开放' && isWork && controlMode == 1">
|
|
|
<ManualConfig
|
|
|
key="manualckey"
|
|
|
:workkArr="workkArr"
|
|
@@ -190,7 +190,7 @@
|
|
|
<!--空调手动控制 end-->
|
|
|
<!--空调自动控制 start-->
|
|
|
<Air
|
|
|
- v-if="controlMode != 1 && spaceExistenceDevice.airConditioner"
|
|
|
+ v-if="controlMode == 0 && spaceExistenceDevice.airConditioner"
|
|
|
id="airId"
|
|
|
key="airKey"
|
|
|
@triggerWork="triggerWork"
|
|
@@ -205,6 +205,7 @@
|
|
|
:userIsControl="userIsControl"
|
|
|
/>
|
|
|
<!--空调自动控制 end-->
|
|
|
+ <!--出于性能的灯的显示和隐藏最好放在子组件里面判断,减少组件频繁重新加载的问题-->
|
|
|
<Light
|
|
|
v-if="spaceInfo.spaceId"
|
|
|
:showLight="spaceExistenceDevice.light"
|
|
@@ -236,7 +237,7 @@
|
|
|
teleport="#app"
|
|
|
>
|
|
|
<work-overtime
|
|
|
- v-if="isShowWork && controlMode !== 1"
|
|
|
+ v-if="isShowWork && controlMode ==0"
|
|
|
:spaceInfo="spaceInfo"
|
|
|
@closeWork="closeWork"
|
|
|
:projectId="projectId"
|
|
@@ -245,7 +246,7 @@
|
|
|
|
|
|
<!--加班手动控制 start-->
|
|
|
<manual-overtime
|
|
|
- v-if="isShowWork && controlMode === 1"
|
|
|
+ v-if="isShowWork && controlMode == 1"
|
|
|
:seviceEquipmentList="seviceEquipmentList"
|
|
|
:enterType="enterType"
|
|
|
:deviceItem="deviceItem"
|
|
@@ -610,7 +611,7 @@ export default defineComponent({
|
|
|
let nowDate: any = formatDate("YYYY.MM.DD HH:mm");
|
|
|
let nowWeek: any = getNowWeek();
|
|
|
let padImgData: any = [];
|
|
|
- let controlMode: number = 0;
|
|
|
+ let controlMode: any = 0;
|
|
|
let deviceItem: any = null;
|
|
|
let allDevice: any = [];
|
|
|
let spaceEquipList: any = [];
|
|
@@ -1104,7 +1105,7 @@ export default defineComponent({
|
|
|
proxyData.officeData.temperature.toFixed(1) * 1;
|
|
|
}
|
|
|
// proxyData.controlMode = proxyData.officeData.controlMode || 1;
|
|
|
- proxyData.controlMode = proxyData.officeData.controlMode;
|
|
|
+ proxyData.controlMode = proxyData.officeData.controlMode || 0;
|
|
|
// 环境数据
|
|
|
proxyData.checkSpaceType(proxyData.officeData.roomFuncType);
|
|
|
proxyData.formatSpaceInfo(content);
|
|
@@ -1837,7 +1838,8 @@ export default defineComponent({
|
|
|
proxyData.spaceData.map((item: any) => {
|
|
|
item.active = false;
|
|
|
});
|
|
|
- proxyData.controlMode = 0; // 模式变成自动的
|
|
|
+ // proxyData.controlMode = ''; // 模式变成自动的
|
|
|
+ // proxyData.controlMode='';
|
|
|
proxyData.isWork = false;
|
|
|
proxyData.roomType = "";
|
|
|
proxyData.officeData.temperature = "";
|