From f8865d1c7f36c4ffa66002e0dd3a9d5e99e4fe6b Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:45:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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 934a193..71adc84 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
@@ -127,18 +127,19 @@
</el-form-item>
</div>
<el-form-item class="confirmCancel">
- <el-button type="primary" @click="submitForm('ruleForm')">纭</el-button>
- <el-button @click="resetForm('ruleForm')">鍙栨秷</el-button>
+ <el-button type="primary" size="small" @click="submitForm('ruleForm')">纭</el-button>
+ <el-button size="small" @click="resetForm('ruleForm')">鍙栨秷</el-button>
</el-form-item>
</el-form>
<el-dialog
- custom-class="el-dialog--center"
+ custom-class="event-report-dialog"
+ title="浜嬪彂浣嶇疆瀹氫綅"
:visible.sync="dialogLocation"
:append-to-body="true"
:modal="false"
v-dialogDrag
>
- <ReportLocation @locationClick="getlocaltionClick"></ReportLocation>
+ <ReportLocation></ReportLocation>
</el-dialog>
</div>
</template>
@@ -328,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) {
@@ -367,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)
}
}
}
@@ -384,7 +381,7 @@
/* margin-left: 6.4rem !important;*/
/*}*/
- /deep/ .el-dialog--center {
+ /deep/ .event-report-dialog {
left: 5rem;
top: 1rem;
margin-top: 2rem;
@@ -392,6 +389,8 @@
}
/deep/ .el-dialog {
+ left: 5rem;
+ top: 1rem;
width: 3.087834rem;
}
--
Gitblit v1.8.0