|
|
@@ -21,7 +21,7 @@
|
|
|
</cu-custom>
|
|
|
|
|
|
<!-- 抽屉组件 -->
|
|
|
- <div>
|
|
|
+ <div v-if="conflict==false">
|
|
|
<drawer ref="drawer"></drawer>
|
|
|
</div>
|
|
|
<div class="plusDrawer" @tap="hideModal">
|
|
|
@@ -429,6 +429,7 @@
|
|
|
},
|
|
|
data: function() {
|
|
|
return {
|
|
|
+ conflict:false,
|
|
|
c1: {
|
|
|
categories: ['04/12', '04/13', '04/14', '04/15', '04/16', '04/17', '04/18'],
|
|
|
series: [{
|
|
|
@@ -1083,7 +1084,11 @@
|
|
|
});
|
|
|
},
|
|
|
openDrawer: function() {
|
|
|
- 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() {
|
|
|
this.drawerIsShow = false;
|
|
|
@@ -1099,12 +1104,14 @@
|
|
|
return uni.getStorageSync('windpowerstationName');
|
|
|
},
|
|
|
showModal(e) {
|
|
|
+ this.conflict = true;
|
|
|
this.modalName = e.currentTarget.dataset.target;
|
|
|
this.viewUserid();
|
|
|
this.monitoringAuthority();
|
|
|
this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
|
|
|
},
|
|
|
hideModal() {
|
|
|
+ this.conflict = false;
|
|
|
this.modalName = null;
|
|
|
this.$refs.plusDrawer.hideModal(this.modalName);
|
|
|
},
|
lizaixun