|
@@ -13,23 +13,6 @@
|
|
|
name="arrow-left"
|
|
|
/>
|
|
|
</div>
|
|
|
- <div
|
|
|
- class="office-title"
|
|
|
- v-show="!moveToBottom&&realScrollTop<30"
|
|
|
- >
|
|
|
- <image
|
|
|
- class="weather-img"
|
|
|
- :src="h5StaticPath+outWeather.imgname"
|
|
|
- mode="widthFix"
|
|
|
- />
|
|
|
- <div class="weather-text">
|
|
|
- <div class="first-line"><span class="text">{{outWeather.temperature ? outWeather.temperature :'--'}}℃</span><span class="text">/</span><span class="text">PM2.5</span><span>{{outWeather.pm25 ? outWeather.pm25 :'--'}}</span>
|
|
|
- </div>
|
|
|
- <div class="second-line">
|
|
|
- <span class="text weatherText">{{outWeather.text ? outWeather.text :'--'}}</span><span>{{outWeather.quality ? outWeather.quality :'--'}}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
</page-top-bar-custom>
|
|
|
<scroll-view
|
|
|
id="scroll-view"
|
|
@@ -667,7 +650,6 @@ import { mapState, mapActions } from '@wepy/x'
|
|
|
import moment from 'moment'
|
|
|
import {
|
|
|
getSpaceAdjustList,
|
|
|
- getWeather,
|
|
|
getEquipmentListHttp,
|
|
|
getMeetingSceneHttp,
|
|
|
switchoverSceneHttp,
|
|
@@ -803,12 +785,7 @@ wepy.page({
|
|
|
lampHide: false, // 灯列表收起
|
|
|
topbgimg: null, // 头部背景
|
|
|
navFixed: false, // 滑动置顶
|
|
|
- outWeather: {
|
|
|
- temperature: '',
|
|
|
- pm25: '',
|
|
|
- quality: '',
|
|
|
- text: ''
|
|
|
- }, // 室外空气
|
|
|
+
|
|
|
showWorkOff: false, // 开放办公室的 提前关闭是否展示
|
|
|
nextCusStartTime: null, // 第二天服务定制开始时间
|
|
|
cusStartTime: null, // 当天服务定制-开始时间
|
|
@@ -1565,19 +1542,7 @@ wepy.page({
|
|
|
await this.getWorkDayTime() // 工作组时间
|
|
|
this.getEquipments() // 空间下的设备
|
|
|
this.checkEquipmentConfigStatus()
|
|
|
- this.getWeatherInfo() // 天气预报
|
|
|
},
|
|
|
-
|
|
|
- // setDefaultSpaceId(id) {
|
|
|
- // let companyId = id
|
|
|
- // getCompanyMapData(companyId).then(res => {
|
|
|
- // let CompanyMapData = JSON.parse(res.data)
|
|
|
- // this.floorInfo = CompanyMapData.floorInfo
|
|
|
- // this.selectedFloor = CompanyMapData.floorInfo[0].floorId
|
|
|
- // defalutSelectedId = CompanyMapData.defalutSelectedId
|
|
|
- // })
|
|
|
- // },
|
|
|
-
|
|
|
getEquipments() {
|
|
|
// 获取空间下设备
|
|
|
const params = {
|
|
@@ -1642,34 +1607,9 @@ wepy.page({
|
|
|
spaceInfoStatusTimer = clearInterval(spaceInfoStatusTimer)
|
|
|
spaceInfoStatusTimer = setInterval(() => {
|
|
|
this.getSpaceInfo() // 空间信息
|
|
|
- // this.getWeatherInfo() ;// 天气预报
|
|
|
}, 20 * 1000) // 2秒描刷接口
|
|
|
},
|
|
|
|
|
|
- getWeatherInfo() {
|
|
|
- getWeather().then(res => {
|
|
|
- this.outWeather = res.content ? res.content : {}
|
|
|
- var text = this.outWeather.text || ''
|
|
|
- var imgname = 'sun.png'
|
|
|
- this.getnowTime(text) // 头部背景
|
|
|
- if (text.indexOf('晴') > -1) {
|
|
|
- imgname = 'sun.png'
|
|
|
- } else if (text.indexOf('雨') > -1) {
|
|
|
- imgname = 'rain.png'
|
|
|
- } else if (text.indexOf('阴') > -1 || text.indexOf('云') > -1) {
|
|
|
- imgname = 'cloudy.png'
|
|
|
- } else if (text.indexOf('霾') > -1) {
|
|
|
- imgname = 'mai.png'
|
|
|
- } else if (text.indexOf('雾') > -1) {
|
|
|
- imgname = 'fog.png'
|
|
|
- } else if (text.indexOf('风') > -1) {
|
|
|
- imgname = 'wind.png'
|
|
|
- } else if (text.indexOf('雷') > -1) {
|
|
|
- imgname = 'thunder.png'
|
|
|
- }
|
|
|
- this.outWeather.imgname = imgname
|
|
|
- })
|
|
|
- },
|
|
|
mapChangeSpaceInfo(spaceId) {
|
|
|
this.options.spaceId = spaceId
|
|
|
this.getData()
|
|
@@ -2559,45 +2499,6 @@ page {
|
|
|
border-radius: 32px;
|
|
|
margin-left: 10px;
|
|
|
}
|
|
|
-.office-title {
|
|
|
- position: absolute;
|
|
|
- left: 52px;
|
|
|
- right: 95px;
|
|
|
- bottom: 0;
|
|
|
- padding-left: 18px;
|
|
|
- box-sizing: border-box;
|
|
|
- z-index: 1;
|
|
|
- display: flex;
|
|
|
- // justify-content: center ;
|
|
|
- // align-items: center ;
|
|
|
- line-height: 1;
|
|
|
- font-family: PingFang SC;
|
|
|
- color: #e3e3e3;
|
|
|
- font-size: 12px;
|
|
|
- .weather-img {
|
|
|
- width: 48rpx;
|
|
|
- height: 48rpx;
|
|
|
- margin-right: 10px;
|
|
|
- }
|
|
|
- .weather-text {
|
|
|
- .first-line {
|
|
|
- font-size: 12px;
|
|
|
- margin-bottom: 4px;
|
|
|
- font-weight: 600;
|
|
|
- font-family: Montserrat;
|
|
|
- }
|
|
|
- .second-line {
|
|
|
- font-size: 11px;
|
|
|
- .weatherText {
|
|
|
- display: inline-block;
|
|
|
- min-width: 36px;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- .text {
|
|
|
- margin-right: 7px;
|
|
|
- }
|
|
|
-}
|
|
|
.my-class:after {
|
|
|
content: '.';
|
|
|
display: block;
|