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

XingChuan

2021-05-30 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936

 src/components/base-page/enterprise-emergency/discard/ReportIncident.vue

File was renamed from src/components/base-page/enterprise-emergency/ReportIncident.vue
@@ -70,7 +70,7 @@
                                    <!--                                       @click="locationInfo"></el-button>-->
                                    <el-button style="padding-right:10px;" slot="suffix" type="text"
                                               @click="locationInfo">
                                        <img src="../../../../public/assets/images/map/loc.png" alt="">
                                        <img src="../../../../../public/assets/images/map/loc.png" alt="">
                                    </el-button>
                                </el-input>
                            </el-form-item>
@@ -148,8 +148,8 @@
    </div>
</template>
<script>
import '../../../utils/dragBoxes'
import eventBus from '../../../eventBus'
import '../../../../utils/dragBoxes'
import eventBus from '../../../../eventBus'
// 引入组件
import PositionChange from './PositionChange'
import PipelineFile from './PipelineFile'