diff --git a/ruoyi-ui/src/api/board/equipment.js b/ruoyi-ui/src/api/board/equipment.js
index ba29b76..1be5c22 100644
--- a/ruoyi-ui/src/api/board/equipment.js
+++ b/ruoyi-ui/src/api/board/equipment.js
@@ -4,7 +4,7 @@ import request from '@/utils/request'
export function treeList(query) {
return request({
// baseURL:'/monitoring-api',
- url: '/business/monitorPlatform/treeList',
+ url: '/business/monitorPlatform/treeList/1',
method: 'get',
})
}
@@ -12,8 +12,8 @@ export function treeList(query) {
export function selectDeviceByDeviceModeByMonitorUnitId(query) {
return request({
// baseURL:'/monitoring-api',
- url: '/business/monitorPlatform/selectDeviceByDeviceModeByMonitorUnitId',
- method: 'post',
+ url: '/business/monitorPlatform/selectDevicesByMonitorUnitId/1/1',
+ method: 'get',
data:query
})
}
@@ -21,8 +21,17 @@ export function selectDeviceByDeviceModeByMonitorUnitId(query) {
export function selectDeviceModeFunctionByFunctionType(query) {
return request({
// baseURL:'/monitoring-api',
- url: '/business/monitorPlatform/selectDeviceModeFunctionByFunctionType',
+ url: '/business/monitorPlatform/selectLatestDataByDeviceMode',
method: 'post',
data:query
})
}
+// 中上
+export function getMonitorById(query) {
+ return request({
+ // baseURL:'/monitoring-api',
+ url: '/business/monitorPlatform/getMonitorById/1',
+ method: 'get',
+ data:query
+ })
+}
diff --git a/ruoyi-ui/src/api/board/equipmentMonitoring.js b/ruoyi-ui/src/api/board/equipmentMonitoring.js
index 19a549c..4684815 100644
--- a/ruoyi-ui/src/api/board/equipmentMonitoring.js
+++ b/ruoyi-ui/src/api/board/equipmentMonitoring.js
@@ -1,19 +1,28 @@
import request from '@/utils/request'
-// 查询定时任务调度列表
-export function listJob(query) {
+// 右
+export function selectLatestDataByDeviceMode(query) {
return request({
- url: '/schedule/job/list',
- method: 'get',
- params: query
+ url: '/business/monitorPlatform/selectLatestDataByDeviceMode',
+ method: 'post',
+ data: {
+ "sceneId": 1,
+ "deviceModeId": 1,
+ "startTime": 1222222222222,
+ "offset": 0,
+ "limit": 10
+ }
+
})
}
-// 新增定时任务调度
-export function addJob(data) {
+// 左
+export function getDeviceModesBySceneId(data) {
return request({
- url: '/schedule/job',
+ url: '/business/monitorPlatform/getDeviceModesBySceneId',
method: 'post',
- data: data
+ data: {
+ "sceneId": 1,
+ }
})
}
diff --git a/ruoyi-ui/src/api/board/nav.js b/ruoyi-ui/src/api/board/nav.js
new file mode 100644
index 0000000..d1c0c59
--- /dev/null
+++ b/ruoyi-ui/src/api/board/nav.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 上
+export function selectSecnes(query) {
+ return request({
+ // baseURL:'/monitoring-api',
+ url: '/business/monitorPlatform/selectSecnes',
+ method: 'get',
+ })
+}
diff --git a/ruoyi-ui/src/api/board/senso.js b/ruoyi-ui/src/api/board/senso.js
index e69de29..a0cf9d8 100644
--- a/ruoyi-ui/src/api/board/senso.js
+++ b/ruoyi-ui/src/api/board/senso.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+// 上
+export function getDeviceInfo(query) {
+ return request({
+ // baseURL:'/monitoring-api',
+ url: '/business/monitorPlatform/getDeviceInfo/1',
+ method: 'get',
+ })
+}
+// 中
+export function getHistoryData(query) {
+ return request({
+ // baseURL:'/monitoring-api',
+ url: '/business/monitorPlatform/getHistoryData',
+ method: 'post',
+ data:{
+ "sceneId": 1,
+ "deviceId": 2,
+ "offset": 0,
+ "limit": 5,
+ "startTime": 1266666666666
+ }
+
+ })
+}
+// 下
+export function getLinkDevices(query) {
+ return request({
+ // baseURL:'/monitoring-api',
+ url: '/business/monitorPlatform/getLinkDevices/1',
+ method: 'get',
+ })
+}
diff --git a/ruoyi-ui/src/components/BoardTopNav/index.vue b/ruoyi-ui/src/components/BoardTopNav/index.vue
index 6f2e46a..f66ff2c 100644
--- a/ruoyi-ui/src/components/BoardTopNav/index.vue
+++ b/ruoyi-ui/src/components/BoardTopNav/index.vue
@@ -13,11 +13,7 @@
智慧场景
- 黄金糕
- 狮子头
- 螺蛳粉
- 双皮奶
- 蚵仔煎
+ {{ i.sceneName }}
@@ -33,22 +29,27 @@
-