|
@@ -562,7 +562,8 @@ page {
|
|
class="maproom-detail"
|
|
class="maproom-detail"
|
|
v-show="moveToBottom"
|
|
v-show="moveToBottom"
|
|
>
|
|
>
|
|
- <div class="upToSpace">
|
|
|
|
|
|
+ <div class="upToSpace"
|
|
|
|
+ v-if="officeData.localName">
|
|
<image
|
|
<image
|
|
class="imgSt"
|
|
class="imgSt"
|
|
src="{{h5StaticPath}}icon-double-arrow.svg"
|
|
src="{{h5StaticPath}}icon-double-arrow.svg"
|
|
@@ -983,7 +984,7 @@ page {
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<set-permanent
|
|
<set-permanent
|
|
- v-if="userControlSpace.isControlSpace === 3 && this.routeParams.from==='homeSetSpace'"
|
|
|
|
|
|
+ v-show="userControlSpace.isControlSpace === 3 && this.routeParams.from==='homeSetSpace'"
|
|
:show="isShowPermanent"
|
|
:show="isShowPermanent"
|
|
@component-permanent-panel-close="closePermanentPanel(false)"
|
|
@component-permanent-panel-close="closePermanentPanel(false)"
|
|
>
|
|
>
|
|
@@ -1074,7 +1075,6 @@ wepy.page({
|
|
store,
|
|
store,
|
|
data: {
|
|
data: {
|
|
sceneShow: false,
|
|
sceneShow: false,
|
|
- projectId: 'Pj1101080259',
|
|
|
|
isShowPermanent: false,
|
|
isShowPermanent: false,
|
|
userControlSpace: {}, // 用户控制空间
|
|
userControlSpace: {}, // 用户控制空间
|
|
cardWidth: 0, // 动态获取卡片的宽度
|
|
cardWidth: 0, // 动态获取卡片的宽度
|
|
@@ -1222,7 +1222,7 @@ wepy.page({
|
|
computed: {
|
|
computed: {
|
|
...mapState({
|
|
...mapState({
|
|
userInfo: state => state.user.userInfo,
|
|
userInfo: state => state.user.userInfo,
|
|
- // projectId: 'Pj1101080259',
|
|
|
|
|
|
+ projectId: state => state.user.userInfo.projectId,
|
|
handPopHight: state => state.officehome.handPopHight
|
|
handPopHight: state => state.officehome.handPopHight
|
|
}),
|
|
}),
|
|
...mapActions(['setIsApprovalProject']),
|
|
...mapActions(['setIsApprovalProject']),
|
|
@@ -1317,6 +1317,7 @@ wepy.page({
|
|
await this.getData()
|
|
await this.getData()
|
|
}
|
|
}
|
|
let setAirtemp = this.$refs.airHandCard.airTemp
|
|
let setAirtemp = this.$refs.airHandCard.airTemp
|
|
|
|
+
|
|
switch (this.routeParams.from) {
|
|
switch (this.routeParams.from) {
|
|
case 'homeShowEnv':
|
|
case 'homeShowEnv':
|
|
if (this.userControlSpace.isControlSpace === 1 || this.userControlSpace.isControlSpace === 2) {
|
|
if (this.userControlSpace.isControlSpace === 1 || this.userControlSpace.isControlSpace === 2) {
|
|
@@ -1331,6 +1332,7 @@ wepy.page({
|
|
break
|
|
break
|
|
case 'openLamp':
|
|
case 'openLamp':
|
|
this.selectCrad('', 'lamp')
|
|
this.selectCrad('', 'lamp')
|
|
|
|
+ console.log(this.$refs, '----this.$refs.lampAdjust')
|
|
this.$refs.lampAdjust.eqChange(true, 'allLamp')
|
|
this.$refs.lampAdjust.eqChange(true, 'allLamp')
|
|
break
|
|
break
|
|
case 'airAddOne':
|
|
case 'airAddOne':
|
|
@@ -1596,6 +1598,7 @@ wepy.page({
|
|
},
|
|
},
|
|
// 地图数据切换空间
|
|
// 地图数据切换空间
|
|
mapChangeSpaceInfo(obj) {
|
|
mapChangeSpaceInfo(obj) {
|
|
|
|
+ console.log(obj, '----来自地图')
|
|
this.userControlSpace = obj
|
|
this.userControlSpace = obj
|
|
this.options.spaceId = obj.spaceId
|
|
this.options.spaceId = obj.spaceId
|
|
this.getData()
|
|
this.getData()
|