Merge remote-tracking branch 'origin/dev' into dev

src/views/emergencyCommandMap/LeftSection/AssociatedEvent.vue

@@ -1,5 +1,7 @@
 <template>
-  <Dialog custom-show type="sm" :title="title" confirm-text="关联事件" confirm-class="common-btn-danger" @close="closeDialog" @confirm="submitEvent">
+  <Dialog custom-show type="sm" :title="title" confirm-text="关联事件" confirm-class="common-btn-danger" @close="closeDialog" @confirm="submitEvent"
+    style="height: 500px"
+  >
     <el-form ref="eventFormRef" :model="form" :rules="rules" label-width="190px">
       <el-form-item label="灾害事件" prop="event_title">
         <el-select
@@ -171,6 +173,12 @@ const selectEvent = (eventTitle) => {
 </script>
 
 <style lang="scss" scoped>
+:deep(.dialog-content) {
+  overflow: unset !important;
+}
+:deep(.el-form-item__label) {
+  color: #fff !important;
+}
 .dialog-footer {
   height: 150px;
   display: flex;

src/views/emergencyCommandMap/LeftSection/CloseCommand.vue

@@ -7,6 +7,7 @@
     confirm-class="common-btn-danger"
     @close="closeDialog"
     @confirm="endProcess"
+    style="height: 500px"
   >
     <el-form v-if="!props.flag" ref="eventFormRef" :model="form" :rules="rules" label-width="190px">
       <el-form-item label="灾害事件" prop="event_title">
@@ -295,6 +296,12 @@ const selectEvent = (eventTitle) => {
 };
 </script>
 <style lang="scss" scoped>
+:deep(.dialog-content) {
+  overflow: unset !important;
+}
+:deep(.el-form-item__label) {
+  color: #fff !important;
+}
 .dialog-footer {
   height: 150px;
   display: flex;