diff --git "a/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..6a43216
--- /dev/null
+++ "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..6a43216
--- /dev/null
+++ "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..a6b2946
--- /dev/null
+++ "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..6a43216
--- /dev/null
+++ "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..a6b2946
--- /dev/null
+++ "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png" "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..7588c47
--- /dev/null
+++ "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..6a43216
--- /dev/null
+++ "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..a6b2946
--- /dev/null
+++ "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png" "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..7588c47
--- /dev/null
+++ "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
Binary files differ
diff --git a/src/api/home/pipeline/pipeline.ts b/src/api/home/pipeline/pipeline.ts
new file mode 100644
index 0000000..e9c7b38
--- /dev/null
+++ b/src/api/home/pipeline/pipeline.ts
@@ -0,0 +1,61 @@
+/**
+ * 管线监测
+ */
+import request from '@/api/index'
+
+// 基础列表 -分页
+export function getPipelineListPage(data: any) {
+ return request({
+ url: `/monitor/pipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 基础列表 -不分页
+export function getPipelineList(data: any) {
+ return request({
+ url: '/monitor/pipe/pipeList',
+ method: 'post',
+ data,
+ })
+}
+
+// 设备列表 -不分页
+export function getPipelineDeviceList(data: any) {
+ return request({
+ url: '/monitor/pipe/deviceList',
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function getPipelineDetail(data: any) {
+ return request({
+ url: '/monitor/pipe/detail',
+ method: 'post',
+ data,
+ })
+}
+
+// 监测数据
+export function getMonitorData(data: any) {
+ return request({
+ url: '/monitor/pipe/watchDataByPipe',
+ method: 'post',
+ data,
+ })
+}
+
+// 编辑
+export function editPipeline(data: any) {
+ return request({
+ url: '/system/busLedger/addRemark',
+ method: 'post',
+ data: {
+ ...data,
+ type: '3',
+ },
+ })
+}
diff --git "a/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..6a43216
--- /dev/null
+++ "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..a6b2946
--- /dev/null
+++ "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png" "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..7588c47
--- /dev/null
+++ "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
Binary files differ
diff --git a/src/api/home/pipeline/pipeline.ts b/src/api/home/pipeline/pipeline.ts
new file mode 100644
index 0000000..e9c7b38
--- /dev/null
+++ b/src/api/home/pipeline/pipeline.ts
@@ -0,0 +1,61 @@
+/**
+ * 管线监测
+ */
+import request from '@/api/index'
+
+// 基础列表 -分页
+export function getPipelineListPage(data: any) {
+ return request({
+ url: `/monitor/pipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 基础列表 -不分页
+export function getPipelineList(data: any) {
+ return request({
+ url: '/monitor/pipe/pipeList',
+ method: 'post',
+ data,
+ })
+}
+
+// 设备列表 -不分页
+export function getPipelineDeviceList(data: any) {
+ return request({
+ url: '/monitor/pipe/deviceList',
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function getPipelineDetail(data: any) {
+ return request({
+ url: '/monitor/pipe/detail',
+ method: 'post',
+ data,
+ })
+}
+
+// 监测数据
+export function getMonitorData(data: any) {
+ return request({
+ url: '/monitor/pipe/watchDataByPipe',
+ method: 'post',
+ data,
+ })
+}
+
+// 编辑
+export function editPipeline(data: any) {
+ return request({
+ url: '/system/busLedger/addRemark',
+ method: 'post',
+ data: {
+ ...data,
+ type: '3',
+ },
+ })
+}
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 20fb0cc..41a546b 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -9,70 +9,68 @@
const infoWindow = ref()
// 基本数据
const baseInfo = ref({
- ledgerCode: '', // 场站编号
- ledgerName: '', // 场站名称
- lngGaode: '',
- latGaode: '',
+ deviceTypeName: '', // 场站编号
+ deviceCode: '', // 场站名称
})
// 详细信息
const detailInfo = ref<{ [key: string]: string }>({})
// 描述列表数据
const descriptionsList = ref([
{
- text: '场站位号',
- value: '',
+ text: '安装位号',
+ value: 'tagNumber',
align: 'center',
},
{
- text: '使用状态',
- value: '',
+ text: '管线编号',
+ value: 'pipeCode',
align: 'center',
},
- {
- text: '产权单位',
- value: '',
- align: 'center',
- },
- {
- text: '联系人',
- value: '',
- align: 'center',
- },
- {
- text: '管理单位',
- value: '',
- align: 'center',
- },
- {
- text: '管理方式',
- value: '',
- align: 'center',
- },
- {
- text: '负责人',
- value: '',
- align: 'center',
- },
- {
- text: '联系方式',
- value: '',
- align: 'center',
- },
- {
- text: '所在区域',
- value: '',
- align: 'center',
- },
- {
- text: '详细位置',
- value: '',
- align: 'center',
- },
- {
- text: '标签',
- value: '',
- align: 'center',
- },
+ // {
+ // text: '产权单位',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '联系人',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '管理单位',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '管理方式',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '负责人',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '联系方式',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '所在区域',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '详细位置',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '标签',
+ // value: '',
+ // align: 'center',
+ // },
])
// 初始化
const initDialog = (e: any) => {
@@ -85,6 +83,7 @@
e.map.setZoom(15)
}
// 获取详细信息
+ detailInfo.value = e.info.row
}
// 关闭
@@ -99,10 +98,10 @@
{ }">
@@ -131,7 +130,7 @@
}
.container {
- width: 500px;
+ // width: 500px;
// padding: 0 10px;
background: rgba($color: #feffff, $alpha: 95%);
border: 1.5px solid #79b5e6;
diff --git "a/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..6a43216
--- /dev/null
+++ "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..a6b2946
--- /dev/null
+++ "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png" "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..7588c47
--- /dev/null
+++ "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
Binary files differ
diff --git a/src/api/home/pipeline/pipeline.ts b/src/api/home/pipeline/pipeline.ts
new file mode 100644
index 0000000..e9c7b38
--- /dev/null
+++ b/src/api/home/pipeline/pipeline.ts
@@ -0,0 +1,61 @@
+/**
+ * 管线监测
+ */
+import request from '@/api/index'
+
+// 基础列表 -分页
+export function getPipelineListPage(data: any) {
+ return request({
+ url: `/monitor/pipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 基础列表 -不分页
+export function getPipelineList(data: any) {
+ return request({
+ url: '/monitor/pipe/pipeList',
+ method: 'post',
+ data,
+ })
+}
+
+// 设备列表 -不分页
+export function getPipelineDeviceList(data: any) {
+ return request({
+ url: '/monitor/pipe/deviceList',
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function getPipelineDetail(data: any) {
+ return request({
+ url: '/monitor/pipe/detail',
+ method: 'post',
+ data,
+ })
+}
+
+// 监测数据
+export function getMonitorData(data: any) {
+ return request({
+ url: '/monitor/pipe/watchDataByPipe',
+ method: 'post',
+ data,
+ })
+}
+
+// 编辑
+export function editPipeline(data: any) {
+ return request({
+ url: '/system/busLedger/addRemark',
+ method: 'post',
+ data: {
+ ...data,
+ type: '3',
+ },
+ })
+}
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 20fb0cc..41a546b 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -9,70 +9,68 @@
const infoWindow = ref()
// 基本数据
const baseInfo = ref({
- ledgerCode: '', // 场站编号
- ledgerName: '', // 场站名称
- lngGaode: '',
- latGaode: '',
+ deviceTypeName: '', // 场站编号
+ deviceCode: '', // 场站名称
})
// 详细信息
const detailInfo = ref<{ [key: string]: string }>({})
// 描述列表数据
const descriptionsList = ref([
{
- text: '场站位号',
- value: '',
+ text: '安装位号',
+ value: 'tagNumber',
align: 'center',
},
{
- text: '使用状态',
- value: '',
+ text: '管线编号',
+ value: 'pipeCode',
align: 'center',
},
- {
- text: '产权单位',
- value: '',
- align: 'center',
- },
- {
- text: '联系人',
- value: '',
- align: 'center',
- },
- {
- text: '管理单位',
- value: '',
- align: 'center',
- },
- {
- text: '管理方式',
- value: '',
- align: 'center',
- },
- {
- text: '负责人',
- value: '',
- align: 'center',
- },
- {
- text: '联系方式',
- value: '',
- align: 'center',
- },
- {
- text: '所在区域',
- value: '',
- align: 'center',
- },
- {
- text: '详细位置',
- value: '',
- align: 'center',
- },
- {
- text: '标签',
- value: '',
- align: 'center',
- },
+ // {
+ // text: '产权单位',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '联系人',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '管理单位',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '管理方式',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '负责人',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '联系方式',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '所在区域',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '详细位置',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '标签',
+ // value: '',
+ // align: 'center',
+ // },
])
// 初始化
const initDialog = (e: any) => {
@@ -85,6 +83,7 @@
e.map.setZoom(15)
}
// 获取详细信息
+ detailInfo.value = e.info.row
}
// 关闭
@@ -99,10 +98,10 @@
{ }">
@@ -131,7 +130,7 @@
}
.container {
- width: 500px;
+ // width: 500px;
// padding: 0 10px;
background: rgba($color: #feffff, $alpha: 95%);
border: 1.5px solid #79b5e6;
diff --git a/src/views/home/pipeline/components/editDialog.vue b/src/views/home/pipeline/components/editDialog.vue
new file mode 100644
index 0000000..d7af0c4
--- /dev/null
+++ b/src/views/home/pipeline/components/editDialog.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git "a/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..6a43216
--- /dev/null
+++ "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..a6b2946
--- /dev/null
+++ "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png" "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..7588c47
--- /dev/null
+++ "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
Binary files differ
diff --git a/src/api/home/pipeline/pipeline.ts b/src/api/home/pipeline/pipeline.ts
new file mode 100644
index 0000000..e9c7b38
--- /dev/null
+++ b/src/api/home/pipeline/pipeline.ts
@@ -0,0 +1,61 @@
+/**
+ * 管线监测
+ */
+import request from '@/api/index'
+
+// 基础列表 -分页
+export function getPipelineListPage(data: any) {
+ return request({
+ url: `/monitor/pipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 基础列表 -不分页
+export function getPipelineList(data: any) {
+ return request({
+ url: '/monitor/pipe/pipeList',
+ method: 'post',
+ data,
+ })
+}
+
+// 设备列表 -不分页
+export function getPipelineDeviceList(data: any) {
+ return request({
+ url: '/monitor/pipe/deviceList',
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function getPipelineDetail(data: any) {
+ return request({
+ url: '/monitor/pipe/detail',
+ method: 'post',
+ data,
+ })
+}
+
+// 监测数据
+export function getMonitorData(data: any) {
+ return request({
+ url: '/monitor/pipe/watchDataByPipe',
+ method: 'post',
+ data,
+ })
+}
+
+// 编辑
+export function editPipeline(data: any) {
+ return request({
+ url: '/system/busLedger/addRemark',
+ method: 'post',
+ data: {
+ ...data,
+ type: '3',
+ },
+ })
+}
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 20fb0cc..41a546b 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -9,70 +9,68 @@
const infoWindow = ref()
// 基本数据
const baseInfo = ref({
- ledgerCode: '', // 场站编号
- ledgerName: '', // 场站名称
- lngGaode: '',
- latGaode: '',
+ deviceTypeName: '', // 场站编号
+ deviceCode: '', // 场站名称
})
// 详细信息
const detailInfo = ref<{ [key: string]: string }>({})
// 描述列表数据
const descriptionsList = ref([
{
- text: '场站位号',
- value: '',
+ text: '安装位号',
+ value: 'tagNumber',
align: 'center',
},
{
- text: '使用状态',
- value: '',
+ text: '管线编号',
+ value: 'pipeCode',
align: 'center',
},
- {
- text: '产权单位',
- value: '',
- align: 'center',
- },
- {
- text: '联系人',
- value: '',
- align: 'center',
- },
- {
- text: '管理单位',
- value: '',
- align: 'center',
- },
- {
- text: '管理方式',
- value: '',
- align: 'center',
- },
- {
- text: '负责人',
- value: '',
- align: 'center',
- },
- {
- text: '联系方式',
- value: '',
- align: 'center',
- },
- {
- text: '所在区域',
- value: '',
- align: 'center',
- },
- {
- text: '详细位置',
- value: '',
- align: 'center',
- },
- {
- text: '标签',
- value: '',
- align: 'center',
- },
+ // {
+ // text: '产权单位',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '联系人',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '管理单位',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '管理方式',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '负责人',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '联系方式',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '所在区域',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '详细位置',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '标签',
+ // value: '',
+ // align: 'center',
+ // },
])
// 初始化
const initDialog = (e: any) => {
@@ -85,6 +83,7 @@
e.map.setZoom(15)
}
// 获取详细信息
+ detailInfo.value = e.info.row
}
// 关闭
@@ -99,10 +98,10 @@
{ }">
@@ -131,7 +130,7 @@
}
.container {
- width: 500px;
+ // width: 500px;
// padding: 0 10px;
background: rgba($color: #feffff, $alpha: 95%);
border: 1.5px solid #79b5e6;
diff --git a/src/views/home/pipeline/components/editDialog.vue b/src/views/home/pipeline/components/editDialog.vue
new file mode 100644
index 0000000..d7af0c4
--- /dev/null
+++ b/src/views/home/pipeline/components/editDialog.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index f11d959..5c72f95 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -12,39 +12,40 @@
type: Number,
default: 0,
},
+ // 点位数据
data: {
type: Array,
default: () => ([]),
},
+ // 管线数据
+ pipe: {
+ type: Array,
+ default: () => ([]),
+ },
})
// 地图实例
const mapRef = ref()
const publicPath = window.location.origin
// console.log(publicPath, 'publicPath')
// 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['管网哨兵', '智能警示桩'])
// 地图图例数据
const legendData = ref([
{
- name: '正常',
- url: `${publicPath}/image/station/场站-正常.png`,
- value: '1',
+ name: '管网哨兵',
+ url: `${publicPath}/image/pipeline/地埋式哨兵-正常.png`,
+ value: '管网哨兵',
},
{
- name: '异常',
- url: `${publicPath}/image/station/场站-异常.png`,
- value: '2',
+ name: '智能警示桩',
+ url: `${publicPath}/image/pipeline/警示桩-正常.png`,
+ value: '智能警示桩',
},
- {
- name: '离线',
- url: `${publicPath}/image/station/场站-离线.png`,
- value: '3',
- },
- {
- name: '未监控',
- url: `${publicPath}/image/station/场站-未部署.png`,
- value: '0',
- },
+ // {
+ // name: '离线',
+ // url: `${publicPath}/image/station/场站-离线.png`,
+ // value: '3',
+ // },
])
// 控制图例
const clickLegend = (type: string) => {
@@ -62,51 +63,43 @@
const drawMarker = () => {
const style = [
{
- url: `${publicPath}/image/station/场站-正常.png`, // 图标地址
+ url: `${publicPath}/image/pipeline/地埋式哨兵-正常.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
{
- url: `${publicPath}/image/station/场站-异常.png`, // 图标地址
+ url: `${publicPath}/image/pipeline/警示桩-正常.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
- {
- url: `${publicPath}/image/station/场站-离线.png`, // 图标地址
- anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
- size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
- zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
- },
- {
- url: `${publicPath}/image/station/场站-未部署.png`, // 图标地址
- anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
- size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
- zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
- },
+ // {
+ // url: `${publicPath}/image/pipeline/场站-离线.png`, // 图标地址
+ // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
+ // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+ // zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
+ // },
]
// (0:未监控,1:正常,2:异常,3:离线)
const styleDict = {
- 0: 3,
- 1: 0,
- 2: 1,
- 3: 2,
+ 管网哨兵: 0,
+ 智能警示桩: 1,
} as { [key: string]: number }
- const data = $props.data.map((item: any) => ({ ...item, monitorState: item.monitorState || '0' })).filter((item: any) => legendShowData.value.includes(item.monitorState)).filter((item: any) => item.lngGaode && item.latGaode).map((item: any) => ({
- lnglat: [item.lngGaode, item.latGaode],
- name: item.ledgerName,
- style: item.monitorState ? styleDict[item.monitorState] : 3,
- id: item.id,
+ const data = $props.data.filter((item: any) => legendShowData.value.includes(item.deviceTypeName)).filter((item: any) => item.lng && item.lat && item.deviceTypeName).map((item: any) => ({
+ lnglat: [item.lng, item.lat],
+ name: item.deviceTypeName,
+ style: styleDict[item.deviceTypeName] || 0,
+ id: item.deviceCode,
row: item,
}))
+ console.log(data, '绘制标记点')
mapRef.value.addMassMarks({
path: data,
zIndex: 111,
zooms: [3, 20],
style,
})
- //
if (pageIsFirst.value) {
mapRef.value.map.setCenter([116.397428, 39.90923])
}
@@ -115,6 +108,22 @@
}
mapRef.value.map.setZoom(10.5)
}
+// 绘制线
+const drawLine = () => {
+ const data = $props.pipe.filter((item: any) => item.endLat && item.endLng && item.startLng && item.startLat && item.pipeCode)
+ console.log(data, '准备绘制线')
+ data.forEach((item: any) => {
+ mapRef.value.addPolyline({
+ path: [[item.startLng, item.startLat], [item.endLng, item.endLat]],
+ style: {
+ strokeColor: '#BAAF04',
+ strokeWeight: 4,
+ strokeStyle: 'solid',
+ zIndex: 95,
+ },
+ })
+ })
+}
// 点标记弹窗
const detail = ref()
const detailRef = ref()
@@ -139,6 +148,7 @@
})
setTimeout(() => {
// mapRef.value.map.setZoom(14)
+ // mapRef.value.map.setFitView()
mapRef.value.map.setCenter(data.event.data.lnglat)
})
}
@@ -166,7 +176,7 @@
mapRef.value.map.setCenter(data.lnglat)
})
}
-
+// 重置标记点
function resetDraw() {
mapRef.value.removeMassMarks()
if (detailRef.value) {
@@ -177,13 +187,31 @@
drawMarker()
}
}
+// 重置线
+function resetDrawLine() {
+ mapRef.value.removePolyline()
+ if (detailRef.value) {
+ detailRef.value.close()
+ }
+ if ($props.pipe) {
+ // 清空闲重新绘制
+ drawLine()
+ }
+}
+
// 地图绘制完毕
const completeMap = () => {
console.log('地图绘制完毕')
// 绘制海量点
resetDraw()
+ clickLegend('智能警示桩')
+ setTimeout(() => {
+ clickLegend('智能警示桩')
+ })
+ // 绘制线
+ resetDrawLine()
}
-defineExpose({ openInfoDetail, drawMarker, resetDraw })
+defineExpose({ openInfoDetail, drawMarker, resetDraw, drawLine, resetDrawLine })
@@ -193,13 +221,13 @@
-
+
diff --git "a/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..6a43216
--- /dev/null
+++ "b/public/image/pipeline/\345\234\260\345\237\213\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png" "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..a6b2946
--- /dev/null
+++ "b/public/image/pipeline/\346\241\251\345\274\217\345\223\250\345\205\265-\346\255\243\345\270\270.png"
Binary files differ
diff --git "a/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png" "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
new file mode 100644
index 0000000..7588c47
--- /dev/null
+++ "b/public/image/pipeline/\350\255\246\347\244\272\346\241\251-\346\255\243\345\270\270.png"
Binary files differ
diff --git a/src/api/home/pipeline/pipeline.ts b/src/api/home/pipeline/pipeline.ts
new file mode 100644
index 0000000..e9c7b38
--- /dev/null
+++ b/src/api/home/pipeline/pipeline.ts
@@ -0,0 +1,61 @@
+/**
+ * 管线监测
+ */
+import request from '@/api/index'
+
+// 基础列表 -分页
+export function getPipelineListPage(data: any) {
+ return request({
+ url: `/monitor/pipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 基础列表 -不分页
+export function getPipelineList(data: any) {
+ return request({
+ url: '/monitor/pipe/pipeList',
+ method: 'post',
+ data,
+ })
+}
+
+// 设备列表 -不分页
+export function getPipelineDeviceList(data: any) {
+ return request({
+ url: '/monitor/pipe/deviceList',
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function getPipelineDetail(data: any) {
+ return request({
+ url: '/monitor/pipe/detail',
+ method: 'post',
+ data,
+ })
+}
+
+// 监测数据
+export function getMonitorData(data: any) {
+ return request({
+ url: '/monitor/pipe/watchDataByPipe',
+ method: 'post',
+ data,
+ })
+}
+
+// 编辑
+export function editPipeline(data: any) {
+ return request({
+ url: '/system/busLedger/addRemark',
+ method: 'post',
+ data: {
+ ...data,
+ type: '3',
+ },
+ })
+}
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 20fb0cc..41a546b 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -9,70 +9,68 @@
const infoWindow = ref()
// 基本数据
const baseInfo = ref({
- ledgerCode: '', // 场站编号
- ledgerName: '', // 场站名称
- lngGaode: '',
- latGaode: '',
+ deviceTypeName: '', // 场站编号
+ deviceCode: '', // 场站名称
})
// 详细信息
const detailInfo = ref<{ [key: string]: string }>({})
// 描述列表数据
const descriptionsList = ref([
{
- text: '场站位号',
- value: '',
+ text: '安装位号',
+ value: 'tagNumber',
align: 'center',
},
{
- text: '使用状态',
- value: '',
+ text: '管线编号',
+ value: 'pipeCode',
align: 'center',
},
- {
- text: '产权单位',
- value: '',
- align: 'center',
- },
- {
- text: '联系人',
- value: '',
- align: 'center',
- },
- {
- text: '管理单位',
- value: '',
- align: 'center',
- },
- {
- text: '管理方式',
- value: '',
- align: 'center',
- },
- {
- text: '负责人',
- value: '',
- align: 'center',
- },
- {
- text: '联系方式',
- value: '',
- align: 'center',
- },
- {
- text: '所在区域',
- value: '',
- align: 'center',
- },
- {
- text: '详细位置',
- value: '',
- align: 'center',
- },
- {
- text: '标签',
- value: '',
- align: 'center',
- },
+ // {
+ // text: '产权单位',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '联系人',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '管理单位',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '管理方式',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '负责人',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '联系方式',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '所在区域',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '详细位置',
+ // value: '',
+ // align: 'center',
+ // },
+ // {
+ // text: '标签',
+ // value: '',
+ // align: 'center',
+ // },
])
// 初始化
const initDialog = (e: any) => {
@@ -85,6 +83,7 @@
e.map.setZoom(15)
}
// 获取详细信息
+ detailInfo.value = e.info.row
}
// 关闭
@@ -99,10 +98,10 @@
{ }">
@@ -131,7 +130,7 @@
}
.container {
- width: 500px;
+ // width: 500px;
// padding: 0 10px;
background: rgba($color: #feffff, $alpha: 95%);
border: 1.5px solid #79b5e6;
diff --git a/src/views/home/pipeline/components/editDialog.vue b/src/views/home/pipeline/components/editDialog.vue
new file mode 100644
index 0000000..d7af0c4
--- /dev/null
+++ b/src/views/home/pipeline/components/editDialog.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index f11d959..5c72f95 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -12,39 +12,40 @@
type: Number,
default: 0,
},
+ // 点位数据
data: {
type: Array,
default: () => ([]),
},
+ // 管线数据
+ pipe: {
+ type: Array,
+ default: () => ([]),
+ },
})
// 地图实例
const mapRef = ref()
const publicPath = window.location.origin
// console.log(publicPath, 'publicPath')
// 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['管网哨兵', '智能警示桩'])
// 地图图例数据
const legendData = ref([
{
- name: '正常',
- url: `${publicPath}/image/station/场站-正常.png`,
- value: '1',
+ name: '管网哨兵',
+ url: `${publicPath}/image/pipeline/地埋式哨兵-正常.png`,
+ value: '管网哨兵',
},
{
- name: '异常',
- url: `${publicPath}/image/station/场站-异常.png`,
- value: '2',
+ name: '智能警示桩',
+ url: `${publicPath}/image/pipeline/警示桩-正常.png`,
+ value: '智能警示桩',
},
- {
- name: '离线',
- url: `${publicPath}/image/station/场站-离线.png`,
- value: '3',
- },
- {
- name: '未监控',
- url: `${publicPath}/image/station/场站-未部署.png`,
- value: '0',
- },
+ // {
+ // name: '离线',
+ // url: `${publicPath}/image/station/场站-离线.png`,
+ // value: '3',
+ // },
])
// 控制图例
const clickLegend = (type: string) => {
@@ -62,51 +63,43 @@
const drawMarker = () => {
const style = [
{
- url: `${publicPath}/image/station/场站-正常.png`, // 图标地址
+ url: `${publicPath}/image/pipeline/地埋式哨兵-正常.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
{
- url: `${publicPath}/image/station/场站-异常.png`, // 图标地址
+ url: `${publicPath}/image/pipeline/警示桩-正常.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
- {
- url: `${publicPath}/image/station/场站-离线.png`, // 图标地址
- anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
- size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
- zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
- },
- {
- url: `${publicPath}/image/station/场站-未部署.png`, // 图标地址
- anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
- size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
- zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
- },
+ // {
+ // url: `${publicPath}/image/pipeline/场站-离线.png`, // 图标地址
+ // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
+ // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+ // zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
+ // },
]
// (0:未监控,1:正常,2:异常,3:离线)
const styleDict = {
- 0: 3,
- 1: 0,
- 2: 1,
- 3: 2,
+ 管网哨兵: 0,
+ 智能警示桩: 1,
} as { [key: string]: number }
- const data = $props.data.map((item: any) => ({ ...item, monitorState: item.monitorState || '0' })).filter((item: any) => legendShowData.value.includes(item.monitorState)).filter((item: any) => item.lngGaode && item.latGaode).map((item: any) => ({
- lnglat: [item.lngGaode, item.latGaode],
- name: item.ledgerName,
- style: item.monitorState ? styleDict[item.monitorState] : 3,
- id: item.id,
+ const data = $props.data.filter((item: any) => legendShowData.value.includes(item.deviceTypeName)).filter((item: any) => item.lng && item.lat && item.deviceTypeName).map((item: any) => ({
+ lnglat: [item.lng, item.lat],
+ name: item.deviceTypeName,
+ style: styleDict[item.deviceTypeName] || 0,
+ id: item.deviceCode,
row: item,
}))
+ console.log(data, '绘制标记点')
mapRef.value.addMassMarks({
path: data,
zIndex: 111,
zooms: [3, 20],
style,
})
- //
if (pageIsFirst.value) {
mapRef.value.map.setCenter([116.397428, 39.90923])
}
@@ -115,6 +108,22 @@
}
mapRef.value.map.setZoom(10.5)
}
+// 绘制线
+const drawLine = () => {
+ const data = $props.pipe.filter((item: any) => item.endLat && item.endLng && item.startLng && item.startLat && item.pipeCode)
+ console.log(data, '准备绘制线')
+ data.forEach((item: any) => {
+ mapRef.value.addPolyline({
+ path: [[item.startLng, item.startLat], [item.endLng, item.endLat]],
+ style: {
+ strokeColor: '#BAAF04',
+ strokeWeight: 4,
+ strokeStyle: 'solid',
+ zIndex: 95,
+ },
+ })
+ })
+}
// 点标记弹窗
const detail = ref()
const detailRef = ref()
@@ -139,6 +148,7 @@
})
setTimeout(() => {
// mapRef.value.map.setZoom(14)
+ // mapRef.value.map.setFitView()
mapRef.value.map.setCenter(data.event.data.lnglat)
})
}
@@ -166,7 +176,7 @@
mapRef.value.map.setCenter(data.lnglat)
})
}
-
+// 重置标记点
function resetDraw() {
mapRef.value.removeMassMarks()
if (detailRef.value) {
@@ -177,13 +187,31 @@
drawMarker()
}
}
+// 重置线
+function resetDrawLine() {
+ mapRef.value.removePolyline()
+ if (detailRef.value) {
+ detailRef.value.close()
+ }
+ if ($props.pipe) {
+ // 清空闲重新绘制
+ drawLine()
+ }
+}
+
// 地图绘制完毕
const completeMap = () => {
console.log('地图绘制完毕')
// 绘制海量点
resetDraw()
+ clickLegend('智能警示桩')
+ setTimeout(() => {
+ clickLegend('智能警示桩')
+ })
+ // 绘制线
+ resetDrawLine()
}
-defineExpose({ openInfoDetail, drawMarker, resetDraw })
+defineExpose({ openInfoDetail, drawMarker, resetDraw, drawLine, resetDrawLine })
@@ -193,13 +221,13 @@
-
+
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9d57f42..87da946 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -7,7 +7,8 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import { ArrowUpBold } from '@element-plus/icons-vue'
import MapCom from './components/map.vue'
-// import { getStationList, getStationListPage } from '@/api/home/station/station'
+import editDialog from './components/editDialog.vue'
+import { getPipelineDeviceList, getPipelineList, getPipelineListPage } from '@/api/home/pipeline/pipeline'
import { getDictByCode } from '@/api/system/dict'
// 表格标识 地图或普通
const mapRef = ref()
@@ -18,21 +19,21 @@
const total = ref(0)
// 地图数据
const mapList = ref([])
-
+const pipeData = ref([])
// 初始展示列
const columns = ref