|
@@ -2,7 +2,7 @@
|
|
|
<div
|
|
|
class="main"
|
|
|
:style="{
|
|
|
- 'backgroundImage':
|
|
|
+ backgroundImage:
|
|
|
'linear-gradient(0deg, rgba(69, 33, 0, 0.2), rgba(69, 33, 0, 0.2)), url(' +
|
|
|
padBgImg +
|
|
|
')',
|
|
@@ -69,7 +69,7 @@
|
|
|
<div class="space-temp">
|
|
|
<img :src="parseImgUrl('ipdImages', 'template-icon.svg')" alt="" />
|
|
|
<span class="temp-text">温度</span>
|
|
|
- <span class="temp-num"
|
|
|
+ <span class="temp-num" v-if="officeData.temperature"
|
|
|
>{{ officeData.temperature }}<sup>℃</sup></span
|
|
|
>
|
|
|
</div>
|
|
@@ -792,20 +792,6 @@ export default defineComponent({
|
|
|
proxyData.forceOverTimeFlag = false;
|
|
|
}
|
|
|
},
|
|
|
- // /**
|
|
|
- // * 修改空间id
|
|
|
- // * @param spaceId
|
|
|
- // */
|
|
|
- // changeSpaceId(spaceId: any) {
|
|
|
- // proxyData.loadingStart();
|
|
|
- // proxyData.spaceInfo.spaceId = spaceId;
|
|
|
- // proxyData.headerInfo.headScene = "";
|
|
|
- // // 切换空间的时候先清除定时器
|
|
|
- // proxyData.clearTimerSpaceInfo();
|
|
|
- // // proxyData.init();
|
|
|
- // // 判断用户是否有可控制权限
|
|
|
- // proxyData.checkUserSpace();
|
|
|
- // },
|
|
|
// 获取公司信息
|
|
|
async getCompanyInfo() {
|
|
|
const res: any = await getCompanyInfo({ companyId: Keys.companyKey });
|
|
@@ -960,7 +946,12 @@ export default defineComponent({
|
|
|
getSpaceInfo(data)
|
|
|
.then((res) => {
|
|
|
const content: any = res?.content ?? [];
|
|
|
- proxyData.officeData = content[0] ? content[0] : {};
|
|
|
+ if (content[0]) {
|
|
|
+ proxyData.officeData = content[0];
|
|
|
+ }
|
|
|
+ proxyData.officeData = proxyData.officeData
|
|
|
+ ? proxyData.officeData
|
|
|
+ : {};
|
|
|
if (proxyData.officeData.localName) {
|
|
|
proxyData.localName = proxyData.officeData.localName;
|
|
|
}
|
|
@@ -969,7 +960,6 @@ export default defineComponent({
|
|
|
proxyData.officeData.temperature.toFixed(1) * 1;
|
|
|
}
|
|
|
// 环境数据
|
|
|
-
|
|
|
proxyData.checkSpaceType(proxyData.officeData.roomFuncType);
|
|
|
proxyData.formatSpaceInfo(content);
|
|
|
proxyData.getPadImg();
|
|
@@ -1556,10 +1546,8 @@ export default defineComponent({
|
|
|
},
|
|
|
// 清除定时器
|
|
|
clearTimerSpaceInfo() {
|
|
|
- if (proxyData.spaceTimer) {
|
|
|
- clearTimeout(proxyData.spaceTimer);
|
|
|
- proxyData.spaceTimer = null;
|
|
|
- }
|
|
|
+ clearTimeout(proxyData.spaceTimer);
|
|
|
+ proxyData.spaceTimer = null;
|
|
|
},
|
|
|
// 定时调空间
|
|
|
timerSpaceInfo(timer: any = 5000) {
|
|
@@ -1870,6 +1858,16 @@ export default defineComponent({
|
|
|
white-space: nowrap;
|
|
|
text-overflow: ellipsis;
|
|
|
-o-text-overflow: ellipsis;
|
|
|
+ .left-time {
|
|
|
+ span {
|
|
|
+ font-family: "Montserrat";
|
|
|
+ font-style: normal;
|
|
|
+ font-weight: 400;
|
|
|
+ font-size: 16px;
|
|
|
+ line-height: 20px;
|
|
|
+ color: #ffffff;
|
|
|
+ }
|
|
|
+ }
|
|
|
.logo-icon {
|
|
|
display: inline-block;
|
|
|
vertical-align: middle;
|
|
@@ -1877,17 +1875,6 @@ export default defineComponent({
|
|
|
height: 20px;
|
|
|
margin-right: 5px;
|
|
|
}
|
|
|
- .weather-icon {
|
|
|
- width: 24px;
|
|
|
- height: 24px;
|
|
|
- margin-right: 10px;
|
|
|
- display: inline-block;
|
|
|
- vertical-align: middle;
|
|
|
- }
|
|
|
- span {
|
|
|
- display: inline-block;
|
|
|
- vertical-align: middle;
|
|
|
- }
|
|
|
div {
|
|
|
vertical-align: middle;
|
|
|
display: inline-block;
|
|
@@ -1907,9 +1894,28 @@ export default defineComponent({
|
|
|
}
|
|
|
.weather {
|
|
|
padding-left: 22px;
|
|
|
+ line-height: 24px;
|
|
|
+ // font-size: 0;
|
|
|
+ // padding-right: 5px;
|
|
|
+ .weather-icon {
|
|
|
+ width: 24px;
|
|
|
+ height: 24px;
|
|
|
+ margin-right: 10px;
|
|
|
+ display: inline-block;
|
|
|
+ vertical-align: middle;
|
|
|
+ }
|
|
|
+ span {
|
|
|
+ display: inline-block;
|
|
|
+ vertical-align: middle;
|
|
|
+ font-family: "Montserrat";
|
|
|
+ font-style: normal;
|
|
|
+ font-weight: 400;
|
|
|
+ font-size: 16px;
|
|
|
+ padding-top: 2px;
|
|
|
+ }
|
|
|
}
|
|
|
.weixiin {
|
|
|
- margin-left: 10px;
|
|
|
+ margin-left: 20px;
|
|
|
img {
|
|
|
margin-right: 5px;
|
|
|
width: 24px;
|