|
@@ -976,11 +976,7 @@ import {
|
|
queryEquipmentRunConfig
|
|
queryEquipmentRunConfig
|
|
} from '../../api/officehome.js'
|
|
} from '../../api/officehome.js'
|
|
|
|
|
|
-import {
|
|
|
|
- getMeetingList,
|
|
|
|
- reserveMeetingroom,
|
|
|
|
- endMeetingReserve
|
|
|
|
-} from '@/api/meetingroom'
|
|
|
|
|
|
+import { getMeetingList} from '@/api/meetingroom'
|
|
import { isWithinLocation } from '@/service/location'
|
|
import { isWithinLocation } from '@/service/location'
|
|
import config from '@/config'
|
|
import config from '@/config'
|
|
import loadFont from '@/common/loadFont'
|
|
import loadFont from '@/common/loadFont'
|
|
@@ -1283,7 +1279,6 @@ wepy.page({
|
|
changeAirHandOrder(pobj, deviceObjCopy) {
|
|
changeAirHandOrder(pobj, deviceObjCopy) {
|
|
this.$refs.airHandCard.changeOneAir(pobj.id, pobj.code, pobj.value, deviceObjCopy)
|
|
this.$refs.airHandCard.changeOneAir(pobj.id, pobj.code, pobj.value, deviceObjCopy)
|
|
this.airHandItem = deviceObjCopy
|
|
this.airHandItem = deviceObjCopy
|
|
- console.log('changeAirHandOrderchangeAirHandOrder')
|
|
|
|
},
|
|
},
|
|
// 地暖弹框
|
|
// 地暖弹框
|
|
openFloorFeatPop(val) {
|
|
openFloorFeatPop(val) {
|
|
@@ -1818,9 +1813,6 @@ wepy.page({
|
|
},
|
|
},
|
|
// 进入地图页
|
|
// 进入地图页
|
|
toRoom() {
|
|
toRoom() {
|
|
- // wx.navigateTo({
|
|
|
|
- // url: `../intelligentControl/home?id=${this.officeData.id}&from=officehome&companyIdProp=${this.companyIdProp}`
|
|
|
|
- // }) ;
|
|
|
|
this.scrollTop = null
|
|
this.scrollTop = null
|
|
this.scrollTop = 0
|
|
this.scrollTop = 0
|
|
this.transY = this.transYCopy
|
|
this.transY = this.transYCopy
|
|
@@ -1867,24 +1859,6 @@ wepy.page({
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
- // 取得所有的会议室
|
|
|
|
- getAlllMeeting() {
|
|
|
|
- var _this = this
|
|
|
|
- return getMeetingList().then(function (res) {
|
|
|
|
- // console.log('getMeetingList1111', res) ;
|
|
|
|
- var allmeeting = []
|
|
|
|
- var resdata = res.data
|
|
|
|
- for (var key in resdata) {
|
|
|
|
- var list = (resdata[key] && resdata[key].list) || []
|
|
|
|
- allmeeting = allmeeting.concat(list)
|
|
|
|
- }
|
|
|
|
- // 找到符合条件的会议室 同一个名字
|
|
|
|
- var filtermeetingArr = allmeeting.filter(function (item) {
|
|
|
|
- return item.meeting.name === _this.officeData.localName
|
|
|
|
- })
|
|
|
|
- _this.filtermeeting = filtermeetingArr[0] || {}
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
hideScene() {
|
|
hideScene() {
|
|
this.sceneShow = false
|
|
this.sceneShow = false
|
|
},
|
|
},
|
|
@@ -1924,13 +1898,9 @@ wepy.page({
|
|
console.log('handleScene this.popList', this.popList)
|
|
console.log('handleScene this.popList', this.popList)
|
|
},
|
|
},
|
|
|
|
|
|
- // 返回 首页
|
|
|
|
|
|
+ // 返回 上一页
|
|
goPre() {
|
|
goPre() {
|
|
- if (this.routeParams.q) {
|
|
|
|
- wx.redirectTo({ url: '/pages/homev2' })
|
|
|
|
- } else {
|
|
|
|
- wx.navigateBack()
|
|
|
|
- }
|
|
|
|
|
|
+ wx.navigateBack()
|
|
},
|
|
},
|
|
setTopBarHeight(height) {
|
|
setTopBarHeight(height) {
|
|
this.topBarHeight = height
|
|
this.topBarHeight = height
|