|
@@ -117,7 +117,6 @@ page {
|
|
|
.maproom-detail {
|
|
|
width: 750rpx;
|
|
|
margin-left: -45rpx;
|
|
|
- padding: 10rpx 45rpx 0;
|
|
|
height: 125px;
|
|
|
position: relative;
|
|
|
background: #fff;
|
|
@@ -154,6 +153,24 @@ page {
|
|
|
color: #bab8c7;
|
|
|
}
|
|
|
}
|
|
|
+ .upToSpace {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ padding-top: 24rpx;
|
|
|
+ .imgSt {
|
|
|
+ width: 24rpx;
|
|
|
+ height: 24rpx;
|
|
|
+ }
|
|
|
+ .text {
|
|
|
+ color: #8b949e;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-size: 24rpx;
|
|
|
+ font-style: normal;
|
|
|
+ font-weight: 400;
|
|
|
+ line-height: 40rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.office-container {
|
|
@@ -505,9 +522,7 @@ page {
|
|
|
v-show="transY"
|
|
|
>
|
|
|
<!-- <map-home v-if="userInfo&& userInfo.userId" -->
|
|
|
- <map-home
|
|
|
- @mapChangeSpaceInfo="mapChangeSpaceInfo"
|
|
|
- ></map-home>
|
|
|
+ <map-home @mapChangeSpaceInfo="mapChangeSpaceInfo"></map-home>
|
|
|
</div>
|
|
|
<div
|
|
|
class="move-wrap"
|
|
@@ -545,11 +560,19 @@ page {
|
|
|
class="maproom-detail"
|
|
|
v-show="moveToBottom"
|
|
|
>
|
|
|
+ <div class="upToSpace">
|
|
|
+ <image
|
|
|
+ class="imgSt"
|
|
|
+ src="{{h5StaticPath}}icon-double-arrow.svg"
|
|
|
+ />
|
|
|
+ <span class="text">上滑进入空间</span>
|
|
|
+ </div>
|
|
|
<space-basic
|
|
|
:IsShowPerson="false"
|
|
|
:officeData="officeData"
|
|
|
:options="options"
|
|
|
:userInfo="userInfo"
|
|
|
+ :isControlSpace="userControlSpace.isControlSpace"
|
|
|
></space-basic>
|
|
|
</div>
|
|
|
<!-- 空间基本情况 -->
|
|
@@ -563,6 +586,7 @@ page {
|
|
|
:officeData="officeData"
|
|
|
:options="options"
|
|
|
:userInfo="userInfo"
|
|
|
+ :isControlSpace="userControlSpace.isControlSpace"
|
|
|
></space-basic>
|
|
|
<!-- 空间信息 -->
|
|
|
<div class="office-room-info">
|
|
@@ -650,6 +674,7 @@ page {
|
|
|
<lamp-adjust
|
|
|
v-if="spaceEqFlagObj.hasLamp"
|
|
|
id="inToView1"
|
|
|
+ ref="lampAdjust"
|
|
|
:roomHasScene="roomHasScene"
|
|
|
:lampHide="lampHide"
|
|
|
:spaceId="options.spaceId"
|
|
@@ -955,6 +980,12 @@ page {
|
|
|
<div>进入地图</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <set-permanent
|
|
|
+ v-if="userControlSpace.isControlSpace === 3 && this.routeParams.from==='homeSetSpace'"
|
|
|
+ :show="isShowPermanent"
|
|
|
+ @component-permanent-panel-close="closePermanentPanel(false)"
|
|
|
+ >
|
|
|
+ </set-permanent>
|
|
|
</div>
|
|
|
|
|
|
</template>
|
|
@@ -976,7 +1007,7 @@ import {
|
|
|
queryEquipmentRunConfig
|
|
|
} from '../../api/officehome.js'
|
|
|
|
|
|
-import { getMeetingList} from '@/api/meetingroom'
|
|
|
+import { getMeetingList } from '@/api/meetingroom'
|
|
|
import { isWithinLocation } from '@/service/location'
|
|
|
import config from '@/config'
|
|
|
import loadFont from '@/common/loadFont'
|
|
@@ -998,7 +1029,7 @@ let initListSen = [
|
|
|
id: 0,
|
|
|
code: 'DISCUSSING',
|
|
|
name: '讨论',
|
|
|
- img: 'discuss.svg',
|
|
|
+ img: 'discuss.png',
|
|
|
checked: true,
|
|
|
textObj: [
|
|
|
{
|
|
@@ -1011,7 +1042,7 @@ let initListSen = [
|
|
|
id: 1,
|
|
|
code: 'PROJECTING',
|
|
|
name: '投影',
|
|
|
- img: 'shadow2.svg',
|
|
|
+ img: 'shadow2.png',
|
|
|
checked: false,
|
|
|
textObj: [
|
|
|
{
|
|
@@ -1024,7 +1055,7 @@ let initListSen = [
|
|
|
id: 2,
|
|
|
code: 'ADJOURNMENT',
|
|
|
name: '散会',
|
|
|
- img: 'beover.svg',
|
|
|
+ img: 'beover.png',
|
|
|
checked: false,
|
|
|
textObj: [
|
|
|
{
|
|
@@ -1037,7 +1068,10 @@ let initListSen = [
|
|
|
wepy.page({
|
|
|
store,
|
|
|
data: {
|
|
|
+ sceneShow: false,
|
|
|
projectId: 'Pj1101080259',
|
|
|
+ isShowPermanent: false,
|
|
|
+ userControlSpace: {}, // 用户控制空间
|
|
|
cardWidth: 0, // 动态获取卡片的宽度
|
|
|
floorFeatItem: {}, // 地暖弹窗数据
|
|
|
airHandItem: {},
|
|
@@ -1094,7 +1128,6 @@ wepy.page({
|
|
|
headScene: '', // 头部文案
|
|
|
headImg: '', // 头部背景图片
|
|
|
options: { roomType: null, spaceId: 'Sp1101080259c4434730d12144ba890fe11f796d3143' }, // 本地数据
|
|
|
- sceneDetail: null,
|
|
|
popList: [],
|
|
|
// 上班=ATWORK 讨论=DISCUSSING 投影=PROJECTING 散会=ADJOURNMENT 下班=OFFWORK
|
|
|
meetingRoomSence: [
|
|
@@ -1218,6 +1251,14 @@ wepy.page({
|
|
|
},
|
|
|
// 加载字体
|
|
|
onLoad(routeParams) {
|
|
|
+ routeParams = {
|
|
|
+ 'from': 'homeSetSpace',
|
|
|
+ 'isControlSpace': 3,
|
|
|
+ 'buildingId': 'string',
|
|
|
+ 'spaceId': 'Sp1101080259c4434730d12144ba890fe11f796d3143',
|
|
|
+ 'spaceName': 'string',
|
|
|
+ 'floorId': 'string'
|
|
|
+ }
|
|
|
this.getCardWidth()
|
|
|
var nowTimeStr = moment().format('YYYY-MM-DD')
|
|
|
var eightTime = moment(nowTimeStr + ' 20:00:00').valueOf()
|
|
@@ -1227,7 +1268,7 @@ wepy.page({
|
|
|
this.routeParams = routeParams
|
|
|
},
|
|
|
onShow() {
|
|
|
- this.getData() // 获取数据
|
|
|
+ this.fromOtherPages()
|
|
|
this.spaceInfoStatusTimer()
|
|
|
},
|
|
|
onReady() {
|
|
@@ -1256,6 +1297,72 @@ wepy.page({
|
|
|
spaceInfoStatusTimer = clearInterval(spaceInfoStatusTimer)
|
|
|
},
|
|
|
methods: {
|
|
|
+ closePermanentPanel(val) {
|
|
|
+ this.isShowPermanent = val
|
|
|
+ },
|
|
|
+ async fromOtherPages() {
|
|
|
+ // homeSetSpace 设置常驻, homeShowEnv 环境调节, FindIt 找一找
|
|
|
+ // openLamp 开灯, airAddOne 空调调高一度, airReduceOne 空调下降一度 , closeLampAir 关闭灯和空调
|
|
|
+
|
|
|
+ if (this.routeParams.from === 'FindIt') {
|
|
|
+ this.options.spaceId = this.routeParams.spaceId
|
|
|
+ this.moveToBottom = true // 来自找一找, 页面在底部
|
|
|
+ this.getData() // 获取数据
|
|
|
+ } else {
|
|
|
+ await this.getCurrentSpace()
|
|
|
+ if (this.options.spaceId) {
|
|
|
+ await this.getData()
|
|
|
+ }
|
|
|
+ // 从首页过来
|
|
|
+ let setAirtemp = this.$refs.airHandCard.airTemp
|
|
|
+ switch (this.routeParams.from) {
|
|
|
+ case 'homeShowEnv':
|
|
|
+ if (this.userControlSpace.isControlSpace === 1 || this.userControlSpace.isControlSpace === 2) {
|
|
|
+ this.moveToBottom = true
|
|
|
+ }
|
|
|
+ break
|
|
|
+ case 'homeSetSpace':
|
|
|
+ this.isShowPermanent = true
|
|
|
+ this.moveToBottom = true
|
|
|
+ this.toRoom()
|
|
|
+ break
|
|
|
+ case 'openLamp':
|
|
|
+ this.selectCrad('', 'lamp')
|
|
|
+ this.$refs.lampAdjust.eqChange(true, 'allLamp')
|
|
|
+ break
|
|
|
+ case 'airAddOne':
|
|
|
+ this.selectCrad('', 'air')
|
|
|
+ this.$refs.airHandCard.changeZongAir('temp', setAirtemp + 1)
|
|
|
+ break
|
|
|
+ case 'airReduceOne':
|
|
|
+ this.selectCrad('', 'air')
|
|
|
+ this.$refs.airHandCard.changeZongAir('temp', setAirtemp - 1)
|
|
|
+
|
|
|
+ break
|
|
|
+ case 'closeLampAir':
|
|
|
+ this.selectCrad('', 'air')
|
|
|
+ this.$refs.lampAdjust.eqChange(false, 'allLamp')
|
|
|
+ this.$refs.airHandCard.airData.isOpen = false
|
|
|
+ this.$refs.airHandCard.changeZongAir('sw')
|
|
|
+ break
|
|
|
+
|
|
|
+ default:
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ getCurrentSpace() {
|
|
|
+ const resData = {
|
|
|
+ 'isControlSpace': 3, // 1-租户下无可控;2-租户有可控;3-用户有可控 4-当前空间为常驻空间
|
|
|
+ 'buildingId': 'string',
|
|
|
+ 'spaceId': 'Sp1101080259c4434730d12144ba890fe11f796d3143',
|
|
|
+ 'spaceName': 'string',
|
|
|
+ 'floorId': 'string'
|
|
|
+ }
|
|
|
+ this.userControlSpace = resData
|
|
|
+ this.options.spaceId = resData.spaceId
|
|
|
+ },
|
|
|
+
|
|
|
setCanScroll(val) {
|
|
|
this.canscroll = val
|
|
|
},
|
|
@@ -1763,8 +1870,12 @@ wepy.page({
|
|
|
? 0
|
|
|
: (res[next] && res[next].height) || 0
|
|
|
},
|
|
|
- async selectCrad(e, nav) {
|
|
|
- let id = e.currentTarget.id
|
|
|
+ // 导航条
|
|
|
+ async selectCrad(e, code) {
|
|
|
+ const targetObj = this.navList.find(function (item) {
|
|
|
+ return item.code === code
|
|
|
+ })
|
|
|
+ let id = code ? targetObj.id : e.currentTarget.id
|
|
|
if (id === this.navId) return
|
|
|
this.navId = id
|
|
|
this.lampHide = !this.lampHide // 当点击了导航 灯的列表要收起
|
|
@@ -2021,6 +2132,7 @@ usingComponents: {
|
|
|
"pop-scene":"./Meeting/pop-meet-scene.wpy",
|
|
|
"work-off":"./components/work-off",
|
|
|
"work-scene-hand":"./components/work-scene-hand",
|
|
|
+ "set-permanent":"./components/set-permanent",
|
|
|
"air-hand-card":"./airHand/air-hand-card",
|
|
|
"air-feedback":"./components/air-feedback",
|
|
|
"lamp-adjust":"./components/lamp-adjust",
|