diff --git a/src/App.vue b/src/App.vue index 26f72c928..fa8c1ec7e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -155,7 +155,7 @@ export default { position: relative; max-height: 83vh; box-sizing: border-box; - padding: 0 0 16px !important; + padding: 0 0 16px ; .dialog-h-content { max-height: calc(83vh - 80px); box-sizing: border-box; diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss index cf7cc4fd6..9da31f665 100644 --- a/src/assets/scss/modules/management/detail-main.scss +++ b/src/assets/scss/modules/management/detail-main.scss @@ -104,11 +104,11 @@ .m-detail-btn{ - margin-top:30px; - margin-right:16px; - // margin-bottom:20px; display: flex; justify-content: flex-end; + padding-right: 16px; + height: 50px; + align-items: center; .item_btn { font-size: 14px; diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss index ad12366ec..79904ea6c 100644 --- a/src/assets/scss/modules/management/edit-main.scss +++ b/src/assets/scss/modules/management/edit-main.scss @@ -43,6 +43,8 @@ display: flex; justify-content: flex-end; padding-right: 16px; + height: 50px; + align-items: center; } //取消按钮 ::v-deep .el-button--default { diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue index e0f733997..ee695991a 100644 --- a/src/views/modules/base/community/buildForm.vue +++ b/src/views/modules/base/community/buildForm.vue @@ -163,10 +163,16 @@ export default { this.dataForm.longitude = longitude } this.$nextTick(() => { - this.initMap(this.dataForm.latitude||latitude, this.dataForm.longitude||longitude); + const latitudeParam = this.dataForm.latitude !== undefined && this.dataForm.latitude != 0 + ? this.dataForm.latitude + : latitude; + const longitudeParam = this.dataForm.longitude !== undefined && this.dataForm.longitude != 0 + ? this.dataForm.longitude + : longitude; + this.initMap(latitudeParam, longitudeParam); + }) }, - async handleComfirm() { this.btnDisable = true setTimeout(() => { diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 2d511101a..b038502e5 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -991,4 +991,7 @@ export default { padding-left: 0px; padding-right: 0px; } +::v-deep .el-dialog__body{ + padding: 0; + } diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index da2f0835e..3d68a2f7f 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -1113,4 +1113,7 @@ export default { // flex: 1; width: calc(100% - 300px); } +::v-deep .el-dialog__body{ + padding: 0; + } diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue index d8eee2ba3..63e963450 100644 --- a/src/views/modules/base/community/communityForm.vue +++ b/src/views/modules/base/community/communityForm.vue @@ -279,12 +279,12 @@ export default { this.dataForm.latitude = latitude this.dataForm.longitude = longitude } - if (!map) { + // if (!map) { this.initMap(this.dataForm.latitude, this.dataForm.longitude); - } else { - map.setCenter(this.dataForm.latitude, this.dataForm.longitude); - map.setMarker(this.dataForm.latitude, this.dataForm.longitude); - } + // } else { + // map.setCenter(this.dataForm.latitude, this.dataForm.longitude); + // map.setMarker(this.dataForm.latitude, this.dataForm.longitude); + // } await this.loadAgency() await this.loadGrid() await this.loadProperty() @@ -294,7 +294,6 @@ export default { }, // 地图初始化函数,本例取名为init,开发者可根据实际情况定义 initMap (latitude, longitude) { - map = new daiMap( document.getElementById("app_community"), { latitude, longitude }, diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 5b798401a..2f7661ee0 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -1372,4 +1372,8 @@ export default { .el-message.is-closable .el-message__content { line-height: 20px; } + +::v-deep .el-dialog__body{ + padding: 0; + } diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue index a6b8bcada..dac59ed75 100644 --- a/src/views/modules/base/community/roomDetail.vue +++ b/src/views/modules/base/community/roomDetail.vue @@ -42,11 +42,11 @@
+
-
+
-