|
@@ -25,7 +25,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div v-show="spaceDetails.Outline && spaceDetails.Outline[0] && spaceDetails.Outline[0].length" id="graphy" ref="graphy"
|
|
|
- style="width:400px;height:400px;">
|
|
|
+ style="width:400px;height:400px;" v-loading="canvasLoading">
|
|
|
<p><b>位置图片:</b></p>
|
|
|
<canvas id="floorCanvas" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"></canvas>
|
|
|
</div>
|
|
@@ -55,15 +55,15 @@
|
|
|
</div>
|
|
|
</el-scrollbar>
|
|
|
</el-aside>
|
|
|
- <el-main>
|
|
|
+ <el-main style="height:100%">
|
|
|
<el-tabs v-model="activeTab" type='card'>
|
|
|
<template v-for="(item,index) in tabsList">
|
|
|
<el-tab-pane :name="item.Code" :key="index" :label="item.Name">
|
|
|
- <div v-show="activeTab === 'staticData'" style="width:100%;textAlign:left;" id="iframe-box">
|
|
|
+ <div v-show="activeTab === 'staticData'" style="width:100%;height:100%;textAlign:left;" id="iframe-box">
|
|
|
<!-- <iframe height="100%" width="100%" :src="iframeSrc" id="screenIframe"></iframe> -->
|
|
|
</div>
|
|
|
- <div v-show="activeTab === 'dynamicData'" style="width:100%;textAlign:left;">
|
|
|
- <div class="main" style="height: 790px;">
|
|
|
+ <div v-show="activeTab === 'dynamicData'" style="width:100%;height:100%;">
|
|
|
+ <div class="content-box" style="height:100%;">
|
|
|
<el-table ref="multipleTable" :data="tableData" stripe height="100%" :header-cell-style="headerStyle">
|
|
|
<el-table-column prop="InfoPointName" label="信息点名称">
|
|
|
<template slot-scope="scope">
|
|
@@ -86,7 +86,7 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-show="activeTab === 'objectRelationship'" class="objectRelationship">
|
|
|
+ <div v-if="activeTab === 'objectRelationship'" class="objectRelationship" style="height:100%">
|
|
|
<div class="objectRelationship-left">
|
|
|
<h5>空间内设备:</h5>
|
|
|
<eqToSpaceTable :params="params" type="Equipment"></eqToSpaceTable>
|
|
@@ -147,7 +147,8 @@ export default {
|
|
|
color: '#2b2b2b',
|
|
|
lineHeight: '30px'
|
|
|
},
|
|
|
- secret: ''
|
|
|
+ secret: '',
|
|
|
+ canvasLoading: false
|
|
|
}
|
|
|
},
|
|
|
components: {
|
|
@@ -181,6 +182,7 @@ export default {
|
|
|
}
|
|
|
queryZone(params, res => {
|
|
|
this.spaceDetails = res.Content[0];
|
|
|
+ console.log(this.spaceDetails,333)
|
|
|
if (this.spaceDetails.Outline && this.spaceDetails.Outline[0] && this.spaceDetails.Outline[0].length) {
|
|
|
this.getSpaceFloor();
|
|
|
}
|
|
@@ -217,7 +219,7 @@ export default {
|
|
|
let that = this;
|
|
|
that.clearGraphy()
|
|
|
that.scene = new DivideFloorScene();
|
|
|
- that.canvasLoading = true;
|
|
|
+ this.canvasLoading = true;
|
|
|
that.scene.loadUrl(`/image-service/common/file_get?systemId=revit&key=${this.FloorMap}`).then(res => {
|
|
|
that.canvasLoading = false;
|
|
|
if (res == 'error') {
|
|
@@ -375,8 +377,16 @@ export default {
|
|
|
text-align: center;
|
|
|
margin: -10px;
|
|
|
padding-bottom: 0;
|
|
|
+ overflow: hidden;
|
|
|
+ width: 100%
|
|
|
+}
|
|
|
+.el-tabs.el-tabs--card.el-tabs--top{
|
|
|
+ height: 100% !important;
|
|
|
+ width: 100%;
|
|
|
}
|
|
|
.objectRelationship {
|
|
|
+ height: 100%;
|
|
|
+ width: 100%;
|
|
|
display: flex;
|
|
|
.objectRelationship-left,
|
|
|
.objectRelationship-center,
|
|
@@ -384,9 +394,15 @@ export default {
|
|
|
flex: 1;
|
|
|
margin-right: 10px;
|
|
|
text-align: left;
|
|
|
- height: 100%;
|
|
|
+ height: 100% !important;
|
|
|
}
|
|
|
}
|
|
|
+#pane-dynamicData{
|
|
|
+ height: calc(100% - 10px);
|
|
|
+}
|
|
|
+.el-tab-pane{
|
|
|
+ height: 100%;
|
|
|
+}
|
|
|
#pane-staticData {
|
|
|
height: 750px;
|
|
|
div {
|
|
@@ -406,4 +422,7 @@ export default {
|
|
|
overflow-x: hidden !important;
|
|
|
overflow-y: auto !important;
|
|
|
}
|
|
|
+.el-tabs__content{
|
|
|
+ height: calc(100% - 47px) !important;
|
|
|
+}
|
|
|
</style>
|