diff --git a/package-lock.json b/package-lock.json index e768667..b53ba97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "3.6.2", "license": "MIT", "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@antv/l7": "^2.19.11", "@antv/l7-draw": "^3.1.1", "@antv/l7-maps": "^2.19.11", diff --git a/public/favicon.ico b/public/favicon.ico index 121ffe2..3de7a73 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/light/deviceMonitor.js b/src/api/light/deviceMonitor.js index 4c0cc58..ee60a13 100644 --- a/src/api/light/deviceMonitor.js +++ b/src/api/light/deviceMonitor.js @@ -9,7 +9,7 @@ export function deviceMonitorList(query) { }) } -// 根据配电柜id获取灯杆列表信息 +// 根据配电柜id获取场所列表信息 export function getLightPoleListBySwitchBoxId(id) { return request({ url: `/smartlight/deviceMonitor/getLightPoleListBySwitchBoxId/${id}`, diff --git a/src/api/light/lightPole.js b/src/api/light/lightPole.js index 0793111..405a777 100644 --- a/src/api/light/lightPole.js +++ b/src/api/light/lightPole.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询灯杆管理列表 +// 查询场所管理列表 export function listLightPole(query) { return request({ url: '/smartlight/light/lightPole/list', @@ -9,7 +9,7 @@ export function listLightPole(query) { }) } -// 查询灯杆管理详细 +// 查询场所管理详细 export function getLightPole(id) { return request({ url: '/smartlight/light/lightPole/' + id, @@ -17,7 +17,7 @@ export function getLightPole(id) { }) } -// 新增灯杆管理 +// 新增场所管理 export function addLightPole(data) { return request({ url: '/smartlight/light/lightPole', @@ -26,7 +26,7 @@ export function addLightPole(data) { }) } -// 修改灯杆管理 +// 修改场所管理 export function updateLightPole(data) { return request({ url: '/smartlight/light/lightPole', @@ -35,7 +35,7 @@ export function updateLightPole(data) { }) } -// 删除灯杆管理 +// 删除场所管理 export function delLightPole(id) { return request({ url: '/smartlight/light/lightPole/' + id, @@ -43,7 +43,7 @@ export function delLightPole(id) { }) } -// 获取灯杆下设备列表信息 +// 获取场所下设备列表信息 export function getLightDeviceList(id) { return request({ url: '/smartlight/light/lightPole/getLightDeviceList/' + id, @@ -51,7 +51,7 @@ export function getLightDeviceList(id) { }) } -// 批量转移灯杆管理 +// 批量转移场所管理 export function batchUpdateBuilding({ ids, buildingId, buildingName }) { return request({ url: `/smartlight/light/lightPole/batchUpdateBuilding/${ids}/${buildingId}/${buildingName}`, diff --git a/src/api/light/poleType.js b/src/api/light/poleType.js index 5a8e266..2504b0f 100644 --- a/src/api/light/poleType.js +++ b/src/api/light/poleType.js @@ -1,7 +1,7 @@ import request from '@/utils/request' import axios from 'axios' -// 查询灯杆类型管理列表 +// 查询场所类型管理列表 export function listPoleType(query) { return request({ url: '/smartlight/light/poleType/list', @@ -10,7 +10,7 @@ export function listPoleType(query) { }) } -// 查询灯杆类型管理详细 +// 查询场所类型管理详细 export function getPoleType(id) { return request({ url: '/smartlight/light/poleType/' + id, @@ -18,7 +18,7 @@ export function getPoleType(id) { }) } -// 新增灯杆类型管理 +// 新增场所类型管理 export function addPoleType(data) { return request({ url: '/smartlight/light/poleType', @@ -27,7 +27,7 @@ export function addPoleType(data) { }) } -// 修改灯杆类型管理 +// 修改场所类型管理 export function updatePoleType(data) { return request({ url: '/smartlight/light/poleType', @@ -36,7 +36,7 @@ export function updatePoleType(data) { }) } -// 删除灯杆类型管理 +// 删除场所类型管理 export function delPoleType(id) { return request({ url: '/smartlight/light/poleType/' + id, @@ -44,7 +44,7 @@ export function delPoleType(id) { }) } -// 上传灯杆模型 +// 上传场所模型 export function getBimToken() { return new Promise((resolve, reject) => { axios({ @@ -84,7 +84,7 @@ export function uploadModel(data, token, method, id) { }) } -// 获取灯杆下挂载的设备 +// 获取场所下挂载的设备 export function getPoleDevice(id) { return request({ url: `/smartlight/light/lightPole/getLightDeviceList/${id}`, @@ -92,7 +92,7 @@ export function getPoleDevice(id) { }) } -// 获取灯杆下所有的灯控 +// 获取场所下所有的灯控 export function lampControlByPole(query) { return request({ url: '/smartlight/screen/lampControlByPole', @@ -101,7 +101,7 @@ export function lampControlByPole(query) { }) } -// 获取灯杆下所有的摄像头 +// 获取场所下所有的摄像头 export function cameraByPole(query) { return request({ url: '/smartlight/screen/cameraByPole', diff --git a/src/api/light/screen.js b/src/api/light/screen.js index fba0b29..cb8b081 100644 --- a/src/api/light/screen.js +++ b/src/api/light/screen.js @@ -43,7 +43,7 @@ export function delScreen(id) { }) } -// 获取灯杆对应的显示屏信息 1对1 +// 获取场所对应的显示屏信息 1对1 export function infoScreenByPole(query) { return request({ url: '/smartlight/screen/infoScreenByPole', diff --git a/src/assets/images/monitor/pole_left.png b/src/assets/images/monitor/pole_left.png index 1549a62..3918670 100644 Binary files a/src/assets/images/monitor/pole_left.png and b/src/assets/images/monitor/pole_left.png differ diff --git a/src/assets/images/monitor/pole_right_error.png b/src/assets/images/monitor/pole_right_error.png index 5e71442..3918670 100644 Binary files a/src/assets/images/monitor/pole_right_error.png and b/src/assets/images/monitor/pole_right_error.png differ diff --git a/src/assets/images/monitor/pole_right_online.png b/src/assets/images/monitor/pole_right_online.png index 475b4c9..3918670 100644 Binary files a/src/assets/images/monitor/pole_right_online.png and b/src/assets/images/monitor/pole_right_online.png differ diff --git a/src/assets/images/monitor/pole_selected.png b/src/assets/images/monitor/pole_selected.png index a9d837e..3918670 100644 Binary files a/src/assets/images/monitor/pole_selected.png and b/src/assets/images/monitor/pole_selected.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index cd4e73c..840b111 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -17,7 +17,7 @@
- +