diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + 燃气物联感知平台-北燃闸井产品化 +

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/result.vue b/src/views/mobile/info/result.vue new file mode 100644 index 0000000..895ef64 --- /dev/null +++ b/src/views/mobile/info/result.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/result.vue b/src/views/mobile/info/result.vue new file mode 100644 index 0000000..895ef64 --- /dev/null +++ b/src/views/mobile/info/result.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/search.vue b/src/views/mobile/info/search.vue new file mode 100644 index 0000000..e98fed6 --- /dev/null +++ b/src/views/mobile/info/search.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/result.vue b/src/views/mobile/info/result.vue new file mode 100644 index 0000000..895ef64 --- /dev/null +++ b/src/views/mobile/info/result.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/search.vue b/src/views/mobile/info/search.vue new file mode 100644 index 0000000..e98fed6 --- /dev/null +++ b/src/views/mobile/info/search.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue new file mode 100644 index 0000000..5f7ec74 --- /dev/null +++ b/src/views/mobile/operation/data.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/result.vue b/src/views/mobile/info/result.vue new file mode 100644 index 0000000..895ef64 --- /dev/null +++ b/src/views/mobile/info/result.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/search.vue b/src/views/mobile/info/search.vue new file mode 100644 index 0000000..e98fed6 --- /dev/null +++ b/src/views/mobile/info/search.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue new file mode 100644 index 0000000..5f7ec74 --- /dev/null +++ b/src/views/mobile/operation/data.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue new file mode 100644 index 0000000..ac3bd92 --- /dev/null +++ b/src/views/mobile/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/result.vue b/src/views/mobile/info/result.vue new file mode 100644 index 0000000..895ef64 --- /dev/null +++ b/src/views/mobile/info/result.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/search.vue b/src/views/mobile/info/search.vue new file mode 100644 index 0000000..e98fed6 --- /dev/null +++ b/src/views/mobile/info/search.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue new file mode 100644 index 0000000..5f7ec74 --- /dev/null +++ b/src/views/mobile/operation/data.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue new file mode 100644 index 0000000..ac3bd92 --- /dev/null +++ b/src/views/mobile/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue new file mode 100644 index 0000000..2fbea2f --- /dev/null +++ b/src/views/mobile/record/detail.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/result.vue b/src/views/mobile/info/result.vue new file mode 100644 index 0000000..895ef64 --- /dev/null +++ b/src/views/mobile/info/result.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/search.vue b/src/views/mobile/info/search.vue new file mode 100644 index 0000000..e98fed6 --- /dev/null +++ b/src/views/mobile/info/search.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue new file mode 100644 index 0000000..5f7ec74 --- /dev/null +++ b/src/views/mobile/operation/data.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue new file mode 100644 index 0000000..ac3bd92 --- /dev/null +++ b/src/views/mobile/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue new file mode 100644 index 0000000..2fbea2f --- /dev/null +++ b/src/views/mobile/record/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue new file mode 100644 index 0000000..2398a99 --- /dev/null +++ b/src/views/mobile/record/search.vue @@ -0,0 +1,3 @@ + diff --git a/README.md b/README.md index c1ffcce..cf70166 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/result.vue b/src/views/mobile/info/result.vue new file mode 100644 index 0000000..895ef64 --- /dev/null +++ b/src/views/mobile/info/result.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/search.vue b/src/views/mobile/info/search.vue new file mode 100644 index 0000000..e98fed6 --- /dev/null +++ b/src/views/mobile/info/search.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue new file mode 100644 index 0000000..5f7ec74 --- /dev/null +++ b/src/views/mobile/operation/data.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue new file mode 100644 index 0000000..ac3bd92 --- /dev/null +++ b/src/views/mobile/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue new file mode 100644 index 0000000..2fbea2f --- /dev/null +++ b/src/views/mobile/record/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue new file mode 100644 index 0000000..2398a99 --- /dev/null +++ b/src/views/mobile/record/search.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue index 8b7bed3..deb9147 100644 --- a/src/views/system/resource/listResource.vue +++ b/src/views/system/resource/listResource.vue @@ -120,7 +120,7 @@ - + 燃气物联感知平台-北燃闸井产品化 +

燃气物联感知平台

-

燃气物联感知平台-北燃闸井产品化

+

燃气物联感知平台

## 简要说明

diff --git "a/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" new file mode 100644 index 0000000..b2660f4 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\201\234\347\224\250.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" new file mode 100644 index 0000000..956d434 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\345\274\202\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" new file mode 100644 index 0000000..560f054 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\234\252\351\203\250\347\275\262.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" new file mode 100644 index 0000000..cd1f858 --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\346\255\243\345\270\270.png" Binary files differ diff --git "a/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" new file mode 100644 index 0000000..ada2e3a --- /dev/null +++ "b/public/image/station/\345\234\272\347\253\231-\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e69de29..0000000 --- "a/public/image/\346\226\260\345\273\272 \346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index c51fe9e..aa7dadc 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -37,3 +37,13 @@ data, }) } + +// 导出列表 +export function exportDevice(params: any) { + return request({ + url: '/system/busDevice/batchExport', + method: 'get', + params, + responseType: 'blob', + }) +} diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts index 46b1988..4c74dfd 100644 --- a/src/api/home/device/type.ts +++ b/src/api/home/device/type.ts @@ -37,3 +37,11 @@ data, }) } +// 设备类型列表 +export function getDeviceTypeList(data: any) { + return request({ + url: '/system/baseDeviceType/selectList', + method: 'post', + data, + }) +} diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts index 7131b1e..9385085 100644 --- a/src/api/home/ledger/ledger.ts +++ b/src/api/home/ledger/ledger.ts @@ -11,3 +11,12 @@ data, }) } + +// 台账管理基础列表 -- 网格数据 +export function getGridListPage(data: any) { + return request({ + url: `/system/busLedger/grid/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} diff --git a/src/api/home/station/station.ts b/src/api/home/station/station.ts new file mode 100644 index 0000000..887fefc --- /dev/null +++ b/src/api/home/station/station.ts @@ -0,0 +1,21 @@ +/** + * 场站监测接口 + */ +import request from '@/api/index' + +// 基础列表 +export function getStationListPage(data: any) { + return request({ + url: `/monitor/station/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表-不分页 +export function getStationList(data: any) { + return request({ + url: '/monitor/station/list', + method: 'post', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index 9b594da..f405c06 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -19,6 +19,9 @@ // 获取用户权限（菜单、按钮） export function getUserMenus(params: { resourceType: string; parentCode: string }) { + if (window.localStorage.getItem('browser-type-bj-well')) { + params.parentCode = window.localStorage.getItem('browser-type-bj-well') as string + } return request.get(`${prefix}user/permission`, { params }) } diff --git a/src/assets/icons/icon-monitor.svg b/src/assets/icons/icon-monitor.svg new file mode 100644 index 0000000..5d791d1 --- /dev/null +++ b/src/assets/icons/icon-monitor.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-operation.svg b/src/assets/icons/icon-operation.svg new file mode 100644 index 0000000..6458e8b --- /dev/null +++ b/src/assets/icons/icon-operation.svg @@ -0,0 +1 @@ + diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index c468022..b892529 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -1,3 +1,4 @@ + + + + + diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue index 4add259..663618b 100644 --- a/src/views/home/device/device/index.vue +++ b/src/views/home/device/device/index.vue @@ -4,29 +4,31 @@ Date: 2024-07-19 --> @@ -118,27 +202,68 @@ @@ -195,6 +323,12 @@ + + diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue deleted file mode 100644 index a7c2cd4..0000000 --- a/src/views/home/ledger/ledger/components/syncRecord.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue index e17e3bb..3b348a8 100644 --- a/src/views/home/ledger/ledger/components/wellList.vue +++ b/src/views/home/ledger/ledger/components/wellList.vue @@ -27,7 +27,7 @@ { text: '产权单位', value: 'deptName', align: 'center', isRequired: true }, { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true }, { text: '使用状态', value: 'onStateName', align: 'center', isRequired: true }, - // { text: '位置状态', value: 'isUsedName', align: 'center', isRequired: true }, + { text: '位置状态', value: 'locationStateName', align: 'center', isRequired: true }, ]) // 最终展示列 const columnsConfig = ref([]) @@ -43,6 +43,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, }) // 查询数据 @@ -50,7 +51,7 @@ loadingTable.value = true getWellListPage(listQuery.value).then((res) => { console.log(res.data, '数据列表') - list.value = res.data.rows + list.value = res.data.rows.map((item: any) => ({ ...item, locationStateName: item.locationState === '1' ? '有' : item.locationState === '0' ? '无' : '' })) total.value = res.data.total loadingTable.value = false }).catch(() => { @@ -65,6 +66,7 @@ tagNumber: '', // 位号 ledgerName: '', // 名称 responsibleDept: '', // 管理单位 + locationState: '', type: props.type, } fetchData() @@ -135,13 +137,19 @@ - + + + + + + + import type { TabsPaneContext } from 'element-plus' import wellList from './components/wellList.vue' +import gridList from './components/gridList.vue' const activeName = ref('闸井') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -23,9 +24,7 @@ -

- 网格 -
+ diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue new file mode 100644 index 0000000..dee1350 --- /dev/null +++ b/src/views/home/ledger/sync/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue new file mode 100644 index 0000000..7b8f728 --- /dev/null +++ b/src/views/home/monitor/service/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue new file mode 100644 index 0000000..2b22dc2 --- /dev/null +++ b/src/views/home/monitor/time/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue new file mode 100644 index 0000000..eaf3fbb --- /dev/null +++ b/src/views/home/operation/alarm/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue new file mode 100644 index 0000000..84137c8 --- /dev/null +++ b/src/views/home/operation/history/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue new file mode 100644 index 0000000..8131ae5 --- /dev/null +++ b/src/views/home/operation/manufacturer/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue new file mode 100644 index 0000000..883232c --- /dev/null +++ b/src/views/home/operation/trajectory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue new file mode 100644 index 0000000..ae7c9fa --- /dev/null +++ b/src/views/home/rule/special/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue new file mode 100644 index 0000000..d5f177c --- /dev/null +++ b/src/views/home/station/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue new file mode 100644 index 0000000..20fb0cc --- /dev/null +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue new file mode 100644 index 0000000..54e4031 --- /dev/null +++ b/src/views/home/station/station/components/map.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue index 6aa0c1f..7d9a95b 100644 --- a/src/views/home/station/station/index.vue +++ b/src/views/home/station/station/index.vue @@ -1,3 +1,310 @@ + + + + + + + diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue index 5341746..2955e68 100644 --- a/src/views/home/well/components/map.vue +++ b/src/views/home/well/components/map.vue @@ -119,6 +119,7 @@ const detail = ref() const detailRef = ref() const massMarksClick = (data: any) => { + mapRef.value.map.setZoom(10.5) // 定义弹窗 detail.value = new mapRef.value.AMap.InfoWindow({ closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体 @@ -134,6 +135,11 @@ overlay: data.event.target, infoWindow: detail.value, info: data.event.data, + map: mapRef.value.map, + }) + setTimeout(() => { + // mapRef.value.map.setZoom(14) + mapRef.value.map.setCenter(data.event.data.lnglat) }) } diff --git a/src/views/mobile/dashboard/index.vue b/src/views/mobile/dashboard/index.vue new file mode 100644 index 0000000..47658b0 --- /dev/null +++ b/src/views/mobile/dashboard/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue new file mode 100644 index 0000000..3d68658 --- /dev/null +++ b/src/views/mobile/device/add.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/example1/index.vue b/src/views/mobile/example1/index.vue deleted file mode 100644 index e3254f6..0000000 --- a/src/views/mobile/example1/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/src/views/mobile/example2/index.vue b/src/views/mobile/example2/index.vue deleted file mode 100644 index 2b97b29..0000000 --- a/src/views/mobile/example2/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/mobile/info/detail.vue b/src/views/mobile/info/detail.vue new file mode 100644 index 0000000..1c7cd17 --- /dev/null +++ b/src/views/mobile/info/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/result.vue b/src/views/mobile/info/result.vue new file mode 100644 index 0000000..895ef64 --- /dev/null +++ b/src/views/mobile/info/result.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/info/search.vue b/src/views/mobile/info/search.vue new file mode 100644 index 0000000..e98fed6 --- /dev/null +++ b/src/views/mobile/info/search.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue new file mode 100644 index 0000000..5f7ec74 --- /dev/null +++ b/src/views/mobile/operation/data.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/operation/index.vue b/src/views/mobile/operation/index.vue new file mode 100644 index 0000000..ac3bd92 --- /dev/null +++ b/src/views/mobile/operation/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/record/detail.vue b/src/views/mobile/record/detail.vue new file mode 100644 index 0000000..2fbea2f --- /dev/null +++ b/src/views/mobile/record/detail.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue new file mode 100644 index 0000000..2398a99 --- /dev/null +++ b/src/views/mobile/record/search.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue index 8b7bed3..deb9147 100644 --- a/src/views/system/resource/listResource.vue +++ b/src/views/system/resource/listResource.vue @@ -120,7 +120,7 @@ - + if ((navigator.language || navigator.browserLanguage).toLowerCase() === 'zh-cn') { - console.info('%c由%203智慧市政团队%c驱动', '${copyright_sub_style}', '${copyright_main_style}', '${copyright_sub_style}', '\\nhttps://gitee.com/hooray/fantastic-admin'); + console.info('%c由203智慧市政团队%c驱动', '${copyright_sub_style}', '${copyright_main_style}', '${copyright_sub_style}' ); } else { console.info('%cPowered by%cFantastic-admin', '${copyright_sub_style}', '${copyright_main_style}', '\\nhttps://github.com/hooray/fantastic-admin'); }