diff --git a/src/components.d.ts b/src/components.d.ts index f6461ac..481c1e9 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -44,6 +44,7 @@ InfoDialog: typeof import('./components/map/infoDialog.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] Map: typeof import('./components/map/Map.vue')['default'] + MarkerMap: typeof import('./components/map/markerMap.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components.d.ts b/src/components.d.ts index f6461ac..481c1e9 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -44,6 +44,7 @@ InfoDialog: typeof import('./components/map/infoDialog.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] Map: typeof import('./components/map/Map.vue')['default'] + MarkerMap: typeof import('./components/map/markerMap.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/markerMap.vue b/src/components/map/markerMap.vue new file mode 100644 index 0000000..470a26d --- /dev/null +++ b/src/components/map/markerMap.vue @@ -0,0 +1,225 @@ + + + + + + + + diff --git a/src/components.d.ts b/src/components.d.ts index f6461ac..481c1e9 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -44,6 +44,7 @@ InfoDialog: typeof import('./components/map/infoDialog.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] Map: typeof import('./components/map/Map.vue')['default'] + MarkerMap: typeof import('./components/map/markerMap.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/markerMap.vue b/src/components/map/markerMap.vue new file mode 100644 index 0000000..470a26d --- /dev/null +++ b/src/components/map/markerMap.vue @@ -0,0 +1,225 @@ + + + + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 2f63cb0..77248f0 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -370,7 +370,14 @@ diff --git a/src/components.d.ts b/src/components.d.ts index f6461ac..481c1e9 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -44,6 +44,7 @@ InfoDialog: typeof import('./components/map/infoDialog.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] Map: typeof import('./components/map/Map.vue')['default'] + MarkerMap: typeof import('./components/map/markerMap.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/markerMap.vue b/src/components/map/markerMap.vue new file mode 100644 index 0000000..470a26d --- /dev/null +++ b/src/components/map/markerMap.vue @@ -0,0 +1,225 @@ + + + + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 2f63cb0..77248f0 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -370,7 +370,14 @@ diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue new file mode 100644 index 0000000..31d6a63 --- /dev/null +++ b/src/views/main/database/detail.vue @@ -0,0 +1,391 @@ + + + + + + + diff --git a/src/components.d.ts b/src/components.d.ts index f6461ac..481c1e9 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -44,6 +44,7 @@ InfoDialog: typeof import('./components/map/infoDialog.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] Map: typeof import('./components/map/Map.vue')['default'] + MarkerMap: typeof import('./components/map/markerMap.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/markerMap.vue b/src/components/map/markerMap.vue new file mode 100644 index 0000000..470a26d --- /dev/null +++ b/src/components/map/markerMap.vue @@ -0,0 +1,225 @@ + + + + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 2f63cb0..77248f0 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -370,7 +370,14 @@ diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue new file mode 100644 index 0000000..31d6a63 --- /dev/null +++ b/src/views/main/database/detail.vue @@ -0,0 +1,391 @@ + + + + + + + diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue index 2d4fb82..eece6ad 100644 --- a/src/views/main/database/index.vue +++ b/src/views/main/database/index.vue @@ -4,6 +4,7 @@ import type { Ref } from 'vue' import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import type { DateModelType } from 'element-plus' +import detailDialog from './detail.vue' import type { dictType } from '@/global' import { getDictByCode } from '@/api/system/dict' import { exportFile } from '@/utils/exportUtils' @@ -121,11 +122,10 @@ fetchData(true) } -// 详情 -const detailRef = ref() +// 编辑 +const handlerRef = ref() const handler = (type: string, row: any) => { - // $router.push({ path: `/gasAlarm/${pageType}/${row.id}` }) - detailRef.value.initDialog(row) + handlerRef.value.initDialog(type, row) } // 处置报警 const alarmRef = ref() @@ -151,6 +151,8 @@