diff --git a/src/app/ui/plan/collection-tools.component.scss b/src/app/ui/plan/collection-tools.component.scss
index 7326397..374599a 100644
--- a/src/app/ui/plan/collection-tools.component.scss
+++ b/src/app/ui/plan/collection-tools.component.scss
@@ -29,6 +29,7 @@
margin-top: 8px;
}
background-image: url("../../../assets/images/top.png");
+ background-size: 100% 100%;
position: relative;
span{
font-size: 18px;
@@ -151,19 +152,16 @@
}
.canvas{
flex: 5;
- margin: 10px 10px;
+ margin: 10px 0px;
height: 97%;
}
.functionalDomainLeft {
- margin: 10px 10px;
+ margin:10px;
background: url("../../../assets/images/left\ list\ .png");
background-size: 100% 100%;
display: flex;
flex-direction: column;
- margin-left: 0px;
transition: margin-left 0.5s;
- // min-width: 235px;
- //border: 1px solid #30bbec;
width: 235px;
left: 0;
z-index: 111;
@@ -424,8 +422,7 @@ div:focus {
//没有图片时显示无图片背景图
.noImgCss{
- background: url(../../../assets/images/noImg.png) repeat center center;
- background-size: 88% 100%;/*按比例缩放*/
+ background: url(../../../assets/images/pic.png) white no-repeat center;
}
.input{
width: 18px;
diff --git a/src/app/ui/plan/collection-tools.component.ts b/src/app/ui/plan/collection-tools.component.ts
index 80c9670..748366e 100644
--- a/src/app/ui/plan/collection-tools.component.ts
+++ b/src/app/ui/plan/collection-tools.component.ts
@@ -73,9 +73,11 @@ export class planComponent implements OnInit {
setTimeout(() => {
obj.PropertyInfos.forEach(item => {
if(item.PropertyType == 4){
- this.gallery = new Viewer(document.getElementById('viewerjs'),{
- url: 'data-original'
- });
+ if(document.getElementById('viewerjs')){
+ this.gallery = new Viewer(document.getElementById('viewerjs'),{
+ url: 'data-original'
+ });
+ }
}
})
}, 0);
@@ -142,6 +144,12 @@ export class planComponent implements OnInit {
rightSwitch(type){
if(type == 1){
this.isProperty = true
+ setTimeout(() => {
+ this.gallery = new Viewer(document.getElementById('viewerjs'),{
+ url: 'data-original'
+ });
+ this.gallery.update()
+ }, 0);
}else{
this.isProperty = false
}
@@ -715,6 +723,7 @@ export class planComponent implements OnInit {
for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到 其他 数组
let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
if (!noMatch) {
+ storeyData.data[key].isLook = true
this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
}
}
diff --git a/src/app/ui/plan/panel.scss b/src/app/ui/plan/panel.scss
index b9359c6..9ed0ed3 100644
--- a/src/app/ui/plan/panel.scss
+++ b/src/app/ui/plan/panel.scss
@@ -8,15 +8,14 @@
.planarGraphHeader{
width: 100%;
text-align: center;
- height: 40px;
- line-height: 40px;
- min-height: 40px;
+ height: 50px;
+ line-height: 50px;
+ min-height: 50px;
cursor: pointer;
text-align: center;
font-style: italic;
font-size: 20px;
color: white;
- border-bottom:2px solid #accbf2;
}
//平面图头部字体图标样式
.hover {