|
@@ -22,7 +22,7 @@
|
|
|
|
|
|
<!-- 地图组件 -->
|
|
|
|
|
|
- <div>
|
|
|
+ <div v-if="conflict==false">
|
|
|
<drawer ref="drawer" @tap="closeDrawer" ></drawer>
|
|
|
</div>
|
|
|
<div class="plusDrawer" @tap="hideModal">
|
|
@@ -122,6 +122,7 @@ export default {
|
|
|
},
|
|
|
data: function() {
|
|
|
return {
|
|
|
+ conflict:false,
|
|
|
kg:true,
|
|
|
leftNavigationtitle:'预测功能分组',
|
|
|
leftbarkg:false,
|
|
@@ -518,7 +519,11 @@ export default {
|
|
|
openDrawer: function() {
|
|
|
this.monitoringAuthority();
|
|
|
this.kg=false;
|
|
|
- this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList,this.leftNavigationtitle);
|
|
|
+ if(this.$refs.drawer != undefined){
|
|
|
+ this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList,this.leftNavigationtitle);
|
|
|
+ }else{
|
|
|
+ console.log('雷霆嘎巴');
|
|
|
+ }
|
|
|
},
|
|
|
closeDrawer: function() {
|
|
|
|
|
@@ -556,12 +561,14 @@ export default {
|
|
|
this.monitoringAuthority();
|
|
|
},
|
|
|
showModal(e) {
|
|
|
+ this.conflict = true;
|
|
|
this.viewUserid();
|
|
|
this.kg=false;
|
|
|
this.modalName = e.currentTarget.dataset.target;
|
|
|
this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
|
|
|
},
|
|
|
hideModal() {
|
|
|
+ this.conflict = false;
|
|
|
this.leftbar();
|
|
|
this.modalName = null;
|
|
|
//this.$refs.plusDrawer.hideModal(this.modalName);
|