diff --git a/api/ems/site.js b/api/ems/site.js index ab066d4..e881768 100644 --- a/api/ems/site.js +++ b/api/ems/site.js @@ -24,14 +24,22 @@ export function getBMSBatteryCluster(data) { }) } -//获取电表数据 -export function getAmmeterDataList(data) { - return request({ - url: `/ems/siteMonitor/getAmmeterDataList`, //?siteId=${siteId} - method: 'get', - data - }) -} +//获取电表数据 +export function getAmmeterDataList(data) { + return request({ + url: `/ems/siteMonitor/getAmmeterDataList`, //?siteId=${siteId} + method: 'get', + data + }) +} + +//获取所有设备 +export function getDeviceList(siteId) { + return request({ + url: `/ems/siteConfig/getDeviceList?siteId=${siteId}`, + method: 'get' + }) +} //获取pcs头部的设备信息 export function getRunningHeadInfo(data) { @@ -41,47 +49,51 @@ export function getRunningHeadInfo(data) { data }) } -//获取pcs列表 -export function getPcsDetailInfo(data) { - return request({ - url: `/ems/siteMonitor/getPcsDetailInfo`, //?siteId=${siteId} - method: 'get', - data - }) -} +//获取pcs列表 +export function getPcsDetailInfo(data) { + return request({ + url: `/ems/siteMonitor/getPcsDetailInfo`, //?siteId=${siteId} + method: 'get', + data + }) +} + +//获取pcs名称列表 +export function getPcsNameList(siteId) { + return request({ + url: `/ems/siteMonitor/getPcsNameList?siteId=${siteId}`, + method: 'get' + }) +} -//获取单体电池 电池堆列表数据 -export function getStackNameList(data) { - return request({ - url: `/ems/siteMonitor/getStackNameList`, //?siteId=${siteId} - method: 'get', - data - }) -} -//获取单体电池 电池簇列表数据 -export function getClusterNameList(data) { - return request({ - url: `/ems/siteMonitor/getClusterNameList`, //?stackDeviceId=${stackDeviceId}&siteId=${siteId} - method: 'get', - data - }) -} -//单体电池表格数据 -export function getClusterDataInfoList(data) { - return request({ - url: `/ems/siteMonitor/getClusterDataInfoList?`, //clusterDeviceId=${clusterDeviceId}&siteId=${siteId}&stackDeviceId=${stackDeviceId}&pageSize=${pageSize}&pageNum=${pageNum} - method: 'get', - data - }) -} -// 单体电池图表 -export function getSingleBatteryData(data) { - return request({ - url: `/ems/siteMonitor/getSingleBatteryData`, //?siteId=${siteId}&deviceId=${deviceId}&startDate=${startDate}&endDate=${endDate}&clusterDeviceId=${clusterDeviceId}`, - method: 'get', - data - }) -} +//获取单体电池 电池堆列表数据 +export function getStackNameList(siteId) { + return request({ + url: `/ems/siteMonitor/getStackNameList?siteId=${siteId}`, + method: 'get' + }) +} +//获取单体电池 电池簇列表数据 +export function getClusterNameList({ stackDeviceId, siteId }) { + return request({ + url: `/ems/siteMonitor/getClusterNameList?stackDeviceId=${stackDeviceId}&siteId=${siteId}`, + method: 'get' + }) +} +//单体电池表格数据 +export function getClusterDataInfoList({ siteId, stackDeviceId, clusterDeviceId, batteryId, pageSize, pageNum }) { + return request({ + url: `/ems/siteMonitor/getClusterDataInfoList?clusterDeviceId=${clusterDeviceId}&siteId=${siteId}&stackDeviceId=${stackDeviceId}&batteryId=${batteryId}&pageSize=${pageSize}&pageNum=${pageNum}`, + method: 'get' + }) +} +// 单体电池图表 +export function getSingleBatteryData({ siteId, deviceId, clusterDeviceId, startDate, endDate }) { + return request({ + url: `/ems/siteMonitor/getSingleBatteryData?siteId=${siteId}&deviceId=${deviceId}&startDate=${startDate}&endDate=${endDate}&clusterDeviceId=${clusterDeviceId}`, + method: 'get' + }) +} //获取单个站点的基本信息 export function getSingleSiteBaseInfo(data) { @@ -93,11 +105,18 @@ export function getSingleSiteBaseInfo(data) { } //单站监控 首页 总累计运行数据 -export function getDzjkHomeView(data) { +export function getDzjkHomeView(siteId) { return request({ - url: `/ems/siteMonitor/homeView`, //?siteId=${siteId} - method: 'get', - data + url: `/ems/siteMonitor/homeView?siteId=${siteId}`, + method: 'get' + }) +} + +// 单站监控项目展示数据（字段配置 + 最新值） +export function getProjectDisplayData(siteId) { + return request({ + url: `/ems/siteMonitor/getProjectDisplayData?siteId=${siteId}`, + method: 'get' }) } diff --git a/config.js b/config.js index da71398..246f0a0 100644 --- a/config.js +++ b/config.js @@ -1,10 +1,11 @@ // 应用全局配置 module.exports = { - // todo 打包项目时切换baseUrl + // todo 打包项目时切换baseUrl + //baseUrl: 'http://localhost:8089', // 测试环境 - // baseUrl: 'http://110.40.171.179:8089', + baseUrl: 'http://110.40.171.179:8089', // 生产环境 - baseUrl: 'http://1.15.120.242:8089', + // baseUrl: 'http://1.15.120.242:8089', // 应用信息 appInfo: { // 应用名称 diff --git a/pages.json b/pages.json index 0fedc4e..af828f6 100644 --- a/pages.json +++ b/pages.json @@ -102,17 +102,23 @@ "navigationBarTitleText": "电表" } }, - { - "path": "pages/work/pcs/index", - "style": { - "navigationBarTitleText": "PCS" - } - }, - { - "path": "pages/work/dtdc/index", - "style": { - "navigationBarTitleText": "单体电池", - "onReachBottomDistance": 100 + { + "path": "pages/work/pcs/index", + "style": { + "navigationBarTitleText": "PCS" + } + }, + { + "path": "pages/work/yl/index", + "style": { + "navigationBarTitleText": "冷却" + } + }, + { + "path": "pages/work/dtdc/index", + "style": { + "navigationBarTitleText": "单体电池", + "onReachBottomDistance": 100 } } diff --git a/pages/index.vue b/pages/index.vue index 922fcbc..c85c9d0 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,15 +1,19 @@ - \ No newline at end of file + methods: { + handleCardClass(item) { + const { + workStatus = '' + } = item + return !(Object.keys(this.CLUSTERWorkStatusOptions).includes(item.workStatus)) ? "timing-collapse-item" : + workStatus === '9' ? 'warning-collapse-item' : 'running-collapse-item' + }, + getModuleRows(menuCode, sectionName) { + return (this.displayData || []).filter(item => item.menuCode === menuCode && item.sectionName === sectionName) + }, + getFieldName(fieldCode) { + const raw = String(fieldCode || '').trim() + if (!raw) return '' + const index = raw.lastIndexOf('__') + return index >= 0 ? raw.slice(index + 2) : raw + }, + getFieldRowMap(rows = [], deviceId = '') { + const map = {} + const targetDeviceId = String(deviceId || '') + rows.forEach(item => { + if (!item || !item.fieldCode) return + const itemDeviceId = String(item.deviceId || '') + if (itemDeviceId !== targetDeviceId) return + const fieldName = this.getFieldName(item.fieldCode) + map[fieldName] = item + const displayName = String(item.fieldName || '').trim() + if (displayName && !map[displayName]) { + map[displayName] = item + } + }) + rows.forEach(item => { + if (!item || !item.fieldCode) return + const itemDeviceId = String(item.deviceId || '') + if (itemDeviceId !== '') return + const fieldName = this.getFieldName(item.fieldCode) + if (map[fieldName] === undefined || map[fieldName] === null || map[fieldName] === '') { + map[fieldName] = item + } + const displayName = String(item.fieldName || '').trim() + if (displayName && !map[displayName]) { + map[displayName] = item + } + }) + return map + }, + getFieldMap(rows = [], deviceId = '') { + const rowMap = this.getFieldRowMap(rows, deviceId) + return Object.keys(rowMap).reduce((acc, fieldName) => { + const row = rowMap[fieldName] + if (acc[fieldName] === undefined) { + acc[fieldName] = row?.fieldValue + } + return acc + }, {}) + }, + getLatestTime(menuCode) { + const times = (this.displayData || []) + .filter(item => item.menuCode === menuCode && item.valueTime) + .map(item => new Date(item.valueTime).getTime()) + .filter(ts => !isNaN(ts)) + if (times.length === 0) { + return '-' + } + const date = new Date(Math.max(...times)) + const p = (n) => String(n).padStart(2, '0') + return `${date.getFullYear()}-${p(date.getMonth() + 1)}-${p(date.getDate())} ${p(date.getHours())}:${p(date.getMinutes())}:${p(date.getSeconds())}` + }, + getClusterDeviceList() { + return getStackNameList(this.siteId) + .then(response => { + const stackList = response?.data || [] + if (!stackList.length) { + this.clusterDeviceList = [] + return + } + const requests = stackList.map(stack => { + const stackDeviceId = stack.deviceId || stack.id || '' + return getClusterNameList({ + stackDeviceId, + siteId: this.siteId + }) + .then(clusterResponse => { + const clusterList = clusterResponse?.data || [] + return clusterList.map(cluster => ({ + ...cluster, + parentDeviceName: stack.deviceName || stack.name || stackDeviceId || '', + })) + }) + .catch(() => []) + }) + return Promise.all(requests).then(results => { + this.clusterDeviceList = results.flat() + }) + }) + .catch(() => { + this.clusterDeviceList = [] + }) + }, + buildList() { + const devices = (this.clusterDeviceList && this.clusterDeviceList.length > 0) ? this.clusterDeviceList : [{ + deviceId: this.siteId, + deviceName: 'BMS电池簇', + parentDeviceName: '' + }] + this.list = devices.map(device => { + const deviceId = device.deviceId || device.id || this.siteId + const infoMap = this.getFieldMap(this.getModuleRows('SBJK_BMSDCC', '簇信息'), deviceId) + const statusMap = this.getFieldMap(this.getModuleRows('SBJK_BMSDCC', '状态'), deviceId) + return { + ...infoMap, + workStatus: statusMap.workStatus, + pcsCommunicationStatus: statusMap.pcsCommunicationStatus, + emsCommunicationStatus: statusMap.emsCommunicationStatus, + currentSoc: infoMap.currentSoc, + siteId: this.siteId, + deviceId, + parentDeviceName: device.parentDeviceName || '', + deviceName: device.deviceName || device.name || device.deviceId || device.id || 'BMS电池簇', + dataUpdateTime: this.getLatestTime('SBJK_BMSDCC'), + alarmNum: 0, + } + }) + }, + updateData() { + return Promise.all([ + getProjectDisplayData(this.siteId), + this.getClusterDeviceList() + ]).then(([displayResponse]) => { + this.displayData = displayResponse?.data || [] + this.buildList() + }).catch(() => { + this.displayData = [] + this.list = [] + }) + }, + }, + onLoad(options) { + uni.showLoading() + this.siteId = options.siteId || '' + this.updateData().finally(() => { + if (this.list.length > 0) { + this.$nextTick(() => { + setTimeout(() => { + uni.hideLoading() + }, 100) + }) + return + } + uni.hideLoading() + }) + } + } + diff --git a/pages/work/bmszl/index.vue b/pages/work/bmszl/index.vue index ad43480..c5912e5 100644 --- a/pages/work/bmszl/index.vue +++ b/pages/work/bmszl/index.vue @@ -53,45 +53,9 @@ - - - - - - 簇号 - 簇电压 - 簇电流 - 簇SOC - 单体最高电压 - 电池号码 - 单体最低电压 - 电池号码 - 单体最高温度 - 电池号码 - 单体最低温度 - 电池号码 - - - - {{tableItem.clusterId}} - {{tableItem.clusterVoltage}}V - {{tableItem.clusterCurrent}}A - {{tableItem.currentSoc}}% - {{tableItem.maxCellVoltage}}V - {{tableItem.maxCellVoltageId}} - {{tableItem.minCellVoltage}}V - {{tableItem.maxCellVoltageId}} - {{tableItem.maxCellTemp}}℃ - {{tableItem.maxCellTempId}} - {{tableItem.minCellTemp}}℃ - {{tableItem.minCellTempId}} - - - - - - + + + 暂无数据 @@ -99,14 +63,15 @@ - \ No newline at end of file + }, + methods: { + getModuleRows(menuCode, sectionName) { + return (this.displayData || []).filter(item => item.menuCode === menuCode && item.sectionName === sectionName) + }, + getFieldName(fieldCode) { + const raw = String(fieldCode || '').trim() + if (!raw) return '' + const index = raw.lastIndexOf('__') + return index >= 0 ? raw.slice(index + 2) : raw + }, + isEmptyValue(value) { + return value === undefined || value === null || value === '' + }, + getFieldRowMap(rows = [], deviceId = '') { + const map = {} + const targetDeviceId = String(deviceId || '') + rows.forEach(item => { + if (!item || !item.fieldCode) return + const itemDeviceId = String(item.deviceId || '') + if (itemDeviceId !== targetDeviceId) return + map[this.getFieldName(item.fieldCode)] = item + }) + rows.forEach(item => { + if (!item || !item.fieldCode) return + const itemDeviceId = String(item.deviceId || '') + if (itemDeviceId !== '') return + const fieldName = this.getFieldName(item.fieldCode) + const existRow = map[fieldName] + if (!existRow || this.isEmptyValue(existRow.fieldValue)) { + map[fieldName] = item + } + }) + return map + }, + getFieldMap(rowMap = {}) { + const map = {} + Object.keys(rowMap || {}).forEach((fieldName) => { + map[fieldName] = rowMap[fieldName]?.fieldValue + }) + return map + }, + buildBaseInfoList() { + const devices = (this.stackDeviceList && this.stackDeviceList.length > 0) ? this.stackDeviceList : [{ + deviceId: this.siteId, + deviceName: 'BMS总览' + }] + this.list = devices.map(device => { + const id = device.deviceId || device.id || this.siteId + const infoRowMap = this.getFieldRowMap(this.getModuleRows('SBJK_BMSZL', '堆信息'), id) + const statusRowMap = this.getFieldRowMap(this.getModuleRows('SBJK_BMSZL', '状态'), id) + const infoMap = this.getFieldMap(infoRowMap) + const statusMap = this.getFieldMap(statusRowMap) + return { + ...infoMap, + workStatus: statusMap.workStatus, + pcsCommunicationStatus: statusMap.pcsCommunicationStatus, + emsCommunicationStatus: statusMap.emsCommunicationStatus, + siteId: this.siteId, + deviceId: id, + deviceName: device.deviceName || device.name || device.deviceId || device.id || 'BMS总览', + batteryDataList: [] + } + }) + }, + handleCardClass(item) { + const { + workStatus = '' + } = item + return !Object.keys(this.STACKWorkStatusOptions).find(i => i === workStatus) ? "timing-collapse-item" : + workStatus === '9' ? 'warning-collapse-item' : 'running-collapse-item' + }, + updateData() { + return Promise.all([ + getProjectDisplayData(this.siteId), + getStackNameList(this.siteId) + ]).then(([displayResponse, stackResponse]) => { + this.displayData = displayResponse?.data || [] + this.stackDeviceList = stackResponse?.data || [] + this.buildBaseInfoList() + }).catch(() => { + this.displayData = [] + this.stackDeviceList = [] + this.list = [] + }) + } + }, + onLoad(options) { + uni.showLoading() + this.siteId = options.siteId || '' + this.updateData().then(() => { + if (this.list.length === 0) { + uni.hideLoading() + return + } + this.$nextTick(() => { + setTimeout(() => { + this.$refs.collapse && this.$refs.collapse.resize() + uni.hideLoading() + }, 100) + }) + }).catch(() => { + uni.hideLoading() + }) + } + } + diff --git a/pages/work/db/index.vue b/pages/work/db/index.vue index 6c0db1c..b702325 100644 --- a/pages/work/db/index.vue +++ b/pages/work/db/index.vue @@ -17,12 +17,12 @@ - - - - {{tempDataItem.name}} - + + + + {{tempDataItem.name}} + {{item[tempDataItem.attr] | formatNumber}} @@ -40,129 +40,31 @@ - - \ No newline at end of file + diff --git a/pages/work/yl/index.vue b/pages/work/yl/index.vue new file mode 100644 index 0000000..bde1a40 --- /dev/null +++ b/pages/work/yl/index.vue @@ -0,0 +1,242 @@ + + + diff --git a/store/getters.js b/store/getters.js index 2874d96..4935286 100644 --- a/store/getters.js +++ b/store/getters.js @@ -2,9 +2,10 @@ const getters = { token: state => state.user.token, avatar: state => state.user.avatar, id: state => state.user.id, - name: state => state.user.name, - roles: state => state.user.roles, - permissions: state => state.user.permissions, - belongSite: state => state.user.belongSite -} -export default getters \ No newline at end of file + name: state => state.user.name, + roles: state => state.user.roles, + permissions: state => state.user.permissions, + belongSite: state => state.user.belongSite, + currentSiteId: state => state.user.currentSiteId +} +export default getters diff --git a/store/modules/user.js b/store/modules/user.js index 7ec9c06..e268fe1 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -24,11 +24,12 @@ const user = { token: getToken(), id: storage.get(constant.id), name: storage.get(constant.name), - avatar: storage.get(constant.avatar), - roles: storage.get(constant.roles), - permissions: storage.get(constant.permissions), - belongSite: storage.get(constant.belongSite) - }, + avatar: storage.get(constant.avatar), + roles: storage.get(constant.roles), + permissions: storage.get(constant.permissions), + belongSite: storage.get(constant.belongSite), + currentSiteId: storage.get(constant.currentSiteId) + }, mutations: { SET_TOKEN: (state, token) => { @@ -54,11 +55,15 @@ const user = { state.permissions = permissions storage.set(constant.permissions, permissions) }, - SET_BELONGSITE: (state, belongSite = []) => { - state.belongSite = belongSite || [] - storage.set(constant.belongSite, belongSite || []) - } - }, + SET_BELONGSITE: (state, belongSite = []) => { + state.belongSite = belongSite || [] + storage.set(constant.belongSite, belongSite || []) + }, + SET_CURRENTSITEID: (state, currentSiteId = '') => { + state.currentSiteId = currentSiteId || '' + storage.set(constant.currentSiteId, currentSiteId || '') + } + }, actions: { // 登录 @@ -133,4 +138,4 @@ const user = { } } -export default user \ No newline at end of file +export default user diff --git a/utils/constant.js b/utils/constant.js index 6b93379..8e8b5ae 100644 --- a/utils/constant.js +++ b/utils/constant.js @@ -3,7 +3,8 @@ const constant = { id: 'user_id', name: 'user_name', roles: 'user_roles', - permissions: 'user_permissions' + permissions: 'user_permissions', + currentSiteId: 'current_site_id' } export default constant