From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue b/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
index 5184ed2..85d1972 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
@@ -139,7 +139,7 @@
:modal="false"
v-dialogDrag
>
- <ReportLocation @locationClick="getlocaltionClick"></ReportLocation>
+ <ReportLocation></ReportLocation>
</el-dialog>
</div>
</template>
@@ -329,19 +329,13 @@
}
},
mounted () {
- eventBus.$on('section-search', (obj) => {
+ eventBus.$on('location-setChange', (obj) => {
if (obj) {
this.dialogLocation = false
}
})
},
methods: {
- // 鎺ユ敹瀛愮粍浠朵紶閫掔殑鏁版嵁
- getlocaltionClick (val) {
- console.log(val)
- this.ruleForm.positionOf = val.latPos + '-' + val.longPos
- this.dialogLocation = !this.dialogLocation
- },
// 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
infoChange () {
if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
@@ -368,11 +362,13 @@
return false
}
})
- this.$refs[formName].resetFields()
+ // this.$refs[formName].resetFields()
+ eventBus.$emit('event-report-popup', false)
},
// form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
resetForm (formName) {
this.$refs[formName].resetFields()
+ eventBus.$emit('event-report-popup', false)
}
}
}
--
Gitblit v1.8.0