|
@@ -563,7 +563,7 @@ page {
|
|
|
v-show="moveToBottom"
|
|
|
>
|
|
|
<div class="upToSpace"
|
|
|
- v-if="officeData.localName">
|
|
|
+ v-if="isSpaceCanControl">
|
|
|
<image
|
|
|
class="imgSt"
|
|
|
src="{{h5StaticPath}}icon-double-arrow.svg"
|
|
@@ -571,6 +571,7 @@ page {
|
|
|
<span class="text">上滑进入空间</span>
|
|
|
</div>
|
|
|
<space-basic
|
|
|
+ :isSpaceCanControl="isSpaceCanControl"
|
|
|
:IsShowPerson="false"
|
|
|
:officeData="officeData"
|
|
|
:options="options"
|
|
@@ -1010,19 +1011,9 @@ import {
|
|
|
queryEquipmentRunConfig
|
|
|
} from '../../api/officehome.js'
|
|
|
|
|
|
-import { getMeetingList } from '@/api/meetingroom'
|
|
|
import { isWithinLocation } from '@/service/location'
|
|
|
import config from '@/config'
|
|
|
-import loadFont from '@/common/loadFont'
|
|
|
-import { getCompanyMapData } from '@/api/home'
|
|
|
-import { checkHasUserInfo } from '@/service/user'
|
|
|
-import { getNowDate, getTowNum } from '@/service/meetingTimes'
|
|
|
-
|
|
|
let spaceInfoStatusTimer = null
|
|
|
-let pageSelectedAreaRecord = {
|
|
|
- // key为楼层ID,value 为spceId
|
|
|
-}
|
|
|
-
|
|
|
const switchPanelHeight = 125 // 145是下面块的高
|
|
|
const roomPicTop = 185 // 135是建筑图片的高度 单位都是px
|
|
|
var moveY
|
|
@@ -1076,6 +1067,7 @@ wepy.page({
|
|
|
data: {
|
|
|
sceneShow: false,
|
|
|
isShowPermanent: false,
|
|
|
+ isUserControlFromMap: true,
|
|
|
userControlSpace: {}, // 用户控制空间
|
|
|
cardWidth: 0, // 动态获取卡片的宽度
|
|
|
floorFeatItem: {}, // 地暖弹窗数据
|
|
@@ -1234,6 +1226,14 @@ wepy.page({
|
|
|
this.options.roomType === '会议室' &&
|
|
|
this.spaceEqFlagObj.hasLamp
|
|
|
return meetingScene
|
|
|
+ },
|
|
|
+ isSpaceCanControl() {
|
|
|
+ let flag = true
|
|
|
+ if (this.userControlSpace.isControlSpace === 1 || this.userControlSpace.isControlSpace === 2 || !this.isUserControlFromMap) {
|
|
|
+ flag = false
|
|
|
+ }
|
|
|
+ console.log(flag, '----flag')
|
|
|
+ return flag
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -1331,7 +1331,6 @@ wepy.page({
|
|
|
break
|
|
|
case 'openLamp':
|
|
|
this.selectCrad('', 'lamp')
|
|
|
- console.log(this.$refs, '----this.$refs.lampAdjust')
|
|
|
this.$refs.lampAdjust.eqChange(true, 'allLamp')
|
|
|
break
|
|
|
case 'airAddOne':
|
|
@@ -1357,7 +1356,7 @@ wepy.page({
|
|
|
},
|
|
|
getCurrentSpace(from) {
|
|
|
return checkUserControl().then(res => {
|
|
|
- // 1-租户下无可控;2-租户有可控;3-用户有可控 4-当前空间为常驻空间
|
|
|
+ // isControlSpace 1-租户下无可控;2-租户有可控;3-用户有可控 4-当前空间为常驻空间
|
|
|
this.userControlSpace = res
|
|
|
// 从首页进入 才给空间重新赋值
|
|
|
if (from === 'home') {
|
|
@@ -1603,6 +1602,7 @@ wepy.page({
|
|
|
// isCompanyControl: true 为常驻工区
|
|
|
const mapItem = JSON.parse(JSON.stringify(obj))
|
|
|
this.options.spaceId = mapItem.spaceId
|
|
|
+ this.isUserControlFromMap = mapItem.isUserControl
|
|
|
this.getData()
|
|
|
},
|
|
|
getSpaceInfo() {
|
|
@@ -1891,6 +1891,8 @@ wepy.page({
|
|
|
this.scrollTop = targetNav.top // 实现点击导航 滚动
|
|
|
},
|
|
|
async scrollEvent(event) {
|
|
|
+ // 空间不可控不能滑动
|
|
|
+ if (!this.isSpaceCanControl) return
|
|
|
// 滚动 选中导航条相应的
|
|
|
await this.getCardPosition()
|
|
|
var scrollTop = (event.detail || event.$wx.detail || {}).scrollTop || 0
|