|
@@ -132,12 +132,14 @@ export default {
|
|
|
},
|
|
|
dialogVisible(eve) {
|
|
|
// console.log('dialogVisible')
|
|
|
- // console.log(eve)
|
|
|
+ console.log(eve)
|
|
|
// 点击后显示弹窗组件
|
|
|
- this.ShowDialog = true
|
|
|
- this.$nextTick(() => {
|
|
|
- this.$refs.dialog.showModal(eve)
|
|
|
- })
|
|
|
+ if (eve.label != '查看图纸') {
|
|
|
+ this.ShowDialog = true
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.dialog.showModal(eve)
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
/**
|
|
|
* 关闭弹窗,子组件传回父组件,
|
|
@@ -158,7 +160,7 @@ export default {
|
|
|
// 查询附加数据图片
|
|
|
queryTable(system) {
|
|
|
this.fqPic = []
|
|
|
- let picFloor = this.$cookie.get('floorNow')
|
|
|
+ let picFloor = this.$cookie.get('floorMapId')
|
|
|
let getParams = {
|
|
|
module: '1003',
|
|
|
floor: picFloor,
|
|
@@ -228,7 +230,12 @@ export default {
|
|
|
this.$refs.floorMap.init(this.floorInfo.gname)
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapGetters(['floorsArr', 'plazaId', 'showView', 'legendTable'])
|
|
|
+ ...mapGetters(['floorsArr', 'plazaId', 'showView', 'legendTable']),
|
|
|
+ Height() {
|
|
|
+ console.log(document.body.clientHeight)
|
|
|
+ // return document.body.clientHeight
|
|
|
+ return 300
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
@@ -344,7 +351,7 @@ export default {
|
|
|
position: fixed;
|
|
|
z-index: 9;
|
|
|
right: 32px;
|
|
|
- top: 160px;
|
|
|
+ top: 142px;
|
|
|
}
|
|
|
.additional-box {
|
|
|
position: relative;
|
|
@@ -355,7 +362,7 @@ export default {
|
|
|
border-radius: 2px;
|
|
|
position: fixed;
|
|
|
right: 32px;
|
|
|
- top: 510px;
|
|
|
+ top: 528px;
|
|
|
z-index: 2;
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
@@ -377,7 +384,9 @@ export default {
|
|
|
.add-img-container {
|
|
|
width: 560px;
|
|
|
height: 360px;
|
|
|
- overflow: hidden;
|
|
|
+ // max-height: calc(100% - 60px);
|
|
|
+ // height: calc(100% - 60px);
|
|
|
+ overflow: auto;
|
|
|
background: #ffffff;
|
|
|
-webkit-box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
|
|
|
box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
|
|
@@ -385,7 +394,7 @@ export default {
|
|
|
border: 1px solid #e4e5e7;
|
|
|
position: absolute;
|
|
|
right: 77px;
|
|
|
- bottom: 381px;
|
|
|
+ bottom: 325px;
|
|
|
z-index: 2;
|
|
|
padding: 20px;
|
|
|
.add-img {
|