|
@@ -16,7 +16,7 @@
|
|
|
@touchmove="gtouchmove()"
|
|
|
@touchend="showDeleteButton"
|
|
|
>
|
|
|
- <!--
|
|
|
+ <!--
|
|
|
<div class="logo-box">
|
|
|
<img class="logo-icon" v-if="logImg" :src="logImg" alt="" />
|
|
|
<img
|
|
@@ -38,9 +38,7 @@
|
|
|
class="weather-icon"
|
|
|
alt=""
|
|
|
/>
|
|
|
- <span
|
|
|
- >{{ outWeather.temperature ? outWeather.temperature : "--" }}℃</span
|
|
|
- >
|
|
|
+ <span>{{ outWeather.temperature ? outWeather.temperature : "--" }}℃</span>
|
|
|
</div>
|
|
|
<div class="weixiin" v-if="contantDetail" @click="showContact">
|
|
|
<img :src="parseImgUrl('ipdImages', 'weixin.svg')" />
|
|
@@ -49,7 +47,7 @@
|
|
|
</div>
|
|
|
<div class="left-space">
|
|
|
<div class="text">
|
|
|
- <div @click.stop="refreshSpace">
|
|
|
+ <div @click.stop="refreshSpace">
|
|
|
{{ officeData.localName }}
|
|
|
</div>
|
|
|
<!-- <div
|
|
@@ -74,8 +72,7 @@
|
|
|
<div class="space-temp">
|
|
|
<img :src="parseImgUrl('ipdImages', 'template-icon.svg')" alt="" />
|
|
|
<span class="temp-text">温度</span>
|
|
|
- <span class="temp-num"
|
|
|
- @click="handleDetail(envlist[3])"
|
|
|
+ <span class="temp-num" @click="handleDetail(envlist[3])"
|
|
|
>{{ officeData.temperature ? officeData.temperature : "--"
|
|
|
}}<sup>℃</sup></span
|
|
|
>
|
|
@@ -118,9 +115,20 @@
|
|
|
>
|
|
|
<img
|
|
|
v-if="item.active"
|
|
|
- :src="index==0?parseImgUrl('ipdImages', 'rectangle1-active.svg'):parseImgUrl('ipdImages', 'rectangle-active.svg')"
|
|
|
+ :src="
|
|
|
+ index == 0
|
|
|
+ ? parseImgUrl('ipdImages', 'rectangle1-active.svg')
|
|
|
+ : parseImgUrl('ipdImages', 'rectangle-active.svg')
|
|
|
+ "
|
|
|
+ />
|
|
|
+ <img
|
|
|
+ :src="
|
|
|
+ index == 0
|
|
|
+ ? parseImgUrl('ipdImages', 'rectangle1.svg')
|
|
|
+ : parseImgUrl('ipdImages', 'rectangle2.svg')
|
|
|
+ "
|
|
|
+ v-else
|
|
|
/>
|
|
|
- <img :src="index==0?parseImgUrl('ipdImages', 'rectangle1.svg'):parseImgUrl('ipdImages', 'rectangle2.svg')" v-else />
|
|
|
|
|
|
<span>{{ item.spaceName }} </span>
|
|
|
</div>
|
|
@@ -190,6 +198,7 @@
|
|
|
:temperature="officeData.temperature"
|
|
|
:spaceId="spaceInfo.spaceId"
|
|
|
:projectId="projectId"
|
|
|
+ :disable="officeData.disable"
|
|
|
:userIsControl="userIsControl"
|
|
|
>
|
|
|
</manual-index>
|
|
@@ -209,6 +218,7 @@
|
|
|
:projectId="projectId"
|
|
|
:isACATVA="isACATVA"
|
|
|
:userIsControl="userIsControl"
|
|
|
+ :disable="officeData.disable"
|
|
|
/>
|
|
|
<!--空调自动控制 end-->
|
|
|
|
|
@@ -308,10 +318,7 @@
|
|
|
class="popup-content"
|
|
|
teleport="#app"
|
|
|
>
|
|
|
- <scenario-dailog
|
|
|
- :secenaroStatus="secenaroStatus"
|
|
|
- @closeDailog="closeDailog"
|
|
|
- >
|
|
|
+ <scenario-dailog :secenaroStatus="secenaroStatus" @closeDailog="closeDailog">
|
|
|
</scenario-dailog>
|
|
|
</van-popup>
|
|
|
<!--环境数据详情-->
|
|
@@ -373,10 +380,7 @@
|
|
|
teleport="#app"
|
|
|
>
|
|
|
<div>
|
|
|
- <ChildTempSet
|
|
|
- :floorData="floorData"
|
|
|
- v-if="isFloorHeatingTemp"
|
|
|
- ></ChildTempSet>
|
|
|
+ <ChildTempSet :floorData="floorData" v-if="isFloorHeatingTemp"></ChildTempSet>
|
|
|
</div>
|
|
|
</van-popup>
|
|
|
|
|
@@ -406,10 +410,7 @@
|
|
|
teleport="#app"
|
|
|
>
|
|
|
<div v-if="isChildAirControl">
|
|
|
- <ChildAirControl
|
|
|
- :airData="airData"
|
|
|
- v-if="isChildAirControl"
|
|
|
- ></ChildAirControl>
|
|
|
+ <ChildAirControl :airData="airData" v-if="isChildAirControl"></ChildAirControl>
|
|
|
</div>
|
|
|
</van-popup>
|
|
|
</div>
|
|
@@ -576,7 +577,7 @@ export default defineComponent({
|
|
|
};
|
|
|
let curtainRef: any = {};
|
|
|
let manualAirRef: any = {};
|
|
|
- let lightRef:any={};
|
|
|
+ let lightRef: any = {};
|
|
|
// let mapRef: any = {}
|
|
|
let intervalTimer: any = null;
|
|
|
const workInfo: any = {};
|
|
@@ -752,7 +753,7 @@ export default defineComponent({
|
|
|
opacityV: 1,
|
|
|
curtainRef: curtainRef,
|
|
|
manualAirRef: manualAirRef,
|
|
|
- lightRef:lightRef,
|
|
|
+ lightRef: lightRef,
|
|
|
hideTopImg: false,
|
|
|
isBottom: false,
|
|
|
isScrool: false,
|
|
@@ -1042,8 +1043,8 @@ export default defineComponent({
|
|
|
});
|
|
|
proxyData.seviceEquipmentList = proxyData.spaceEquipList;
|
|
|
},
|
|
|
- leaveWork(){
|
|
|
- proxyData.manualAirRef && proxyData.manualAirRef.updateCloseSwitchFromWork()
|
|
|
+ leaveWork() {
|
|
|
+ proxyData.manualAirRef && proxyData.manualAirRef.updateCloseSwitchFromWork();
|
|
|
proxyData.lightRef && proxyData.lightRef.updateSwitchFromWork();
|
|
|
},
|
|
|
/**
|
|
@@ -1052,13 +1053,13 @@ export default defineComponent({
|
|
|
closeWork(type: any = "confirm") {
|
|
|
proxyData.isShowWork = false;
|
|
|
proxyData.queryCustomAndScence(2); // 关闭弹窗立即调用刷新加班数据
|
|
|
- if(type == "confirm"){
|
|
|
- let lightRefTimer:any=setTimeout(()=>{
|
|
|
- proxyData.manualAirRef && proxyData.manualAirRef.updateCloseSwitchFromWork()
|
|
|
- proxyData.lightRef && proxyData.lightRef.updateSwitchFromWork();
|
|
|
+ if (type == "confirm") {
|
|
|
+ let lightRefTimer: any = setTimeout(() => {
|
|
|
+ proxyData.manualAirRef && proxyData.manualAirRef.updateCloseSwitchFromWork();
|
|
|
+ proxyData.lightRef && proxyData.lightRef.updateSwitchFromWork();
|
|
|
clearTimeout(lightRefTimer);
|
|
|
- lightRefTimer=null;
|
|
|
- },1000)
|
|
|
+ lightRefTimer = null;
|
|
|
+ }, 1000);
|
|
|
}
|
|
|
},
|
|
|
forceOverTimeFlag: false,
|
|
@@ -1097,16 +1098,18 @@ export default defineComponent({
|
|
|
projectId: store.state.user.projectId,
|
|
|
};
|
|
|
const str: string = setQueryConfig(params);
|
|
|
- getWeather(str).then((res) => {
|
|
|
- const content: any = res?.content ?? {};
|
|
|
- proxyData.outWeather = content;
|
|
|
- const text: string = content.text;
|
|
|
- proxyData.getWeatherIcon(text);
|
|
|
- proxyData.getnowTime(text);
|
|
|
- proxyData.getWeatherTimer();
|
|
|
- }).catch(()=>{
|
|
|
- proxyData.getWeatherTimer(5000);
|
|
|
- });
|
|
|
+ getWeather(str)
|
|
|
+ .then((res) => {
|
|
|
+ const content: any = res?.content ?? {};
|
|
|
+ proxyData.outWeather = content;
|
|
|
+ const text: string = content.text;
|
|
|
+ proxyData.getWeatherIcon(text);
|
|
|
+ proxyData.getnowTime(text);
|
|
|
+ proxyData.getWeatherTimer();
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ proxyData.getWeatherTimer(5000);
|
|
|
+ });
|
|
|
},
|
|
|
// 设置当前背景图
|
|
|
getnowTime(text: string) {
|
|
@@ -1131,10 +1134,7 @@ export default defineComponent({
|
|
|
proxyData.outWeather.imgname = parseImgUrl("weather", "sun.png");
|
|
|
} else if (text && text.indexOf("雨") > -1) {
|
|
|
proxyData.outWeather.imgname = parseImgUrl("weather", "rain.png");
|
|
|
- } else if (
|
|
|
- (text && text.indexOf("阴") > -1) ||
|
|
|
- text.indexOf("云") > -1
|
|
|
- ) {
|
|
|
+ } else if ((text && text.indexOf("阴") > -1) || text.indexOf("云") > -1) {
|
|
|
proxyData.outWeather.imgname = parseImgUrl("weather", "cloudy.png");
|
|
|
} else if (text && text.indexOf("霾") > -1) {
|
|
|
proxyData.outWeather.imgname = parseImgUrl("weather", "mai.png");
|
|
@@ -1143,10 +1143,7 @@ export default defineComponent({
|
|
|
} else if (text && text.indexOf("风") > -1) {
|
|
|
proxyData.outWeather.imgname = parseImgUrl("weather", "wind.png");
|
|
|
} else if (text && text.indexOf("雷") > -1) {
|
|
|
- proxyData.outWeather.imgname = parseImgUrl(
|
|
|
- "weather",
|
|
|
- "thunder.png"
|
|
|
- );
|
|
|
+ proxyData.outWeather.imgname = parseImgUrl("weather", "thunder.png");
|
|
|
} else {
|
|
|
proxyData.outWeather.imgname = parseImgUrl("weather", "sun.png");
|
|
|
}
|
|
@@ -1199,9 +1196,7 @@ export default defineComponent({
|
|
|
let flag: any = false;
|
|
|
// let flag: any = true
|
|
|
for (let i = 0; i < proxyData.userSpaceInfo.length; i++) {
|
|
|
- if (
|
|
|
- proxyData.spaceInfo.spaceId === proxyData.userSpaceInfo[i].sp_id
|
|
|
- ) {
|
|
|
+ if (proxyData.spaceInfo.spaceId === proxyData.userSpaceInfo[i].sp_id) {
|
|
|
flag = true;
|
|
|
break;
|
|
|
}
|
|
@@ -1246,9 +1241,7 @@ export default defineComponent({
|
|
|
if (content[0]) {
|
|
|
proxyData.officeData = content[0];
|
|
|
}
|
|
|
- proxyData.officeData = proxyData.officeData
|
|
|
- ? proxyData.officeData
|
|
|
- : {};
|
|
|
+ proxyData.officeData = proxyData.officeData ? proxyData.officeData : {};
|
|
|
if (proxyData.officeData.localName) {
|
|
|
proxyData.localName = proxyData.officeData.localName;
|
|
|
}
|
|
@@ -1313,26 +1306,22 @@ export default defineComponent({
|
|
|
if (key === "humidity") {
|
|
|
// 湿度
|
|
|
if (text === "干燥" || text === "潮湿") {
|
|
|
- bgColor =
|
|
|
- "linear-gradient(180deg, rgba(205, 11, 0, 0) 0%, #CD0B00 100%)";
|
|
|
+ bgColor = "linear-gradient(180deg, rgba(205, 11, 0, 0) 0%, #CD0B00 100%)";
|
|
|
} else {
|
|
|
bgColor = "";
|
|
|
}
|
|
|
} else if (key === "hcho") {
|
|
|
// 甲醛
|
|
|
if (text === "超标") {
|
|
|
- bgColor =
|
|
|
- "linear-gradient(180deg, rgba(205, 11, 0, 0) 0%, #CD0B00 100%)";
|
|
|
+ bgColor = "linear-gradient(180deg, rgba(205, 11, 0, 0) 0%, #CD0B00 100%)";
|
|
|
} else {
|
|
|
bgColor = "";
|
|
|
}
|
|
|
} else if (key === "co2") {
|
|
|
if (text === "略高") {
|
|
|
- bgColor =
|
|
|
- "linear-gradient(180deg, rgba(205, 11, 0, 0.5) 0%, #CD0B00 100%)";
|
|
|
+ bgColor = "linear-gradient(180deg, rgba(205, 11, 0, 0.5) 0%, #CD0B00 100%)";
|
|
|
} else if (text === "超标") {
|
|
|
- bgColor =
|
|
|
- "linear-gradient(180deg, rgba(205, 11, 0, 1) 0%, #CD0B00 100%)";
|
|
|
+ bgColor = "linear-gradient(180deg, rgba(205, 11, 0, 1) 0%, #CD0B00 100%)";
|
|
|
} else {
|
|
|
bgColor = "";
|
|
|
}
|
|
@@ -1342,17 +1331,13 @@ export default defineComponent({
|
|
|
// "linear-gradient(180deg, rgba(205, 11, 0, 0.2) 0%, #CD0B00 100%)";
|
|
|
bgColor = "";
|
|
|
} else if (text === "轻度污染") {
|
|
|
- bgColor =
|
|
|
- "linear-gradient(180deg, rgba(205, 11, 0, 0.2) 0%, #CD0B00 100%)";
|
|
|
+ bgColor = "linear-gradient(180deg, rgba(205, 11, 0, 0.2) 0%, #CD0B00 100%)";
|
|
|
} else if (text === "中度污染") {
|
|
|
- bgColor =
|
|
|
- "linear-gradient(180deg, rgba(205, 11, 0, 0.5) 0%, #CD0B00 100%)";
|
|
|
+ bgColor = "linear-gradient(180deg, rgba(205, 11, 0, 0.5) 0%, #CD0B00 100%)";
|
|
|
} else if (text === "重度污染") {
|
|
|
- bgColor =
|
|
|
- "linear-gradient(180deg, rgba(205, 11, 0, 0.8) 0%, #CD0B00 100%)";
|
|
|
+ bgColor = "linear-gradient(180deg, rgba(205, 11, 0, 0.8) 0%, #CD0B00 100%)";
|
|
|
} else if (text === "严重污染") {
|
|
|
- bgColor =
|
|
|
- "linear-gradient(180deg, rgba(205, 11, 0, 1) 0%, #CD0B00 100%)";
|
|
|
+ bgColor = "linear-gradient(180deg, rgba(205, 11, 0, 1) 0%, #CD0B00 100%)";
|
|
|
} else {
|
|
|
bgColor = "";
|
|
|
}
|
|
@@ -1599,11 +1584,11 @@ export default defineComponent({
|
|
|
},
|
|
|
equimentsTimer: equimentsTimer,
|
|
|
// 定时查空间下面的展示设备
|
|
|
- setEquimentsTimer(len:any=3600000) {
|
|
|
- proxyData.equimentsTimer = setTimeout(()=>{
|
|
|
+ setEquimentsTimer(len: any = 3600000) {
|
|
|
+ proxyData.equimentsTimer = setTimeout(() => {
|
|
|
proxyData.getEquipments();
|
|
|
proxyData.clearTimeoutValEquiment();
|
|
|
- },len)
|
|
|
+ }, len);
|
|
|
},
|
|
|
// 获取空间下的设备信息
|
|
|
getEquipments() {
|
|
@@ -1886,12 +1871,9 @@ export default defineComponent({
|
|
|
let data: any = paramsData || [];
|
|
|
for (let i = 0; i < data.length; i++) {
|
|
|
let item: any = data[i];
|
|
|
- let spaceCustomContentList: any =
|
|
|
- data[i].spaceCustomContentList || [];
|
|
|
+ let spaceCustomContentList: any = data[i].spaceCustomContentList || [];
|
|
|
if (spaceCustomContentList && spaceCustomContentList.length) {
|
|
|
- spaceCustomContentList = spaceCustomContentList.sort(
|
|
|
- proxyData.compare
|
|
|
- );
|
|
|
+ spaceCustomContentList = spaceCustomContentList.sort(proxyData.compare);
|
|
|
item.spaceCustomContentList = spaceCustomContentList;
|
|
|
let nowTime: any = getRelNowTime();
|
|
|
let nowDate: any = formatDate("YYYY-MM-DD");
|
|
@@ -1909,10 +1891,7 @@ export default defineComponent({
|
|
|
}
|
|
|
for (let j = 0; j < spaceCustomContentList.length; j++) {
|
|
|
if (item.cusStartTime && item.cusEndTime) {
|
|
|
- if (
|
|
|
- item.cusEndTime + 1 ===
|
|
|
- spaceCustomContentList[j].startTime
|
|
|
- ) {
|
|
|
+ if (item.cusEndTime + 1 === spaceCustomContentList[j].startTime) {
|
|
|
item.cusEndTime = spaceCustomContentList[j].endTime;
|
|
|
}
|
|
|
} else {
|
|
@@ -2005,9 +1984,7 @@ export default defineComponent({
|
|
|
// proxyData.spaceInfo = item;
|
|
|
// }
|
|
|
});
|
|
|
- proxyData.copySpaceData = JSON.parse(
|
|
|
- JSON.stringify(proxyData.spaceData)
|
|
|
- );
|
|
|
+ proxyData.copySpaceData = JSON.parse(JSON.stringify(proxyData.spaceData));
|
|
|
});
|
|
|
},
|
|
|
// 重置空间状态
|
|
@@ -2027,7 +2004,7 @@ export default defineComponent({
|
|
|
item.active = false;
|
|
|
});
|
|
|
// proxyData.controlMode = ''; // 模式变成自动的
|
|
|
- proxyData.controlMode='';
|
|
|
+ proxyData.controlMode = "";
|
|
|
proxyData.isWork = false;
|
|
|
proxyData.roomType = "";
|
|
|
proxyData.officeData.temperature = "";
|
|
@@ -2062,19 +2039,19 @@ export default defineComponent({
|
|
|
proxyData.spaceData[index2] = temp;
|
|
|
}
|
|
|
},
|
|
|
- refreshSpace(){
|
|
|
+ refreshSpace() {
|
|
|
console.log("被点击了--");
|
|
|
- let space:any={}
|
|
|
- proxyData.spaceData.map((item:any)=>{
|
|
|
- if(item.spaceId===proxyData.spaceInfo.spaceId){
|
|
|
- space=item
|
|
|
+ let space: any = {};
|
|
|
+ proxyData.spaceData.map((item: any) => {
|
|
|
+ if (item.spaceId === proxyData.spaceInfo.spaceId) {
|
|
|
+ space = item;
|
|
|
}
|
|
|
- })
|
|
|
- proxyData.changeSpace(space,2);
|
|
|
+ });
|
|
|
+ proxyData.changeSpace(space, 2);
|
|
|
},
|
|
|
// 切换空间
|
|
|
changeSpace(item: any, type: any = 0) {
|
|
|
- if( proxyData.spaceInfo.spaceId==item.spaceId && type!==2){
|
|
|
+ if (proxyData.spaceInfo.spaceId == item.spaceId && type !== 2) {
|
|
|
return;
|
|
|
}
|
|
|
//清除空间下所有的定时器
|
|
@@ -2208,11 +2185,7 @@ export default defineComponent({
|
|
|
box-sizing: border-box;
|
|
|
padding: 3.5vh 25px 0 25px;
|
|
|
font-size: 0;
|
|
|
- background-image: linear-gradient(
|
|
|
- 0deg,
|
|
|
- rgba(69, 33, 0, 0.2),
|
|
|
- rgba(69, 33, 0, 0.2)
|
|
|
- );
|
|
|
+ background-image: linear-gradient(0deg, rgba(69, 33, 0, 0.2), rgba(69, 33, 0, 0.2));
|
|
|
background-size: 100% 100%;
|
|
|
overflow: hidden;
|
|
|
|
|
@@ -2617,4 +2590,3 @@ export default defineComponent({
|
|
|
background: $elBg;
|
|
|
}
|
|
|
</style>
|
|
|
-
|