|
@@ -135,13 +135,13 @@
|
|
|
<div
|
|
|
class="work-btn"
|
|
|
v-if="
|
|
|
- (roomType === '开放' && isWork) ||
|
|
|
+ (roomType === '开放' && isWork && controlMode !== 1) ||
|
|
|
(roomType === '会议室' && scenarioArr && scenarioArr.length)
|
|
|
"
|
|
|
>
|
|
|
<!-- {{roomType}} -->
|
|
|
<work-config
|
|
|
- v-if="roomType === '开放' && isWork"
|
|
|
+ v-if="roomType === '开放' && isWork && controlMode !== 1"
|
|
|
:scenarioArr="scenarioArr"
|
|
|
:workkArr="workkArr"
|
|
|
@triggerWork="triggerWork"
|
|
@@ -157,8 +157,27 @@
|
|
|
></scenario-config>
|
|
|
</div>
|
|
|
<!--加班end-->
|
|
|
+ <!--空调手动控制 start-->
|
|
|
+ <manual-index
|
|
|
+ v-if="controlMode === 1"
|
|
|
+ @triggerWork="triggerWork"
|
|
|
+ :forceOverTimeFlag="forceOverTimeFlag"
|
|
|
+ @updateAirTemp="updateAirTemp"
|
|
|
+ :hasAir="spaceExistenceDevice.airConditioner"
|
|
|
+ :airVolumes="officeData.airVolumes"
|
|
|
+ :temperature="officeData.temperature"
|
|
|
+ :spaceId="spaceInfo.spaceId"
|
|
|
+ :projectId="projectId"
|
|
|
+ :userIsControl="userIsControl"
|
|
|
+ >
|
|
|
+ </manual-index>
|
|
|
+ <!--空调手动控制 end-->
|
|
|
+ <!--空调自动控制 start-->
|
|
|
<Air
|
|
|
- v-if="officeData.temperature || spaceExistenceDevice.airConditioner"
|
|
|
+ v-if="
|
|
|
+ controlMode != 1 &&
|
|
|
+ (officeData.temperature || spaceExistenceDevice.airConditioner)
|
|
|
+ "
|
|
|
id="airId"
|
|
|
key="airId"
|
|
|
@triggerWork="triggerWork"
|
|
@@ -172,6 +191,7 @@
|
|
|
:isACATVA="isACATVA"
|
|
|
:userIsControl="userIsControl"
|
|
|
/>
|
|
|
+ <!--空调自动控制 end-->
|
|
|
<Light
|
|
|
v-if="spaceExistenceDevice.light"
|
|
|
:forceOverTimeFlag="forceOverTimeFlag"
|
|
@@ -277,9 +297,10 @@ import MapBox from "@/views/envmonitor/components/Map/MapBox.vue";
|
|
|
import Header from "@/components/header/Index.vue";
|
|
|
import Comheader from "@/components/header/Comheader.vue";
|
|
|
import Scenario from "@/views/envmonitor/components/Scenario/Scenario.vue";
|
|
|
-import Air from "@/views/envmonitor/components/Air.vue";
|
|
|
-import Light from "@/views/envmonitor/components/Light.vue";
|
|
|
-import Curtain from "@/views/envmonitor/components/Curtain.vue";
|
|
|
+import Air from "@/views/envmonitor/components/Air/index.vue";
|
|
|
+import ManualIndex from "@/views/envmonitor/components/Air/manualIndex.vue";
|
|
|
+import Light from "@/views/envmonitor/components/Light/index.vue";
|
|
|
+import Curtain from "@/views/envmonitor/components/Curtain/index.vue";
|
|
|
import TimeBox from "@/views/envmonitor/TimeBox.vue";
|
|
|
import NavBar from "@/views/envmonitor/NavBar.vue";
|
|
|
import ScenarioDailog from "@/views/envmonitor/components/Scenario/scenarioDailog.vue";
|
|
@@ -328,6 +349,7 @@ export default defineComponent({
|
|
|
Comheader,
|
|
|
NavBar,
|
|
|
Air,
|
|
|
+ ManualIndex,
|
|
|
Light,
|
|
|
Curtain,
|
|
|
TimeBox,
|
|
@@ -519,6 +541,7 @@ export default defineComponent({
|
|
|
let nowDate: any = formatDate("YYYY.MM.DD HH:mm");
|
|
|
let nowWeek: any = getNowWeek();
|
|
|
let padImgData: any = [];
|
|
|
+ let controlMode: number = 0;
|
|
|
const proxyData = reactive({
|
|
|
parseImgUrl: parseImgUrl,
|
|
|
fileUrl: proxyGlobal.proxy.$fileUrl,
|
|
@@ -540,7 +563,6 @@ export default defineComponent({
|
|
|
mapOpacity: 0,
|
|
|
opacityV: 1,
|
|
|
childRef: childRef,
|
|
|
- // mapRef: mapRef,
|
|
|
hideTopImg: false,
|
|
|
isBottom: false,
|
|
|
isScrool: false,
|
|
@@ -937,6 +959,7 @@ export default defineComponent({
|
|
|
proxyData.checkUserSpace();
|
|
|
});
|
|
|
},
|
|
|
+ controlMode: controlMode, // 当前空间的模式 0:自动控制 1:手动控制
|
|
|
// 获取空间信息
|
|
|
getSpaceInfo() {
|
|
|
// const userInfo =
|
|
@@ -964,6 +987,7 @@ export default defineComponent({
|
|
|
proxyData.officeData.temperature =
|
|
|
proxyData.officeData.temperature.toFixed(1) * 1;
|
|
|
}
|
|
|
+ proxyData.controlMode = proxyData.officeData.controlMode || 1;
|
|
|
// 环境数据
|
|
|
proxyData.checkSpaceType(proxyData.officeData.roomFuncType);
|
|
|
proxyData.formatSpaceInfo(content);
|