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

src/views/firefighting/alarm/alarmDeviceMaintenance/components/list.vue

@@ -222,7 +222,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {

src/views/firefighting/alarm/alarmInfomation/components/infoList.vue

@@ -191,7 +191,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {

src/views/firefighting/alarm/alarmInfomation/components/list.vue

@@ -193,7 +193,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {

src/views/firefighting/alarm/alarmVideo/components/alarmInfoList.vue

@@ -130,7 +130,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {

src/views/firefighting/alarm/alarmVideo/components/list.vue

@@ -193,7 +193,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {

src/views/firefighting/alarm/index.vue

@@ -0,0 +1,4 @@
+<template>
+  <router-view/>
+</template>
+

src/views/firefighting/firecontrol/fireReport/components/fireControlRoom.vue

@@ -58,7 +58,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },

src/views/firefighting/firecontrol/fireReport/components/firePumpRoom.vue

@@ -58,7 +58,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },

src/views/firefighting/firecontrol/fireReport/components/fireResources.vue

@@ -58,7 +58,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },

src/views/firefighting/firecontrol/firepumproom/components/list.vue

@@ -257,7 +257,7 @@ import { requestFN } from '@/utils/request'
 import { upload } from '@/utils/upload'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },

src/views/firefighting/firecontrol/firerescueteam/components/list.vue

@@ -168,7 +168,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },

src/views/firefighting/firecontrol/fireresources/components/list.vue

@@ -204,7 +204,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },

src/views/firefighting/firecontrol/firewatersource/components/list.vue

@@ -176,7 +176,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },

src/views/firefighting/firecontrol/index.vue

@@ -0,0 +1,4 @@
+<template>
+  <router-view/>
+</template>
+