diff --git a/yanzhu-bigscreen/public/favicon.ico b/yanzhu-bigscreen/public/favicon.ico index d92e0b8c..e1ab4e37 100644 Binary files a/yanzhu-bigscreen/public/favicon.ico and b/yanzhu-bigscreen/public/favicon.ico differ diff --git a/yanzhu-bigscreen/src/api-old/device/tower/index.js b/yanzhu-bigscreen/src/api-old/device/tower/index.js index 5badf596..4cfe017b 100644 --- a/yanzhu-bigscreen/src/api-old/device/tower/index.js +++ b/yanzhu-bigscreen/src/api-old/device/tower/index.js @@ -18,7 +18,7 @@ const findTowerConfigListByProjectId=(deptId, projectId)=> { // 查询塔基运行统计 const findTowerStatisticsView=(deviceSn)=> { return request({ - url: `bgscreen/tower/findTowerStatisticsView?deviceSn=${deviceSn}`, + url: `bgscreen/tower/findTowerStatisticsView?deviceKey=${deviceSn}`, method: 'get' }) } @@ -34,7 +34,7 @@ const selectDevTowerDataLimitList=(deviceSn)=> { // 查询塔基实时数据 const selectDevTowerDataRunList=(deviceSn)=> { return request({ - url: `bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10&warnings=Y`, + url: `bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10`, method: 'get' }) } diff --git a/yanzhu-bigscreen/src/api/tower.js b/yanzhu-bigscreen/src/api/tower.js index 20b7fc77..4c448420 100644 --- a/yanzhu-bigscreen/src/api/tower.js +++ b/yanzhu-bigscreen/src/api/tower.js @@ -20,7 +20,7 @@ const findTowerConfigListByProjectId = (data) => { // 查询塔基运行统计 const findTowerStatisticsView = (deviceSn) => { return request({ - url: `/manage/bgscreen/tower/findTowerStatisticsView?deviceSn=${deviceSn}`, + url: `/manage/bgscreen/tower/findTowerStatisticsView?deviceKey=${deviceSn}`, method: "get", }); }; @@ -36,7 +36,7 @@ const selectDevTowerDataLimitList = (deviceSn) => { // 查询塔基实时数据 const selectDevTowerDataRunList = (deviceSn) => { return request({ - url: `manage/bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10&warnings=Y`, + url: `manage/bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10`, method: "get", }); }; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml index 17146cfb..bbecdeba 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml @@ -90,7 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/yanzhu-ui-vue3/public/favicon.ico b/yanzhu-ui-vue3/public/favicon.ico index d92e0b8c..e1ab4e37 100644 Binary files a/yanzhu-ui-vue3/public/favicon.ico and b/yanzhu-ui-vue3/public/favicon.ico differ diff --git a/yanzhu-ui-vue3/src/assets/logo/logo.png b/yanzhu-ui-vue3/src/assets/logo/logo.png index e2637602..f9cd91aa 100644 Binary files a/yanzhu-ui-vue3/src/assets/logo/logo.png and b/yanzhu-ui-vue3/src/assets/logo/logo.png differ